[MERGE]sync with trunk.

bzr revid: [email protected]

Author: dka-odoo

addons/account/__openerp__.py

@@ -49,7 +49,7 @@
     """,
     'website': 'http://www.openerp.com',
     'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
-    'depends' : ['base_setup', 'product', 'analytic', 'board', 'edi'],
+    'depends' : ['base_setup', 'product', 'analytic', 'board', 'edi', 'report'],
     'data': [
         'security/account_security.xml',
         'security/ir.model.access.csv',
@@ -120,7 +120,27 @@
         'edi/invoice_action_data.xml',
         'account_bank_view.xml',
         'res_config_view.xml',
-        'account_pre_install.yml'
+        'account_pre_install.yml',
+
+        'views/report_vat.xml',
+        'views/report_invoice.xml',
+        'views/report_trialbalance.xml',
+        'views/report_centraljournal.xml',
+        'views/report_overdue.xml',
+        'views/report_generaljournal.xml',
+        'views/report_journal.xml',
+        'views/report_salepurchasejournal.xml',
+        'views/report_partnerbalance.xml',
+        'views/report_agedpartnerbalance.xml',
+        'views/report_partnerledger.xml',
+        'views/report_partnerledgerother.xml',
+        'views/report_financial.xml',
+        'views/report_generalledger.xml',
+        'project/views/report_analyticbalance.xml',
+        'project/views/report_analyticjournal.xml',
+        'project/views/report_analyticcostledgerquantity.xml',
+        'project/views/report_analyticcostledger.xml',
+        'project/views/report_invertedanalyticbalance.xml',
     ],
     'js': [
         'static/src/js/account_move_reconciliation.js',
@@ -152,13 +172,12 @@
         'test/account_period_close.yml',
         'test/account_use_model.yml',
         'test/account_validate_account_move.yml',
-        #'test/account_bank_statement.yml',
-        #'test/account_cash_statement.yml',
         'test/test_edi_invoice.yml',
         'test/account_report.yml',
         'test/account_fiscalyear_close.yml', #last test, as it will definitively close the demo fiscalyear
     ],
     'installable': True,
     'auto_install': False,
 }
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/account/account.py

@@ -30,7 +30,7 @@
 from openerp import tools
 from openerp.osv import fields, osv, expression
 from openerp.tools.translate import _
-from openerp.tools.float_utils import float_round
+from openerp.tools.float_utils import float_round as round
 
 import openerp.addons.decimal_precision as dp
 
@@ -729,8 +729,7 @@ class account_journal(osv.osv):
         'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'),
         'entry_posted': fields.boolean('Autopost Created Moves', help='Check this box to automatically post entries of this journal. Note that legally, some entries may be automatically posted when the source document is validated (Invoices), whatever the status of this field.'),
         'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"),
-        'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'),
-
+        'allow_date':fields.boolean('Check Date in Period', help= 'If checked, the entry won\'t be created if the entry date is not included into the selected period'),
         'profit_account_id' : fields.many2one('account.account', 'Profit Account'),
         'loss_account_id' : fields.many2one('account.account', 'Loss Account'),
         'internal_account_id' : fields.many2one('account.account', 'Internal Transfers Account', select=1),
@@ -841,16 +840,11 @@ def name_get(self, cr, user, ids, context=None):
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if not args:
             args = []
-        if context is None:
-            context = {}
-        ids = []
-        if context.get('journal_type', False):
-            args += [('type','=',context.get('journal_type'))]
-        if name:
-            ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit, context=context)
-        if not ids:
-            ids = self.search(cr, user, [('name', 'ilike', name)]+ args, limit=limit, context=context)#fix it ilike should be replace with operator
-
+        if operator in expression.NEGATIVE_TERM_OPERATORS:
+            domain = [('code', operator, name), ('name', operator, name)]
+        else:
+            domain = ['|', ('code', operator, name), ('name', operator, name)]
+        ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
 
@@ -939,13 +933,11 @@ def finds(self, cr, uid, dt=None, exception=True, context=None):
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         if args is None:
             args = []
-        if context is None:
-            context = {}
-        ids = []
-        if name:
-            ids = self.search(cr, user, [('code', 'ilike', name)]+ args, limit=limit)
-        if not ids:
-            ids = self.search(cr, user, [('name', operator, name)]+ args, limit=limit)
+        if operator in expression.NEGATIVE_TERM_OPERATORS:
+            domain = [('code', operator, name), ('name', operator, name)]
+        else:
+            domain = ['|', ('code', operator, name), ('name', operator, name)]
+        ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
 
@@ -1041,19 +1033,11 @@ def action_draft(self, cr, uid, ids, *args):
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=100):
         if args is None:
             args = []
-        if context is None:
-            context = {}
-        ids = []
-        if name:
-            ids = self.search(cr, user,
-                              [('code', 'ilike', name)] + args,
-                              limit=limit,
-                              context=context)
-        if not ids:
-            ids = self.search(cr, user,
-                              [('name', operator, name)] + args,
-                              limit=limit,
-                              context=context)
+        if operator in expression.NEGATIVE_TERM_OPERATORS:
+            domain = [('code', operator, name), ('name', operator, name)]
+        else:
+            domain = ['|', ('code', operator, name), ('name', operator, name)]
+        ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -1188,36 +1172,6 @@ def account_move_prepare(self, cr, uid, journal_id, date=False, ref='', company_
             'company_id': company_id,
         }
 
-    def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
-        """
-        Returns a list of tupples containing id, name, as internally it is called {def name_get}
-        result format: {[(id, name), (id, name), ...]}
-
-        @param cr: A database cursor
-        @param user: ID of the user currently logged in
-        @param name: name to search
-        @param args: other arguments
-        @param operator: default operator is 'ilike', it can be changed
-        @param context: context arguments, like lang, time zone
-        @param limit: Returns first 'n' ids of complete result, default is 80.
-
-        @return: Returns a list of tuples containing id and name
-        """
-
-        if not args:
-          args = []
-        ids = []
-        if name:
-            ids += self.search(cr, user, [('name','ilike',name)]+args, limit=limit, context=context)
-
-        if not ids and name and type(name) == int:
-            ids += self.search(cr, user, [('id','=',name)]+args, limit=limit, context=context)
-
-        if not ids:
-            ids += self.search(cr, user, args, limit=limit, context=context)
-
-        return self.name_get(cr, user, ids, context=context)
-
     def name_get(self, cursor, user, ids, context=None):
         if isinstance(ids, (int, long)):
             ids = [ids]
@@ -1843,10 +1797,12 @@ def _sum_period(self, cr, uid, ids, name, args, context):
     def name_search(self, cr, user, name, args=None, operator='ilike', context=None, limit=80):
         if not args:
             args = []
-        if context is None:
-            context = {}
-        ids = self.search(cr, user, ['|',('name',operator,name),('code',operator,name)] + args, limit=limit, context=context)
-        return self.name_get(cr, user, ids, context)
+        if operator in expression.NEGATIVE_TERM_OPERATORS:
+            domain = [('code', operator, name), ('name', operator, name)]
+        else:
+            domain = ['|', ('code', operator, name), ('name', operator, name)]
+        ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context)
+        return self.name_get(cr, user, ids, context=context)
 
     def name_get(self, cr, uid, ids, context=None):
         if isinstance(ids, (int, long)):
@@ -1938,15 +1894,15 @@ def copy_data(self, cr, uid, id, default=None, context=None):
         #
         'base_code_id': fields.many2one('account.tax.code', 'Account Base Code', help="Use this code for the tax declaration."),
         'tax_code_id': fields.many2one('account.tax.code', 'Account Tax Code', help="Use this code for the tax declaration."),
-        'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1."),
-        'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1."),
+        'base_sign': fields.float('Base Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
+        'tax_sign': fields.float('Tax Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
 
         # Same fields for refund invoices
 
         'ref_base_code_id': fields.many2one('account.tax.code', 'Refund Base Code', help="Use this code for the tax declaration."),
         'ref_tax_code_id': fields.many2one('account.tax.code', 'Refund Tax Code', help="Use this code for the tax declaration."),
-        'ref_base_sign': fields.float('Refund Base Code Sign', help="Usually 1 or -1."),
-        'ref_tax_sign': fields.float('Refund Tax Code Sign', help="Usually 1 or -1."),
+        'ref_base_sign': fields.float('Refund Base Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
+        'ref_tax_sign': fields.float('Refund Tax Code Sign', help="Usually 1 or -1.", digits_compute=get_precision_tax()),
         'include_base_amount': fields.boolean('Included in base amount', help="Indicates if the amount of tax must be included in the base amount for the computation of the next taxes"),
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'description': fields.char('Tax Code'),
@@ -1975,15 +1931,11 @@ def name_search(self, cr, user, name, args=None, operator='ilike', context=None,
         """
         if not args:
             args = []
