diff --git a/addons/account/account.py b/addons/account/account.py index 9e275fcdaa2..58f8d19b13a 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -233,30 +233,37 @@ class account_account(osv.osv): _description = "Account" _parent_store = True - def search(self, cr, uid, args, offset=0, limit=None, order=None, - context=None, count=False): - if context is None: - context = {} + def _where_calc(self, cr, uid, domain, active_test=True, context=None): + """ Convert domains to allow easier filtering: + code: force case insensitive and right side matching search + journal_id: restrict to the accounts sharing the same account.account.type + """ pos = 0 - - while pos < len(args): - - if args[pos][0] == 'code' and args[pos][1] in ('like', 'ilike') and args[pos][2]: - args[pos] = ('code', '=like', tools.ustr(args[pos][2].replace('%', ''))+'%') - if args[pos][0] == 'journal_id': - if not args[pos][2]: - del args[pos] + while pos < len(domain): + if domain[pos][0] == 'code' and domain[pos][1] in ('like', 'ilike') and domain[pos][2]: + domain[pos] = ('code', '=like', tools.ustr(domain[pos][2].replace('%', '')) + '%') + if domain[pos][0] == 'journal_id': + if not domain[pos][2]: + del domain[pos] continue - jour = self.pool.get('account.journal').browse(cr, uid, args[pos][2], context=context) - if (not (jour.account_control_ids or jour.type_control_ids)) or not args[pos][2]: - args[pos] = ('type','not in',('consolidation','view')) + jour = self.pool.get('account.journal').browse(cr, uid, domain[pos][2], context=context) + if (not (jour.account_control_ids or jour.type_control_ids)) or not domain[pos][2]: + domain[pos] = ('type', 'not in', ('consolidation', 'view')) continue ids3 = map(lambda x: x.id, jour.type_control_ids) ids1 = super(account_account, self).search(cr, uid, [('user_type', 'in', ids3)]) ids1 += map(lambda x: x.id, jour.account_control_ids) - args[pos] = ('id', 'in', ids1) + domain[pos] = ('id', 'in', ids1) pos += 1 + return super(account_account, self)._where_calc(cr, uid, domain, active_test, context) + + def search(self, cr, uid, args, offset=0, limit=None, order=None, + context=None, count=False): + """ Check presence of key 'consolidate_children' in context to include also the Consolidated Children + of found accounts into the result of the search + """ + if context and context.has_key('consolidate_children'): #add consolidated children of accounts ids = super(account_account, self).search(cr, uid, args, offset, limit, order, context=context, count=count) diff --git a/addons/account/report/report_vat.py b/addons/account/report/report_vat.py index 24fb9cbab59..3e2c82fc457 100644 --- a/addons/account/report/report_vat.py +++ b/addons/account/report/report_vat.py @@ -152,15 +152,18 @@ class tax_report(report_sxw.rml_parse, common_report_header): account.name AS name, \ account.code AS code \ FROM account_move_line AS line, \ - account_account AS account \ + account_account AS account, \ + account_move as move \ WHERE line.state <> %s \ + AND line.move_id = move.id \ AND line.tax_code_id = %s \ AND line.account_id = account.id \ AND account.company_id = %s \ AND line.period_id IN %s\ AND account.active \ + AND move.state <> %s \ GROUP BY account.id,account.name,account.code', ('draft', tax_code_id, - company_id, periods_ids,)) + company_id, periods_ids, 'draft',)) res = self.cr.dictfetchall() i = 0 diff --git a/addons/account_followup/account_followup.py b/addons/account_followup/account_followup.py index 84a6a07332e..5b45c9ac002 100644 --- a/addons/account_followup/account_followup.py +++ b/addons/account_followup/account_followup.py @@ -309,7 +309,7 @@ class res_partner(osv.osv): ('reconcile_id', '=', False), ('state', '!=', 'draft'), ('company_id', '=', company_id), - ('date_maturity', '<=', fields.date.context_today(self,cr,uid)), + '|', ('date_maturity', '=', False), ('date_maturity', '<=', fields.date.context_today(self, cr, uid)), ], context=context): raise osv.except_osv(_('Error!'),_("The partner does not have any accounting entries to print in the overdue report for the current company.")) self.message_post(cr, uid, [ids[0]], body=_('Printed overdue payments report'), context=context) diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 292b5e044ee..d2acb65d5dc 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -55,7 +55,7 @@ class report_rappel(report_sxw.rml_parse): ('reconcile_id', '=', False), ('state', '!=', 'draft'), ('company_id', '=', company_id), - ('date_maturity', '<=', fields.date.context_today(self,self.cr,self.uid)), + '|', ('date_maturity', '=', False), ('date_maturity', '<=', fields.date.context_today(self, self.cr, self.uid)), ]) # lines_per_currency = {currency: [line data, ...], ...} diff --git a/addons/delivery/sale.py b/addons/delivery/sale.py index 43fb7902943..a31b51ce000 100644 --- a/addons/delivery/sale.py +++ b/addons/delivery/sale.py @@ -65,6 +65,7 @@ class sale_order(osv.Model): carrier_obj = self.pool.get('delivery.carrier') acc_fp_obj = self.pool.get('account.fiscal.position') self._delivery_unset(cr, uid, ids, context=context) + currency_obj = self.pool.get('res.currency') for order in self.browse(cr, uid, ids, context=context): grid_id = carrier_obj.grid_get(cr, uid, [order.carrier_id.id], order.partner_shipping_id.id) if not grid_id: @@ -78,6 +79,10 @@ class sale_order(osv.Model): taxes = grid.carrier_id.product_id.taxes_id fpos = order.fiscal_position or False taxes_ids = acc_fp_obj.map_tax(cr, uid, fpos, taxes) + price_unit = grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context) + if order.company_id.currency_id.id != order.pricelist_id.currency_id.id: + price_unit = currency_obj.compute(cr, uid, order.company_id.currency_id.id, order.pricelist_id.currency_id.id, + price_unit, context=dict(context or {}, date=order.date_order)) #create the sale order line line_obj.create(cr, uid, { 'order_id': order.id, @@ -85,7 +90,7 @@ class sale_order(osv.Model): 'product_uom_qty': 1, 'product_uom': grid.carrier_id.product_id.uom_id.id, 'product_id': grid.carrier_id.product_id.id, - 'price_unit': grid_obj.get_price(cr, uid, grid.id, order, time.strftime('%Y-%m-%d'), context), + 'price_unit': price_unit, 'tax_id': [(6, 0, taxes_ids)], 'is_delivery': True }, context=context) diff --git a/addons/l10n_ca/account_chart_en.xml b/addons/l10n_ca/account_chart_en.xml index a929e213842..fe4753e0928 100644 --- a/addons/l10n_ca/account_chart_en.xml +++ b/addons/l10n_ca/account_chart_en.xml @@ -339,133 +339,157 @@ LABOUR TAXES TO PAY - - 2141 - - view - - CANADIAN REVENU AGENCY - + + 2141 + + view + + CANADA REVENUE AGENCY + - - 21411 - - view - - EMPLOYMENT INSURANCE TO PAY - + + 21411 + + view + + EMPLOYMENT INSURANCE TO PAY + - - 214111 - - other - - EI - Employees Contribution - + + 214111 + + other + + EI - Employees Contribution + - - 214112 - - other - - EI - Employer Contribution - + + 214112 + + other + + EI - Employer Contribution + - - 21412 - - other - - Federal Income Tax - + + 21412 + + other + + Federal Income Tax + - - 2142 - - view - - PROVINCIAL REVENU AGENCY - + + 21413 + + view + + CANADA PENSION PLAN TO PAY + - - 21421 - - other - - Health Services Fund to pay - + + 214131 + + other + + CPP - Employees Contribution + - - 21422 - - view - - ANNUITIES TO PAY - + + 214132 + + other + + CPP - Employer Contribution + - - 214221 - - other - - Annuities - Employees Contribution - + + 2142 + + view + + PROVINCIAL REVENU AGENCY + - - 214222 - - other - - Annuities - Employer Contribution - + + 21421 + + other + + Health Services Fund to pay + - - 21423 - - view - - PARENTAL INSURANCE PLAN TO PAY - + + 21422 + + view + + PROVINCIAL PENSION PLAN TO PAY + - - 214231 - - other - - PAP - Employee Contribution - + + 214221 + + other + + Provincial Pension Plan - Employees Contribution + - - 214232 - - other - - PAP - Employer Contribution - + + 214222 + + other + + Provincial Pension Plan - Employer Contribution + - - 21424 - - other - - Labour Health and Safety to pay - + + 21423 + + view + + PROVINCIAL PARENTAL INSURANCE PLAN TO PAY + - - 21425 - - other - - Labour Standards to pay - + + 214231 + + other + + Parental Insurance Plan - Employee Contribution + - - 21426 - - other - - Provincial Income Tax - + + 214232 + + other + + Parental Insurance Plan - Employer Contribution + + + + 21424 + + other + + Labour Health and Safety to pay + + + + 21425 + + other + + Labour Standards to pay + + + + 21426 + + other + + Provincial Income Tax + 215 @@ -499,6 +523,86 @@ Stock Received But Not Billed + + 218 + + view + + CURRENT LIABILITIES RELATED TO SALARIES + + + + 2181 + + other + + Salaries to pay + + + + 2183 + + other + + Bonus to pay + + + + 2184 + + other + + Retroactive Payment to pay + + + + 2185 + + view + + GROUP PENSION PLAN TO PAY + + + + 218501 + + other + + Group Pension Plan to pay - Employees Contribution + + + + 218502 + + other + + Group Pension Plan to pay - Employer Contribution + + + + 2186 + + view + + EMPLOYEE BENEFITS + + + + 218601 + + other + + Employee Benefits Provision - Employees Contribution + + + + 218602 + + other + + Employee Benefits Provision - Employer Contribution + + 25 @@ -523,14 +627,70 @@ PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES - - 254 + + 2521 + + other + + Provision for pension plans + + + + 253 view DEFERRED TAXES + + 254 + + view + + NON-CURRENT LIABILITIES RELATED TO SALARIES + + + + 2541 + + view + + Leaves Accruded + + + + 254101 + + other + + Vacations Accruded + + + + 254102 + + other + + Compensatory Days Accruded + + + + 254103 + + other + + Sick Leaves Accruded + + + + 2542 + + other + + Bonus Accruded + + 259 @@ -737,93 +897,158 @@ International Purchases - - 512 - - view - - LABOUR EXPENSES - + + 512 + + view + + LABOUR EXPENSES + - - 51201 - - other - - Salaries, wages and commissions - + + 5121 + + view + + Salaries + - - 51202 - - other - - Holidays - + + 512101 + + other + + Regular Salaries + - - 51203 - - other - - Employment Insurance - + + 512102 + + other + + Bonus + - - 51204 - - other - - Health Services Fund - + + 512103 + + other + + Retroactive Pay + - - 51205 - - other - - Annuities - + + 5122 + + view + + Leaves Accruded + - - 51206 - - other - - Parental Insurance - + + 512201 + + other + + Vacations Accruded + - - 51207 - - other - - Labour Health and Safety - + + 512202 + + other + + Compensatory Days Accruded + - - 51208 - - other - - Labour Standards - + + 512203 + + other + + Sick Leaves Accruded + - - 51209 - - other - - Federal Income Tax - + + 5123 + + view + + Employer Contributions + + + + 512301 + + other + + Canada Pension Plan + + + + 512302 + + other + + Employment Insurance + + + + 512303 + + other + + Group Pension Plan + + + + 512304 + + other + + Employee benefits expense + + + + 512310 + + other + + Provincial Pension Plan + + + + 512311 + + other + + Provincial Parental Insurance Plan + + + + 512312 + + other + + Labour Health and Safety + + + + 512313 + + other + + Labour Standards + + + + 512314 + + other + + Health Service Fund + - - 51210 - - other - - Provincial Income Tax - 513 diff --git a/addons/l10n_ca/account_chart_fr.xml b/addons/l10n_ca/account_chart_fr.xml index 57e6c84aa71..7d358f04bca 100644 --- a/addons/l10n_ca/account_chart_fr.xml +++ b/addons/l10n_ca/account_chart_fr.xml @@ -330,141 +330,165 @@ TVH à payer - 15% - - 214 - - view - - IMPÔTS LIÉS AUX SALAIRES À PAYER - - - - 2141 - - view - - AGENCE DU REVENU DU CANADA - + + 214 + + view + + DAS ET CONTRIBUTIONS DE L'EMPLOYEUR À PAYER + - - 21411 - - view - - ASSURANCE EMPLOI À PAYER - + + 2141 + + view + + AGENCE DU REVENU DU CANADA + - - 214111 - - other - - AE - Contribution des employés - + + 21411 + + view + + ASSURANCE EMPLOI À PAYER + - - 214112 - - other - - AE - Contribution de l'employeur - + + 214111 + + other + + AE - Contribution des employés + - - 21412 - - other - - Impôt fédéral sur les revenus - + + 214112 + + other + + AE - Contribution de l'employeur + - - 2142 - - view - - AGENCE DU REVENU PROVINCIAL - + + 21412 + + other + + Impôt fédéral sur les revenus + - - 21421 - - other - - Fond des Services de Santé à payer - + + 21413 + + view + + RÉGIME DE PENSIONS DU CANADA À PAYER + - - 21422 - - view - - RENTES À PAYER - + + 214131 + + other + + RPC - Contribution des employés + - - 214221 - - other - - Rentes - Contribution des employés - + + 214132 + + other + + RPC - Contribution de l'employeur + - - 214222 - - other - - Rentes - Contribution de l'employeur - + + 2142 + + view + + AGENCE PROVINCIALE + - - 21423 - - view - - ASSURANCE PARENTALE À PAYER - - - - 214231 - - other - - AP - Contribution des employés - - - - 214232 - - other - - AP - Contribution de l'employeur - + + 21421 + + other + + Fond des Services de Santé à payer + - - 21424 - - other - - Santé et Sécurité au Travail à payer - + + 21422 + + view + + RÉGIME DE PENSION PROVINCIAL À PAYER + - - 21425 - - other - - Normes du Travail à payer - + + 214221 + + other + + Régime de pension provincial - Contribution des employés + - - 21426 - - other - - Impôt provincial sur les revenus - + + 214222 + + other + + Régime de pension provincial - Contribution de l'employeur + + + + 21423 + + view + + RÉGIME PROVINCIAL D'ASSURANCE PARENTALE À PAYER + + + + 214231 + + other + + Assurance parentale - Contribution des employés + + + + 214232 + + other + + Assurance parentale - Contribution de l'employeur + + + + 21424 + + other + + Santé et Sécurité au Travail à payer + + + + 21425 + + other + + Normes du Travail à payer + + + + 21426 + + other + + Impôt provincial sur les revenus + 215 @@ -498,6 +522,87 @@ Stock reçu non facturé + + 218 + + view + + PASSIFS COURANTS LIÉS AUX SALAIRES + + + + 2181 + + other + + Salaires à payer + + + + 2183 + + other + + Bonis à payer + + + + 2184 + + other + + Paie Rétroactive à payer + + + + + 2185 + + view + + RÉGIMES DE PENSION COLLECTIFS À PAYER + + + + 218501 + + other + + Régimes de pension collectifs à payer - Contribution des employés + + + + 218502 + + other + + Régimes de pension collectifs à payer - Contribution de l'employeur + + + + 2186 + + view + + PROVISION POUR AVANTAGES SOCIAUX + + + + 218601 + + other + + Provision pour avantages sociaux - Contribution de l'employé + + + + 218602 + + other + + Provision pour avantages sociaux - Contribution de l'employeur + + 25 @@ -522,21 +627,69 @@ PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI - - 253 - - view - - IMPÔTS DIFFÉRÉS - - - - 254 - - view - - AUTRES PASSIFS NON-COURANTS - + + 253 + + view + + IMPÔTS DIFFÉRÉS + + + + 254 + + view + + PASSIFS NON-COURANTS LIÉS AUX SALAIRES + + + + 2541 + + view + + Congés Accumulés + + + + 254101 + + other + + Vacances Accumulées + + + + 254102 + + other + + Jours Compensatoires Accumulés + + + + 254103 + + other + + Congés de Maladie Accumulés + + + + 2542 + + other + + Bonis Accumulés + + + + 259 + + view + + AUTRES PASSIFS NON-COURANTS + @@ -744,93 +897,157 @@ Achats à l'étranger - - 512 - - view - - SALAIRES ET CHARGES SOCIALES - + + 512 + + view + + SALAIRES ET CHARGES SOCIALES + - - 51201 - - other - - Salaires - + + 5121 + + view + + Salaires + - - 51202 - - other - - Vacances - + + 512101 + + other + + Salaires Réguliers + - - 51203 - - other - - Assurance Emploi - + + 512102 + + other + + Bonis + - - 51204 - - other - - Fonds des services de santé - + + 512103 + + other + + Paies Rétroactives + - - 51205 - - other - - Rentes - + + 5122 + + view + + Congés Accumulées + - - 51206 - - other - - Assurance parentale - + + 512201 + + other + + Vacances Accumulées + - - 51207 - - other - - Santé et sécurité au travail - + + 512202 + + other + + Jours Compensatoires Accumulées + - - 51208 - - other - - Normes du travail - + + 512203 + + other + + Congés de Maladie Accumulés + - - 51209 - - other - - Impôt fédéral - + + 5123 + + view + + Contributions de l'Employeur + - - 51210 - - other - - Impôt provincial - + + 512301 + + other + + Régime de Pensions du Canada + + + + 512302 + + other + + Assurance Emploi + + + + 512303 + + other + + Régimes de pension collectifs + + + + 512304 + + other + + Dépense d'avantages sociaux + + + + 512310 + + other + + Régime de pension provincial + + + + 512311 + + other + + Régime d'assurance parental provincial + + + + 512312 + + other + + Santé et sécurité au travail + + + + 512313 + + other + + Normes du travail + + + + 512314 + + other + + Fonds des services de santé + 513 diff --git a/addons/l10n_ca/account_tax_en.xml b/addons/l10n_ca/account_tax_en.xml index 4c15ebb68ed..810827b047e 100644 --- a/addons/l10n_ca/account_tax_en.xml +++ b/addons/l10n_ca/account_tax_en.xml @@ -14,6 +14,8 @@ 1 percent 1 + + @@ -32,6 +34,8 @@ + + @@ -49,6 +53,8 @@ + + @@ -61,6 +67,8 @@ 1 percent + + @@ -79,6 +87,8 @@ + + @@ -96,6 +106,8 @@ + + @@ -108,6 +120,8 @@ 1 percent + + @@ -125,6 +139,8 @@ + + @@ -142,6 +158,8 @@ + + @@ -154,6 +172,8 @@ 1 percent + + @@ -172,6 +192,8 @@ + + @@ -189,6 +211,8 @@ + + @@ -206,6 +230,8 @@ + + @@ -221,6 +247,8 @@ + + @@ -236,6 +264,8 @@ + + @@ -253,6 +283,8 @@ + + @@ -267,6 +299,8 @@ 1 percent 1 + + @@ -285,6 +319,8 @@ + + @@ -302,6 +338,8 @@ + + @@ -314,6 +352,8 @@ 1 percent + + @@ -332,6 +372,8 @@ + + @@ -349,6 +391,8 @@ + + @@ -361,6 +405,8 @@ 1 percent + + @@ -378,6 +424,8 @@ + + @@ -395,6 +443,8 @@ + + @@ -407,6 +457,8 @@ 1 percent + + @@ -425,6 +477,8 @@ + + @@ -442,6 +496,8 @@ + + @@ -459,6 +515,8 @@ + + @@ -474,6 +532,8 @@ + + @@ -489,6 +549,8 @@ + + @@ -506,6 +568,8 @@ + + diff --git a/addons/l10n_ca/account_tax_fr.xml b/addons/l10n_ca/account_tax_fr.xml index 6c37befa139..8f01051c0ef 100644 --- a/addons/l10n_ca/account_tax_fr.xml +++ b/addons/l10n_ca/account_tax_fr.xml @@ -14,6 +14,8 @@ 1 1 percent + + @@ -32,6 +34,8 @@ + + @@ -49,6 +53,8 @@ + + @@ -61,6 +67,8 @@ 1 percent + + @@ -79,6 +87,8 @@ + + @@ -96,6 +106,8 @@ + + @@ -108,6 +120,8 @@ 1 percent + + @@ -125,6 +139,8 @@ + + @@ -142,6 +158,8 @@ + + @@ -154,6 +172,8 @@ 1 percent + + @@ -172,6 +192,8 @@ + + @@ -189,6 +211,8 @@ + + @@ -206,6 +230,8 @@ + + @@ -221,6 +247,8 @@ + + @@ -236,6 +264,8 @@ + + @@ -253,6 +283,8 @@ + + @@ -268,6 +300,8 @@ 1 percent 1 + + @@ -286,6 +320,8 @@ + + @@ -303,6 +339,8 @@ + + @@ -315,6 +353,8 @@ 1 percent + + @@ -333,6 +373,8 @@ + + @@ -350,6 +392,8 @@ + + @@ -362,6 +406,8 @@ 1 percent + + @@ -379,6 +425,8 @@ + + @@ -396,6 +444,8 @@ + + @@ -408,6 +458,8 @@ 1 percent + + @@ -426,6 +478,8 @@ + + @@ -443,6 +497,8 @@ + + @@ -460,6 +516,8 @@ + + @@ -475,6 +533,8 @@ + + @@ -490,6 +550,8 @@ + + @@ -507,6 +569,8 @@ + + diff --git a/addons/note/note.py b/addons/note/note.py index 2d6e5f8c098..f4dde855bce 100644 --- a/addons/note/note.py +++ b/addons/note/note.py @@ -168,7 +168,7 @@ class note_note(osv.osv): return result else: - return super(note_note, self).read_group(self, cr, uid, domain, fields, groupby, + return super(note_note, self).read_group(cr, uid, domain, fields, groupby, offset=offset, limit=limit, context=context, orderby=orderby,lazy=lazy) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 8b82ed0cbd2..189afae257a 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -2274,6 +2274,10 @@ instance.web.search.ExtendedSearchProposition.Float = instance.web.search.Extend {value: "∃", text: _lt("is set")}, {value: "∄", text: _lt("is not set")} ], + init: function (parent) { + this._super(parent); + this.decimal_point = instance.web._t.database.parameters.decimal_point; + }, toString: function () { return this.$el.val(); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index cbda567d356..d28d021e298 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1789,7 +1789,11 @@ - +