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
  #656378 [trunk] general ledger -
  https://bugs.launchpad.net/bugs/656378
  #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
  #675494 [Trunk] - If you delete an invoice entry, invoice still exists
  https://bugs.launchpad.net/bugs/675494
  #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
  #692986 [6.0] hr_payroll_account hr_payroll_account_view.xml - required fields block opening form
  https://bugs.launchpad.net/bugs/692986
  #694833 Salary Structure deduction percentage limitation
  https://bugs.launchpad.net/bugs/694833
  #696914 [6.0 RC2] account bank statement - usability
  https://bugs.launchpad.net/bugs/696914

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/45115

hello,

fix:account bank statement - usability
https://bugs.launchpad.net/openobject-addons/+bug/696914

Thank you,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/45115
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/account_bank_statement.py'
--- account/account_bank_statement.py	2010-12-30 09:58:09 +0000
+++ account/account_bank_statement.py	2011-01-04 12:49:56 +0000
@@ -405,6 +405,19 @@
 
 class account_bank_statement_line(osv.osv):
 
+    def onchange_partner_id(self, cr, uid, partner_id, type, context={}):
+        part = self.pool.get('res.partner').browse(cr, uid, partner_id, context=context)
+        if not part.supplier and not part.customer :
+            type = 'general'
+        elif part.supplier == True and part.customer == True :
+            type = 'general'
+        else:
+            if part.supplier == True :
+                type = 'supplier'
+            if part.customer == True :
+                type = 'customer'
+        return type
+
     def onchange_type(self, cr, uid, line_id, partner_id, type, context=None):
         res = {'value': {}}
         obj_partner = self.pool.get('res.partner')
@@ -414,6 +427,8 @@
             return res
         account_id = False
         line = self.browse(cr, uid, line_id, context=context)
+        type=self.onchange_partner_id(cr, uid, partner_id=partner_id, type=type)
+        res.update({'value': {'type':type}})
         if not line or (line and not line[0].account_id):
             part = obj_partner.browse(cr, uid, partner_id, context=context)
             if type == 'supplier':

=== modified file 'account/account_view.xml'
--- account/account_view.xml	2011-01-03 09:08:25 +0000
+++ account/account_view.xml	2011-01-04 12:49:56 +0000
@@ -574,8 +574,8 @@
                                 <form string="Statement lines">
                                     <field name="date"/>
                                     <field name="name"/>
+                                    <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
                                     <field name="type" on_change="onchange_type(partner_id, type)"/>
-                                    <field name="partner_id" on_change="onchange_type(partner_id, type)"/>
                                     <field domain="[('journal_id', '=', parent.journal_id), ('type', '&lt;&gt;', 'view')]" name="account_id"/>
                                     <field name="analytic_account_id" groups="analytic.group_analytic_accounting" domain="[('company_id', '=', parent.company_id), ('type', '&lt;&gt;', 'view')]"/>
                                     <field name="amount"/>