[IMP]Remove extra button and set grey color for a para.

bzr revid: dbr@tinyerp.com-20130227100115-panqiupw1j2yzvdy

diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 17ec3de..152450d 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -123,7 +123,7 @@ class account_analytic_invoice_line(osv.osv):
             result['account_id'] = a
 
         taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False)
-        result.update( {'name':res.partner_ref,'uom_id': uom_id or res.uom_id.id, 'price_unit': res.list_price or res.standard_price,'tax_ids': [x.id for x in taxes]} )
+        result.update({'name':res.partner_ref,'uom_id': uom_id or res.uom_id.id, 'price_unit': res.list_price or res.standard_price,'tax_ids': [x.id for x in taxes]})
         if res.description:
             result['name'] += '\n'+res.description
 
@@ -781,7 +781,7 @@ class account_analytic_account(osv.osv):
             inv_line_id.append(line_id)
         return inv_line_id
 
-    def cron_create_invoice(self, cr, uid, context=None):
+    def cron_create_invoice(self, cr, ids, uid, context=None):
         inv_obj = self.pool.get('account.invoice')
         obj_invoice_line = self.pool.get('account.invoice.line')
         journal_obj = self.pool.get('account.journal')

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index f14a0fc..b15e959 100644 (file)
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -152,7 +152,7 @@
                         <field name="interval" class="oe_inline"/>
                         <field name="rrule_type" class="oe_inline"/>
                         </div>
-                        <p colspan="2" >
+                        <p colspan="2" class="oe_grey">
                             Following Invoice will be generated on <field name="next_date" on_change="onchange_next_date(next_date)" class="oe_inline"/>.
                         </p>
                     </group>
@@ -164,7 +164,7 @@
                                                        <field name="name"/>
                                                        <field name="quantity"/>
                                                        <field name="uom_id"/>
-                                                       <field name="tax_ids"/>
+                                                       <field name="tax_ids" widget="many2many_tags" readonly="0"/>
                                                        <field name="price_unit"/>
                                                        <field name="price_subtotal"/>
                                        </tree>
@@ -181,9 +181,6 @@
                         </div>
                         <field name="amount_tax" nolabel="1" widget="monetary" options="{'currency_field': 'currency_id'}"/>
                         <field name="amount_total" class="oe_subtotal_footer_separator" widget="monetary" options="{'currency_field': 'currency_id'}"/>
-                        <button name="cron_create_invoice"
-                                string="(Create Invoice)"
-                                type="object" help="Compute Invoices"/>
                     </group>
                  </xpath>
             </field>