← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3

 

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
  #705675 Error creating a DTA
  https://bugs.launchpad.net/bugs/705675
  #707404 [trunk][account] useless variable in button_confirm_bank
  https://bugs.launchpad.net/bugs/707404

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

Hello,

I have fixed Buildbot warning of account module.

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/47635
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_landscape.py'
--- account/report/account_balance_landscape.py	2011-01-14 00:11:01 +0000
+++ account/report/account_balance_landscape.py	2011-01-27 06:43:05 +0000
@@ -207,7 +207,6 @@
             return cmp(x.code, y.code)
         for n in range(0,len(accounts)):
             accounts[n].sort(cmp_code)
-        common={}
         merged_accounts=zip(*accounts)
 
         for entry in merged_accounts:

=== modified file 'account/report/account_partner_balance.py'
--- account/report/account_partner_balance.py	2011-01-14 00:11:01 +0000
+++ account/report/account_partner_balance.py	2011-01-27 06:43:05 +0000
@@ -296,7 +296,6 @@
 
     def _get_partners(self):
         cr, uid = self.cr, self.uid
-        context = self.localcontext # all of it?
 
         if self.result_selection == 'customer':
             return _('Receivable Accounts')

=== modified file 'account/wizard/account_state_open.py'
--- account/wizard/account_state_open.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_state_open.py	2011-01-27 06:43:05 +0000
@@ -36,7 +36,7 @@
             if data_inv.reconciled:
                 raise osv.except_osv(_('Warning'), _('Invoice is already reconciled'))
             wf_service = netsvc.LocalService("workflow")
-            res = wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
+            wf_service.trg_validate(uid, 'account.invoice', context['active_ids'][0], 'open_test', cr)
         return {'type': 'ir.actions.act_window_close'}
 
 account_state_open()

=== modified file 'account/wizard/account_use_model.py'
--- account/wizard/account_use_model.py	2011-01-14 00:11:01 +0000
+++ account/wizard/account_use_model.py	2011-01-27 06:43:05 +0000
@@ -107,7 +107,7 @@
                 })
                 c = context.copy()
                 c.update({'journal_id': model.journal_id.id,'period_id': period_id})
-                id_line = account_move_line_obj.create(cr, uid, val, context=c)
+                account_move_line_obj.create(cr, uid, val, context=c)
 
         context.update({'move_ids':move_ids})
         model_data_ids = mod_obj.search(cr, uid,[('model','=','ir.ui.view'),('name','=','view_move_form')], context=context)


Follow ups