openerp-dev-web team mailing list archive

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

Ashvin Rathod (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
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #696914 [6.0 RC2] account bank statement - usability
  https://bugs.launchpad.net/bugs/696914
  #697673 Wrong column title in timesheet view
  https://bugs.launchpad.net/bugs/697673
  #697989 Failed to install module multi_company
  https://bugs.launchpad.net/bugs/697989
  #701410 shouldn't see employee's categories in simplify view
  https://bugs.launchpad.net/bugs/701410
  #701683 [6.0 rc2] Setup/upgrade/run fails for init:module account_analytic_plans
  https://bugs.launchpad.net/bugs/701683
  #702318 Default period and account in invoices line for multi-company doesn't work
  https://bugs.launchpad.net/bugs/702318
  #706287 6.0.1 account - legal reports - 'Display accounts' dropdown
  https://bugs.launchpad.net/bugs/706287

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

Hello,

Fix:6.0.1 account - legal reports - 'Display accounts' dropdown
    https://bugs.launchpad.net/openobject-addons/+bug/706287

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/47230
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/report/account_balance.py'
--- account/report/account_balance.py	2011-01-14 00:11:01 +0000
+++ account/report/account_balance.py	2011-01-24 10:05:01 +0000
@@ -89,10 +89,10 @@
                 self.sum_debit += account_rec['debit']
                 self.sum_credit += account_rec['credit']
                 if disp_acc == 'bal_movement':
-                    if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['balance']) != 0:
+                    if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
                         self.result_acc.append(res)
                 elif disp_acc == 'bal_solde':
-                    if currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) != 0:
+                    if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']):
                         self.result_acc.append(res)
                 else:
                     self.result_acc.append(res)

=== modified file 'account/report/account_balance_sheet.py'
--- account/report/account_balance_sheet.py	2011-01-14 00:11:01 +0000
+++ account/report/account_balance_sheet.py	2011-01-24 10:05:01 +0000
@@ -143,10 +143,10 @@
                     if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += account.balance
                     if data['form']['display_account'] == 'bal_movement':
-                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
                             accounts_temp.append(account_dict)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
+                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
                             accounts_temp.append(account_dict)
                     else:
                         accounts_temp.append(account_dict)

=== modified file 'account/report/account_profit_loss.py'
--- account/report/account_profit_loss.py	2011-01-14 00:11:01 +0000
+++ account/report/account_profit_loss.py	2011-01-24 10:05:01 +0000
@@ -113,10 +113,10 @@
                     if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit):
                         self.result_sum_cr += abs(account.debit - account.credit)
                     if data['form']['display_account'] == 'bal_movement':
-                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
+                        if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
                             accounts_temp.append(account)
                     elif data['form']['display_account'] == 'bal_solde':
-                        if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0:
+                        if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance):
                             accounts_temp.append(account)
                     else:
                         accounts_temp.append(account)