-        if context is None:
-            context = {}
-        ids = []
-        if name:
-            ids = self.search(cr, user, [('description', '=', name)] + args, limit=limit, context=context)
-            if not ids:
-                ids = self.search(cr, user, [('name', operator, name)] + args, limit=limit, context=context)
+        if operator in expression.NEGATIVE_TERM_OPERATORS:
+            domain = [('description', operator, name), ('name', operator, name)]
         else:
-            ids = self.search(cr, user, args, limit=limit, context=context or {})
+            domain = ['|', ('description', operator, name), ('name', operator, name)]
+        ids = self.search(cr, user, expression.AND([domain, args]), limit=limit, context=context)
         return self.name_get(cr, user, ids, context=context)
 
     def write(self, cr, uid, ids, vals, context=None):
@@ -2144,7 +2096,7 @@ def compute_all(self, cr, uid, taxes, price_unit, quantity, product=None, partne
         tax_compute_precision = precision
         if taxes and taxes[0].company_id.tax_calculation_rounding_method == 'round_globally':
             tax_compute_precision += 5
-        totalin = totalex = float_round(price_unit * quantity, precision)
+        totalin = totalex = round(price_unit * quantity, precision)
         tin = []
         tex = []
         for tax in taxes:

addons/account/account_bank_statement.py

@@ -495,6 +495,7 @@ def button_journal_entries(self, cr, uid, ids, context=None):
       ctx = (context or {}).copy()
       ctx['journal_id'] = self.browse(cr, uid, ids[0], context=context).journal_id.id
       return {
+        'name': _('Journal Items'),
         'view_type':'form',
         'view_mode':'tree',
         'res_model':'account.move.line',

addons/account/account_invoice.py

@@ -114,7 +114,7 @@ def _amount_residual(self, cr, uid, ids, name, args, context=None):
                             #we check if the invoice is partially reconciled and if there are other invoices
                             #involved in this partial reconciliation (and we sum these invoices)
                             for line in aml.reconcile_partial_id.line_partial_ids:
-                                if line.invoice:
+                                if line.invoice and invoice.type == line.invoice.type:
                                     nb_inv_in_partial_rec += 1
                                     #store the max invoice id as for this invoice we will make a balance instead of a simple division
                                     max_invoice_id = max(max_invoice_id, line.invoice.id)
@@ -226,7 +226,7 @@ def _get_invoice_from_reconcile(self, cr, uid, ids, context=None):
         },
     }
     _columns = {
-        'name': fields.char('Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
+        'name': fields.char('Reference/Description', size=64, select=True, readonly=True, states={'draft':[('readonly',False)]}),
         'origin': fields.char('Source Document', size=64, help="Reference of the document that produced this invoice.", readonly=True, states={'draft':[('readonly',False)]}),
         'supplier_invoice_number': fields.char('Supplier Invoice Number', size=64, help="The reference of this invoice as provided by the supplier.", readonly=True, states={'draft':[('readonly',False)]}),
         'type': fields.selection([
@@ -409,17 +409,9 @@ def invoice_print(self, cr, uid, ids, context=None):
         '''
         assert len(ids) == 1, 'This option should only be used for a single id at a time.'
         self.write(cr, uid, ids, {'sent': True}, context=context)
-        datas = {
-             'ids': ids,
-             'model': 'account.invoice',
-             'form': self.read(cr, uid, ids[0], context=context)
-        }
-        return {
-            'type': 'ir.actions.report.xml',
-            'report_name': 'account.invoice',
-            'datas': datas,
-            'nodestroy' : True
-        }
+        context2 = context.copy()
+        context2['active_ids'] = ids
+        return self.pool['report'].get_action(cr, uid, [], 'account.report_invoice', context=context2)
 
     def action_invoice_sent(self, cr, uid, ids, context=None):
         '''
@@ -680,25 +672,14 @@ def action_cancel_draft(self, cr, uid, ids, *args):
         self.create_workflow(cr, uid, ids)
         return True
 
-    # ----------------------------------------
-    # Mail related methods
-    # ----------------------------------------
-
-    def _get_formview_action(self, cr, uid, id, context=None):
+    def get_formview_id(self, cr, uid, id, context=None):
         """ Update form view id of action to open the invoice """
-        action = super(account_invoice, self)._get_formview_action(cr, uid, id, context=context)
         obj = self.browse(cr, uid, id, context=context)
         if obj.type == 'in_invoice':
             model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_supplier_form')
-            action.update({
-                'views': [(view_id, 'form')],
-                })
         else:
             model, view_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'account', 'invoice_form')
-            action.update({
-                'views': [(view_id, 'form')],
-                })
-        return action
+        return view_id
 
     # Workflow stuff
     #################