openerp-dev-web team mailing list archive

["ARA\(OpenERP\)" <ara@xxxxxxxxxxx>]

ARA(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #615522 Report Of Invoice  : Payment Term + Due date not printed
  https://bugs.launchpad.net/bugs/615522
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029
  #672553 opening entries from chart of account doesn't use context
  https://bugs.launchpad.net/bugs/672553
  #674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
  https://bugs.launchpad.net/bugs/674480
  #681398 sale access right
  https://bugs.launchpad.net/bugs/681398
  #689536 [6.0] partner layout salesman/salesteam issue
  https://bugs.launchpad.net/bugs/689536
  #690326 [6.0RC1] View mode "tree,form,search" in several window actions
  https://bugs.launchpad.net/bugs/690326
  #690753 [6.0] and [5.x] account_analytic_line must not be deleted if the journal etc is deleted
  https://bugs.launchpad.net/bugs/690753
  #691072 [6.0RC1][TRUNK][account_voucher] Wrong definition of field 'company_id' in 'account_voucher_line' object
  https://bugs.launchpad.net/bugs/691072


hello,

I have made following changes.
account_analytic_plan: Removing label `Client Project`
account_timesheet_invoicing: Removing label 'invoicing rate per journal' and
add buttons for state changed.

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/44444
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'account_analytic_plans/account_analytic_plans.py'
--- account_analytic_plans/account_analytic_plans.py	2010-12-17 04:37:32 +0000
+++ account_analytic_plans/account_analytic_plans.py	2010-12-22 11:31:57 +0000
@@ -171,7 +171,7 @@
     """% (tools.to_xml(plan_id.name), wiz_id[0])
                 for line in plan_id.plan_ids:
                     res['arch']+="""
-                    <field name="account%d_ids" string="%s" colspan="4">
+                    <field name="account%d_ids" string="%s" nolabel="1" colspan="4">
                     <tree string="%s" editable="bottom">
                         <field name="rate"/>
                         <field name="analytic_account_id" domain="[('parent_id','child_of',[%d])]" groups="base.group_extended"/>

=== modified file 'analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml'
--- analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml	2010-10-18 20:17:07 +0000
+++ analytic_journal_billing_rate/analytic_journal_billing_rate_view.xml	2010-12-22 11:31:57 +0000
@@ -35,8 +35,8 @@
             <field name="inherit_id" ref="hr_timesheet_invoice.account_analytic_account_form_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='to_invoice']" position="after">
-                    <field name="journal_rate_ids" colspan="4"/>
-                </xpath>
+                    <field name="journal_rate_ids" nolabel="1" colspan="4"/>
+                </xpath>                
             </field>
         </record>
 

=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2010-12-13 06:43:09 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2010-12-22 11:31:57 +0000
@@ -76,7 +76,33 @@
     }
     _defaults = {
         'pricelist_id': lambda self, cr, uid, ctx: ctx.get('pricelist_id', False),
+        'state': 'draft'
     }
+    
+    def set_close(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'close'}, context=context)
+        return True
+    
+    def set_cancel(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'cancelled'}, context=context)
+        return True
+    
+    def set_open(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'open'}, context=context)
+        return True  
+      
+    def set_pending(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'pending'}, context=context)
+        return True
+    
+    def set_template(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'template'}, context=context)
+        return True
+    
+    def reset_account(self, cr, uid, ids, context=None):
+        self.write(cr, uid, ids, {'state':'open'}, context=context)
+        return True
+        
 account_analytic_account()
 
 

=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice_view.xml'
--- hr_timesheet_invoice/hr_timesheet_invoice_view.xml	2010-12-09 11:52:11 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice_view.xml	2010-12-22 11:31:57 +0000
@@ -14,8 +14,16 @@
                         <field name="to_invoice" widget="selection" />
                         <field name="amount_max"/>
                         <field name="amount_invoiced"/>
-                        <separator colspan="4" string="State"/>
-                        <field name="state"/>
+                        <separator colspan="4"/>
+                        <group col="9" colspan="8">
+	                        <field name="state" readonly="1"/>
+	                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+	                        <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
+	                        <button name="set_open" string="Reactivate Account" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
+	                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
+	                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
+	                        <button name="reset_account" string="Reset as Account" type="object" states="template" icon="gtk-convert"/>
+                        </group>
                     </group>
                 </field>
             </field>