odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[MERGE] forward port of branch saas-3 up to e552e09

This commit is contained in:
Denis Ledoux 2015-04-30 15:45:03 +02:00
parent cff65f57eb e552e09873
commit 41f4b11ef4
12 changed files with 1021 additions and 428 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
addons/account/account.py
View File

@ -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)

7
addons/account/report/report_vat.py
View File

@ -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

2
addons/account_followup/account_followup.py
View File

@ -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)

2
addons/account_followup/report/account_followup_print.py
View File

@ -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, ...], ...}

7
addons/delivery/sale.py
View File

@ -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)

607
addons/l10n_ca/account_chart_en.xml
View File

@ -339,133 +339,157 @@
<field name="name">LABOUR TAXES TO PAY</field>
</record>
<record id="chart2141_en" model="account.account.template">
<field name="code">2141</field>
<field name="parent_id" ref="chart214_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">CANADIAN REVENU AGENCY</field>
</record>
<record id="chart2141_en" model="account.account.template">
<field name="code">2141</field>
<field name="parent_id" ref="chart214_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">CANADA REVENUE AGENCY</field>
</record>
<record id="chart21411_en" model="account.account.template">
<field name="code">21411</field>
<field name="parent_id" ref="chart2141_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">EMPLOYMENT INSURANCE TO PAY</field>
</record>
<record id="chart21411_en" model="account.account.template">
<field name="code">21411</field>
<field name="parent_id" ref="chart2141_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">EMPLOYMENT INSURANCE TO PAY</field>
</record>
<record id="chart214111_en" model="account.account.template">
<field name="code">214111</field>
<field name="parent_id" ref="chart21411_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">EI - Employees Contribution</field>
</record>
<record id="chart214111_en" model="account.account.template">
<field name="code">214111</field>
<field name="parent_id" ref="chart21411_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">EI - Employees Contribution</field>
</record>
<record id="chart214112_en" model="account.account.template">
<field name="code">214112</field>
<field name="parent_id" ref="chart21411_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">EI - Employer Contribution</field>
</record>
<record id="chart214112_en" model="account.account.template">
<field name="code">214112</field>
<field name="parent_id" ref="chart21411_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">EI - Employer Contribution</field>
</record>
<record id="chart21412_en" model="account.account.template">
<field name="code">21412</field>
<field name="parent_id" ref="chart2141_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Federal Income Tax</field>
</record>
<record id="chart21412_en" model="account.account.template">
<field name="code">21412</field>
<field name="parent_id" ref="chart2141_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Federal Income Tax</field>
</record>
<record id="chart2142_en" model="account.account.template">
<field name="code">2142</field>
<field name="parent_id" ref="chart214_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PROVINCIAL REVENU AGENCY</field>
</record>
<record id="chart21413_en" model="account.account.template">
<field name="code">21413</field>
<field name="parent_id" ref="chart2141_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">CANADA PENSION PLAN TO PAY</field>
</record>
<record id="chart21421_en" model="account.account.template">
<field name="code">21421</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Health Services Fund to pay</field>
</record>
<record id="chart214131_en" model="account.account.template">
<field name="code">214131</field>
<field name="parent_id" ref="chart21413_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">CPP - Employees Contribution</field>
</record>
<record id="chart21422_en" model="account.account.template">
<field name="code">21422</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">ANNUITIES TO PAY</field>
</record>
<record id="chart214132_en" model="account.account.template">
<field name="code">214132</field>
<field name="parent_id" ref="chart21413_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">CPP - Employer Contribution</field>
</record>
<record id="chart214221_en" model="account.account.template">
<field name="code">214221</field>
<field name="parent_id" ref="chart21422_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Annuities - Employees Contribution</field>
</record>
<record id="chart2142_en" model="account.account.template">
<field name="code">2142</field>
<field name="parent_id" ref="chart214_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PROVINCIAL REVENU AGENCY</field>
</record>
<record id="chart214222_en" model="account.account.template">
<field name="code">214222</field>
<field name="parent_id" ref="chart21422_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Annuities - Employer Contribution</field>
</record>
<record id="chart21421_en" model="account.account.template">
<field name="code">21421</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Health Services Fund to pay</field>
</record>
<record id="chart21423_en" model="account.account.template">
<field name="code">21423</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PARENTAL INSURANCE PLAN TO PAY</field>
</record>
<record id="chart21422_en" model="account.account.template">
<field name="code">21422</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PROVINCIAL PENSION PLAN TO PAY</field>
</record>
<record id="chart214231_en" model="account.account.template">
<field name="code">214231</field>
<field name="parent_id" ref="chart21423_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">PAP - Employee Contribution</field>
</record>
<record id="chart214221_en" model="account.account.template">
<field name="code">214221</field>
<field name="parent_id" ref="chart21422_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Provincial Pension Plan - Employees Contribution</field>
</record>
<record id="chart214232_en" model="account.account.template">
<field name="code">214232</field>
<field name="parent_id" ref="chart21423_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">PAP - Employer Contribution</field>
</record>
<record id="chart214222_en" model="account.account.template">
<field name="code">214222</field>
<field name="parent_id" ref="chart21422_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Provincial Pension Plan - Employer Contribution</field>
</record>
<record id="chart21424_en" model="account.account.template">
<field name="code">21424</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Labour Health and Safety to pay</field>
</record>
<record id="chart21423_en" model="account.account.template">
<field name="code">21423</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PROVINCIAL PARENTAL INSURANCE PLAN TO PAY</field>
</record>
<record id="chart21425_en" model="account.account.template">
<field name="code">21425</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Labour Standards to pay</field>
</record>
<record id="chart214231_en" model="account.account.template">
<field name="code">214231</field>
<field name="parent_id" ref="chart21423_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Parental Insurance Plan - Employee Contribution</field>
</record>
<record id="chart21426_en" model="account.account.template">
<field name="code">21426</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Provincial Income Tax</field>
</record>
<record id="chart214232_en" model="account.account.template">
<field name="code">214232</field>
<field name="parent_id" ref="chart21423_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Parental Insurance Plan - Employer Contribution</field>
</record>
<record id="chart21424_en" model="account.account.template">
<field name="code">21424</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Labour Health and Safety to pay</field>
</record>
<record id="chart21425_en" model="account.account.template">
<field name="code">21425</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Labour Standards to pay</field>
</record>
<record id="chart21426_en" model="account.account.template">
<field name="code">21426</field>
<field name="parent_id" ref="chart2142_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Provincial Income Tax</field>
</record>
<record id="chart215_en" model="account.account.template">
<field name="code">215</field>
@ -499,6 +523,86 @@
<field name="name">Stock Received But Not Billed</field>
</record>
<record id="chart218_en" model="account.account.template">
<field name="code">218</field>
<field name="parent_id" ref="chart21_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">CURRENT LIABILITIES RELATED TO SALARIES</field>
</record>
<record id="chart2181_en" model="account.account.template">
<field name="code">2181</field>
<field name="parent_id" ref="chart218_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Salaries to pay</field>
</record>
<record id="chart2183_en" model="account.account.template">
<field name="code">2183</field>
<field name="parent_id" ref="chart218_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Bonus to pay</field>
</record>
<record id="chart2184_en" model="account.account.template">
<field name="code">2184</field>
<field name="parent_id" ref="chart218_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Retroactive Payment to pay</field>
</record>
<record id="chart2185_en" model="account.account.template">
<field name="code">2185</field>
<field name="parent_id" ref="chart218_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">GROUP PENSION PLAN TO PAY</field>
</record>
<record id="chart218501_en" model="account.account.template">
<field name="code">218501</field>
<field name="parent_id" ref="chart2185_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Group Pension Plan to pay - Employees Contribution</field>
</record>
<record id="chart218502_en" model="account.account.template">
<field name="code">218502</field>
<field name="parent_id" ref="chart2185_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Group Pension Plan to pay - Employer Contribution</field>
</record>
<record id="chart2186_en" model="account.account.template">
<field name="code">2186</field>
<field name="parent_id" ref="chart218_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">EMPLOYEE BENEFITS</field>
</record>
<record id="chart218601_en" model="account.account.template">
<field name="code">218601</field>
<field name="parent_id" ref="chart2186_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Employee Benefits Provision - Employees Contribution</field>
</record>
<record id="chart218602_en" model="account.account.template">
<field name="code">218602</field>
<field name="parent_id" ref="chart2186_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Employee Benefits Provision - Employer Contribution</field>
</record>
<record id="chart25_en" model="account.account.template">
<field name="code">25</field>
<field name="parent_id" ref="chart2_en"/>
@ -523,14 +627,70 @@
<field name="name">PROVISIONS FOR PENSIONS AND OTHER POST-EMPLOYMENT ADVANTAGES</field>
</record>
<record id="chart254_en" model="account.account.template">
<field name="code">254</field>
<record id="chart2521_en" model="account.account.template">
<field name="code">2521</field>
<field name="parent_id" ref="chart252_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Provision for pension plans</field>
</record>
<record id="chart253_en" model="account.account.template">
<field name="code">253</field>
<field name="parent_id" ref="chart25_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">DEFERRED TAXES</field>
</record>
<record id="chart254_en" model="account.account.template">
<field name="code">254</field>
<field name="parent_id" ref="chart25_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">NON-CURRENT LIABILITIES RELATED TO SALARIES</field>
</record>
<record id="chart2541_en" model="account.account.template">
<field name="code">2541</field>
<field name="parent_id" ref="chart254_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">Leaves Accruded</field>
</record>
<record id="chart254101_en" model="account.account.template">
<field name="code">254101</field>
<field name="parent_id" ref="chart2541_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Vacations Accruded</field>
</record>
<record id="chart254102_en" model="account.account.template">
<field name="code">254102</field>
<field name="parent_id" ref="chart2541_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Compensatory Days Accruded</field>
</record>
<record id="chart254103_en" model="account.account.template">
<field name="code">254103</field>
<field name="parent_id" ref="chart2541_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Sick Leaves Accruded</field>
</record>
<record id="chart2542_en" model="account.account.template">
<field name="code">2542</field>
<field name="parent_id" ref="chart254_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Bonus Accruded</field>
</record>
<record id="chart259_en" model="account.account.template">
<field name="code">259</field>
<field name="parent_id" ref="chart25_en"/>
@ -737,93 +897,158 @@
<field name="name">International Purchases</field>
</record>
<record id="chart512_en" model="account.account.template">
<field name="code">512</field>
<field name="parent_id" ref="chart51_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">LABOUR EXPENSES</field>
</record>
<record id="chart512_en" model="account.account.template">
<field name="code">512</field>
<field name="parent_id" ref="chart51_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">LABOUR EXPENSES</field>
</record>
<record id="chart51201_en" model="account.account.template">
<field name="code">51201</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Salaries, wages and commissions</field>
</record>
<record id="chart5121_en" model="account.account.template">
<field name="code">5121</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">Salaries</field>
</record>
<record id="chart51202_en" model="account.account.template">
<field name="code">51202</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Holidays</field>
</record>
<record id="chart512101_en" model="account.account.template">
<field name="code">512101</field>
<field name="parent_id" ref="chart5121_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Regular Salaries</field>
</record>
<record id="chart51203_en" model="account.account.template">
<field name="code">51203</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Employment Insurance</field>
</record>
<record id="chart512102_en" model="account.account.template">
<field name="code">512102</field>
<field name="parent_id" ref="chart5121_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Bonus</field>
</record>
<record id="chart51204_en" model="account.account.template">
<field name="code">51204</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Health Services Fund</field>
</record>
<record id="chart512103_en" model="account.account.template">
<field name="code">512103</field>
<field name="parent_id" ref="chart5121_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Retroactive Pay</field>
</record>
<record id="chart51205_en" model="account.account.template">
<field name="code">51205</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Annuities</field>
</record>
<record id="chart5122_en" model="account.account.template">
<field name="code">5122</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">Leaves Accruded</field>
</record>
<record id="chart51206_en" model="account.account.template">
<field name="code">51206</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Parental Insurance</field>
</record>
<record id="chart512201_en" model="account.account.template">
<field name="code">512201</field>
<field name="parent_id" ref="chart5122_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Vacations Accruded</field>
</record>
<record id="chart51207_en" model="account.account.template">
<field name="code">51207</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Labour Health and Safety</field>
</record>
<record id="chart512202_en" model="account.account.template">
<field name="code">512202</field>
<field name="parent_id" ref="chart5122_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Compensatory Days Accruded</field>
</record>
<record id="chart51208_en" model="account.account.template">
<field name="code">51208</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Labour Standards</field>
</record>
<record id="chart512203_en" model="account.account.template">
<field name="code">512203</field>
<field name="parent_id" ref="chart5122_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Sick Leaves Accruded</field>
</record>
<record id="chart51209_en" model="account.account.template">
<field name="code">51209</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Federal Income Tax</field>
</record>
<record id="chart5123_en" model="account.account.template">
<field name="code">5123</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">Employer Contributions</field>
</record>
<record id="chart512301_en" model="account.account.template">
<field name="code">512301</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Canada Pension Plan</field>
</record>
<record id="chart512302_en" model="account.account.template">
<field name="code">512302</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Employment Insurance</field>
</record>
<record id="chart512303_en" model="account.account.template">
<field name="code">512303</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Group Pension Plan</field>
</record>
<record id="chart512304_en" model="account.account.template">
<field name="code">512304</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Employee benefits expense</field>
</record>
<record id="chart512310_en" model="account.account.template">
<field name="code">512310</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Provincial Pension Plan</field>
</record>
<record id="chart512311_en" model="account.account.template">
<field name="code">512311</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Provincial Parental Insurance Plan</field>
</record>
<record id="chart512312_en" model="account.account.template">
<field name="code">512312</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Labour Health and Safety</field>
</record>
<record id="chart512313_en" model="account.account.template">
<field name="code">512313</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Labour Standards</field>
</record>
<record id="chart512314_en" model="account.account.template">
<field name="code">512314</field>
<field name="parent_id" ref="chart5123_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Health Service Fund</field>
</record>
<record id="chart51210_en" model="account.account.template">
<field name="code">51210</field>
<field name="parent_id" ref="chart512_en"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Provincial Income Tax</field>
</record>
<record id="chart513_en" model="account.account.template">
<field name="code">513</field>
<field name="parent_id" ref="chart51_en"/>

645
addons/l10n_ca/account_chart_fr.xml
View File

@ -330,141 +330,165 @@
<field name="name">TVH à payer - 15%</field>
</record>
<record id="chart214_fr" model="account.account.template">
<field name="code">214</field>
<field name="parent_id" ref="chart21_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">IMPÔTS LIÉS AUX SALAIRES À PAYER</field>
</record>
<record id="chart2141_fr" model="account.account.template">
<field name="code">2141</field>
<field name="parent_id" ref="chart214_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">AGENCE DU REVENU DU CANADA</field>
</record>
<record id="chart214_fr" model="account.account.template">
<field name="code">214</field>
<field name="parent_id" ref="chart21_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">DAS ET CONTRIBUTIONS DE L'EMPLOYEUR À PAYER</field>
</record>
<record id="chart21411_fr" model="account.account.template">
<field name="code">21411</field>
<field name="parent_id" ref="chart2141_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">ASSURANCE EMPLOI À PAYER</field>
</record>
<record id="chart2141_fr" model="account.account.template">
<field name="code">2141</field>
<field name="parent_id" ref="chart214_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">AGENCE DU REVENU DU CANADA</field>
</record>
<record id="chart214111_fr" model="account.account.template">
<field name="code">214111</field>
<field name="parent_id" ref="chart21411_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">AE - Contribution des employés</field>
</record>
<record id="chart21411_fr" model="account.account.template">
<field name="code">21411</field>
<field name="parent_id" ref="chart2141_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">ASSURANCE EMPLOI À PAYER</field>
</record>
<record id="chart214112_fr" model="account.account.template">
<field name="code">214112</field>
<field name="parent_id" ref="chart21411_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">AE - Contribution de l'employeur</field>
</record>
<record id="chart214111_fr" model="account.account.template">
<field name="code">214111</field>
<field name="parent_id" ref="chart21411_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">AE - Contribution des employés</field>
</record>
<record id="chart21412_fr" model="account.account.template">
<field name="code">21412</field>
<field name="parent_id" ref="chart2141_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Impôt fédéral sur les revenus</field>
</record>
<record id="chart214112_fr" model="account.account.template">
<field name="code">214112</field>
<field name="parent_id" ref="chart21411_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">AE - Contribution de l'employeur</field>
</record>
<record id="chart2142_fr" model="account.account.template">
<field name="code">2142</field>
<field name="parent_id" ref="chart214_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">AGENCE DU REVENU PROVINCIAL</field>
</record>
<record id="chart21412_fr" model="account.account.template">
<field name="code">21412</field>
<field name="parent_id" ref="chart2141_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Impôt fédéral sur les revenus</field>
</record>
<record id="chart21421_fr" model="account.account.template">
<field name="code">21421</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Fond des Services de Santé à payer</field>
</record>
<record id="chart21413_fr" model="account.account.template">
<field name="code">21413</field>
<field name="parent_id" ref="chart2141_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">RÉGIME DE PENSIONS DU CANADA À PAYER</field>
</record>
<record id="chart21422_fr" model="account.account.template">
<field name="code">21422</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">RENTES À PAYER</field>
</record>
<record id="chart214131_fr" model="account.account.template">
<field name="code">214131</field>
<field name="parent_id" ref="chart21413_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">RPC - Contribution des employés</field>
</record>
<record id="chart214221_fr" model="account.account.template">
<field name="code">214221</field>
<field name="parent_id" ref="chart21422_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Rentes - Contribution des employés</field>
</record>
<record id="chart214132_fr" model="account.account.template">
<field name="code">214132</field>
<field name="parent_id" ref="chart21413_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">RPC - Contribution de l'employeur</field>
</record>
<record id="chart214222_fr" model="account.account.template">
<field name="code">214222</field>
<field name="parent_id" ref="chart21422_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Rentes - Contribution de l'employeur</field>
</record>
<record id="chart2142_fr" model="account.account.template">
<field name="code">2142</field>
<field name="parent_id" ref="chart214_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">AGENCE PROVINCIALE</field>
</record>
<record id="chart21423_fr" model="account.account.template">
<field name="code">21423</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">ASSURANCE PARENTALE À PAYER</field>
</record>
<record id="chart214231_fr" model="account.account.template">
<field name="code">214231</field>
<field name="parent_id" ref="chart21423_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">AP - Contribution des employés</field>
</record>
<record id="chart214232_fr" model="account.account.template">
<field name="code">214232</field>
<field name="parent_id" ref="chart21423_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">AP - Contribution de l'employeur</field>
</record>
<record id="chart21421_fr" model="account.account.template">
<field name="code">21421</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Fond des Services de Santé à payer</field>
</record>
<record id="chart21424_fr" model="account.account.template">
<field name="code">21424</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Santé et Sécurité au Travail à payer</field>
</record>
<record id="chart21422_fr" model="account.account.template">
<field name="code">21422</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">RÉGIME DE PENSION PROVINCIAL À PAYER</field>
</record>
<record id="chart21425_fr" model="account.account.template">
<field name="code">21425</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Normes du Travail à payer</field>
</record>
<record id="chart214221_fr" model="account.account.template">
<field name="code">214221</field>
<field name="parent_id" ref="chart21422_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Régime de pension provincial - Contribution des employés</field>
</record>
<record id="chart21426_fr" model="account.account.template">
<field name="code">21426</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Impôt provincial sur les revenus</field>
</record>
<record id="chart214222_fr" model="account.account.template">
<field name="code">214222</field>
<field name="parent_id" ref="chart21422_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Régime de pension provincial - Contribution de l'employeur</field>
</record>
<record id="chart21423_fr" model="account.account.template">
<field name="code">21423</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">RÉGIME PROVINCIAL D'ASSURANCE PARENTALE À PAYER</field>
</record>
<record id="chart214231_fr" model="account.account.template">
<field name="code">214231</field>
<field name="parent_id" ref="chart21423_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Assurance parentale - Contribution des employés</field>
</record>
<record id="chart214232_fr" model="account.account.template">
<field name="code">214232</field>
<field name="parent_id" ref="chart21423_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Assurance parentale - Contribution de l'employeur</field>
</record>
<record id="chart21424_fr" model="account.account.template">
<field name="code">21424</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Santé et Sécurité au Travail à payer</field>
</record>
<record id="chart21425_fr" model="account.account.template">
<field name="code">21425</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Normes du Travail à payer</field>
</record>
<record id="chart21426_fr" model="account.account.template">
<field name="code">21426</field>
<field name="parent_id" ref="chart2142_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Impôt provincial sur les revenus</field>
</record>
<record id="chart215_fr" model="account.account.template">
<field name="code">215</field>
@ -498,6 +522,87 @@
<field name="name">Stock reçu non facturé</field>
</record>
<record id="chart218_fr" model="account.account.template">
<field name="code">218</field>
<field name="parent_id" ref="chart21_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PASSIFS COURANTS LIÉS AUX SALAIRES</field>
</record>
<record id="chart2181_fr" model="account.account.template">
<field name="code">2181</field>
<field name="parent_id" ref="chart218_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Salaires à payer</field>
</record>
<record id="chart2183_fr" model="account.account.template">
<field name="code">2183</field>
<field name="parent_id" ref="chart218_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Bonis à payer</field>
</record>
<record id="chart2184_fr" model="account.account.template">
<field name="code">2184</field>
<field name="parent_id" ref="chart218_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Paie Rétroactive à payer</field>
</record>
<!-- Montants à verser dans un RVER, RPA ou autre régime collectif -->
<record id="chart2185_fr" model="account.account.template">
<field name="code">2185</field>
<field name="parent_id" ref="chart218_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">RÉGIMES DE PENSION COLLECTIFS À PAYER</field>
</record>
<record id="chart218501_fr" model="account.account.template">
<field name="code">218501</field>
<field name="parent_id" ref="chart2185_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Régimes de pension collectifs à payer - Contribution des employés</field>
</record>
<record id="chart218502_fr" model="account.account.template">
<field name="code">218502</field>
<field name="parent_id" ref="chart2185_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Régimes de pension collectifs à payer - Contribution de l'employeur</field>
</record>
<record id="chart2186_fr" model="account.account.template">
<field name="code">2186</field>
<field name="parent_id" ref="chart218_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PROVISION POUR AVANTAGES SOCIAUX</field>
</record>
<record id="chart218601_fr" model="account.account.template">
<field name="code">218601</field>
<field name="parent_id" ref="chart2186_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Provision pour avantages sociaux - Contribution de l'employé</field>
</record>
<record id="chart218602_fr" model="account.account.template">
<field name="code">218602</field>
<field name="parent_id" ref="chart2186_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Provision pour avantages sociaux - Contribution de l'employeur</field>
</record>
<record id="chart25_fr" model="account.account.template">
<field name="code">25</field>
<field name="parent_id" ref="chart2_fr"/>
@ -522,21 +627,69 @@
<field name="name">PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POSTÉRIEURS À L'EMPLOI</field>
</record>
<record id="chart253_fr" model="account.account.template">
<field name="code">253</field>
<field name="parent_id" ref="chart25_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">IMPÔTS DIFFÉRÉS</field>
</record>
<record id="chart254_fr" model="account.account.template">
<field name="code">254</field>
<field name="parent_id" ref="chart25_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">AUTRES PASSIFS NON-COURANTS</field>
</record>
<record id="chart253_fr" model="account.account.template">
<field name="code">253</field>
<field name="parent_id" ref="chart25_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">IMPÔTS DIFFÉRÉS</field>
</record>
<record id="chart254_fr" model="account.account.template">
<field name="code">254</field>
<field name="parent_id" ref="chart25_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">PASSIFS NON-COURANTS LIÉS AUX SALAIRES</field>
</record>
<record id="chart2541_fr" model="account.account.template">
<field name="code">2541</field>
<field name="parent_id" ref="chart254_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">Congés Accumulés</field>
</record>
<record id="chart254101_fr" model="account.account.template">
<field name="code">254101</field>
<field name="parent_id" ref="chart2541_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Vacances Accumulées</field>
</record>
<record id="chart254102_fr" model="account.account.template">
<field name="code">254102</field>
<field name="parent_id" ref="chart2541_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Jours Compensatoires Accumulés</field>
</record>
<record id="chart254103_fr" model="account.account.template">
<field name="code">254103</field>
<field name="parent_id" ref="chart2541_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Congés de Maladie Accumulés</field>
</record>
<record id="chart2542_fr" model="account.account.template">
<field name="code">2542</field>
<field name="parent_id" ref="chart254_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_liability"/>
<field name="name">Bonis Accumulés</field>
</record>
<record id="chart259_fr" model="account.account.template">
<field name="code">259</field>
<field name="parent_id" ref="chart25_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">AUTRES PASSIFS NON-COURANTS</field>
</record>
<!-- CAPITAUX PROPRES -->
@ -744,93 +897,157 @@
<field name="name">Achats à l'étranger</field>
</record>
<record id="chart512_fr" model="account.account.template">
<field name="code">512</field>
<field name="parent_id" ref="chart51_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">SALAIRES ET CHARGES SOCIALES</field>
</record>
<record id="chart512_fr" model="account.account.template">
<field name="code">512</field>
<field name="parent_id" ref="chart51_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">SALAIRES ET CHARGES SOCIALES</field>
</record>
<record id="chart51201_fr" model="account.account.template">
<field name="code">51201</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Salaires</field>
</record>
<record id="chart5121_fr" model="account.account.template">
<field name="code">5121</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">Salaires</field>
</record>
<record id="chart51202_fr" model="account.account.template">
<field name="code">51202</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Vacances</field>
</record>
<record id="chart512101_fr" model="account.account.template">
<field name="code">512101</field>
<field name="parent_id" ref="chart5121_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Salaires Réguliers</field>
</record>
<record id="chart51203_fr" model="account.account.template">
<field name="code">51203</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Assurance Emploi</field>
</record>
<record id="chart512102_fr" model="account.account.template">
<field name="code">512102</field>
<field name="parent_id" ref="chart5121_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Bonis</field>
</record>
<record id="chart51204_fr" model="account.account.template">
<field name="code">51204</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Fonds des services de santé</field>
</record>
<record id="chart512103_fr" model="account.account.template">
<field name="code">512103</field>
<field name="parent_id" ref="chart5121_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Paies Rétroactives</field>
</record>
<record id="chart51205_fr" model="account.account.template">
<field name="code">51205</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Rentes</field>
</record>
<record id="chart5122_fr" model="account.account.template">
<field name="code">5122</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">Congés Accumulées</field>
</record>
<record id="chart51206_fr" model="account.account.template">
<field name="code">51206</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Assurance parentale</field>
</record>
<record id="chart512201_fr" model="account.account.template">
<field name="code">512201</field>
<field name="parent_id" ref="chart5122_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Vacances Accumulées</field>
</record>
<record id="chart51207_fr" model="account.account.template">
<field name="code">51207</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Santé et sécurité au travail</field>
</record>
<record id="chart512202_fr" model="account.account.template">
<field name="code">512202</field>
<field name="parent_id" ref="chart5122_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Jours Compensatoires Accumulées</field>
</record>
<record id="chart51208_fr" model="account.account.template">
<field name="code">51208</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Normes du travail</field>
</record>
<record id="chart512203_fr" model="account.account.template">
<field name="code">512203</field>
<field name="parent_id" ref="chart5122_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Congés de Maladie Accumulés</field>
</record>
<record id="chart51209_fr" model="account.account.template">
<field name="code">51209</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Impôt fédéral</field>
</record>
<record id="chart5123_fr" model="account.account.template">
<field name="code">5123</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">view</field>
<field name="user_type" ref="account.data_account_type_view"/>
<field name="name">Contributions de l'Employeur</field>
</record>
<record id="chart51210_fr" model="account.account.template">
<field name="code">51210</field>
<field name="parent_id" ref="chart512_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Impôt provincial</field>
</record>
<record id="chart512301_fr" model="account.account.template">
<field name="code">512301</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Régime de Pensions du Canada</field>
</record>
<record id="chart512302_fr" model="account.account.template">
<field name="code">512302</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Assurance Emploi</field>
</record>
<record id="chart512303_fr" model="account.account.template">
<field name="code">512303</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Régimes de pension collectifs</field>
</record>
<record id="chart512304_fr" model="account.account.template">
<field name="code">512304</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Dépense d'avantages sociaux</field>
</record>
<record id="chart512310_fr" model="account.account.template">
<field name="code">512310</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Régime de pension provincial</field>
</record>
<record id="chart512311_fr" model="account.account.template">
<field name="code">512311</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Régime d'assurance parental provincial</field>
</record>
<record id="chart512312_fr" model="account.account.template">
<field name="code">512312</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Santé et sécurité au travail</field>
</record>
<record id="chart512313_fr" model="account.account.template">
<field name="code">512313</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Normes du travail</field>
</record>
<record id="chart512314_fr" model="account.account.template">
<field name="code">512314</field>
<field name="parent_id" ref="chart5123_fr"/>
<field name="type">other</field>
<field name="user_type" ref="account.data_account_type_expense"/>
<field name="name">Fonds des services de santé</field>
</record>
<record id="chart513_fr" model="account.account.template">
<field name="code">513</field>

64
addons/l10n_ca/account_tax_en.xml
View File

@ -14,6 +14,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend">1</field>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="gstpst_sale_bc_gst_en" model="account.tax.template">
@ -32,6 +34,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="parent_id" ref="gstpst_bc_sale_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="pst_bc_sale_en" model="account.tax.template">
@ -49,6 +53,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
<field name="parent_id" ref="gstpst_bc_sale_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- Manitoba PST -->
@ -61,6 +67,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="gstpst_sale_mb_gst_en" model="account.tax.template">
@ -79,6 +87,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="parent_id" ref="gstpst_mb_sale_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="pst_mb_sale_en" model="account.tax.template">
@ -96,6 +106,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
<field name="parent_id" ref="gstpst_mb_sale_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- Quebec PST -->
@ -108,6 +120,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="gstqst_sale_gst_en" model="account.tax.template">
@ -125,6 +139,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="parent_id" ref="gstqst_sale_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="qst_sale_en" model="account.tax.template">
@ -142,6 +158,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
<field name="parent_id" ref="gstqst_sale_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- Saskatchewan PST -->
@ -154,6 +172,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="gstpst_sale_sk_gst_en" model="account.tax.template">
@ -172,6 +192,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="parent_id" ref="gstpst_sk_sale_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="pst_sk_sale_en" model="account.tax.template">
@ -189,6 +211,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_en"/>
<field name="parent_id" ref="gstpst_sk_sale_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- HST -->
@ -206,6 +230,8 @@
<field name="tax_code_id" ref="vat_code_payable_hst13_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst13_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_hst13_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="hst14_sale_en" model="account.tax.template">
@ -221,6 +247,8 @@
<field name="tax_code_id" ref="vat_code_payable_hst14_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst14_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_hst14_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="hst15_sale_en" model="account.tax.template">
@ -236,6 +264,8 @@
<field name="tax_code_id" ref="vat_code_payable_hst15_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst15_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_hst15_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- GST -->
@ -253,6 +283,8 @@
<field name="tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- PURCHASE TAXES -->
@ -267,6 +299,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend">1</field>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="gstpst_purc_bc_gst_en" model="account.tax.template">
@ -285,6 +319,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
<field name="parent_id" ref="gstpst_bc_purc_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="pst_bc_purc_en" model="account.tax.template">
@ -302,6 +338,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
<field name="parent_id" ref="gstpst_bc_purc_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- Manitoba PST -->
@ -314,6 +352,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="gstpst_purc_mb_gst_en" model="account.tax.template">
@ -332,6 +372,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
<field name="parent_id" ref="gstpst_mb_purc_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="pst_mb_purc_en" model="account.tax.template">
@ -349,6 +391,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
<field name="parent_id" ref="gstpst_mb_purc_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- Quebec PST -->
@ -361,6 +405,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="gstqst_purc_gst_en" model="account.tax.template">
@ -378,6 +424,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
<field name="parent_id" ref="gstqst_purc_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="qst_purc_en" model="account.tax.template">
@ -395,6 +443,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
<field name="parent_id" ref="gstqst_purc_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- Saskatchewan PST -->
@ -407,6 +457,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="gstpst_purc_sk_gst_en" model="account.tax.template">
@ -425,6 +477,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
<field name="parent_id" ref="gstpst_sk_purc_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="pst_sk_purc_en" model="account.tax.template">
@ -442,6 +496,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_en"/>
<field name="parent_id" ref="gstpst_sk_purc_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- HST -->
@ -459,6 +515,8 @@
<field name="tax_code_id" ref="vat_code_receivable_hst13_en"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_hst13_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_hst13_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="hst14_purc_en" model="account.tax.template">
@ -474,6 +532,8 @@
<field name="tax_code_id" ref="vat_code_receivable_hst14_en"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_hst14_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_hst14_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="hst15_purc_en" model="account.tax.template">
@ -489,6 +549,8 @@
<field name="tax_code_id" ref="vat_code_receivable_hst15_en"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_hst15_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_hst15_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- GST -->
@ -506,6 +568,8 @@
<field name="tax_code_id" ref="vat_code_receivable_gst_en"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_en"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_en"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
</data>

64
addons/l10n_ca/account_tax_fr.xml
View File

@ -14,6 +14,8 @@
<field name="amount">1</field>
<field name="child_depend">1</field>
<field name="type">percent</field>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="gstpst_sale_bc_gst_fr" model="account.tax.template">
@ -32,6 +34,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
<field name="parent_id" ref="gstpst_bc_sale_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="pst_bc_sale_fr" model="account.tax.template">
@ -49,6 +53,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
<field name="parent_id" ref="gstpst_bc_sale_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- Manitoba PST -->
@ -61,6 +67,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="gstpst_sale_mb_gst_fr" model="account.tax.template">
@ -79,6 +87,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
<field name="parent_id" ref="gstpst_mb_sale_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="pst_mb_sale_fr" model="account.tax.template">
@ -96,6 +106,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
<field name="parent_id" ref="gstpst_mb_sale_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- Quebec PST -->
@ -108,6 +120,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="gstqst_sale_gst_fr" model="account.tax.template">
@ -125,6 +139,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
<field name="parent_id" ref="gstqst_sale_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="tvq_sale_fr" model="account.tax.template">
@ -142,6 +158,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
<field name="parent_id" ref="gstqst_sale_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- Saskatchewan PST -->
@ -154,6 +172,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="gstpst_sale_sk_gst_fr" model="account.tax.template">
@ -172,6 +192,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
<field name="parent_id" ref="gstpst_sk_sale_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="pst_sk_sale_fr" model="account.tax.template">
@ -189,6 +211,8 @@
<field name="ref_base_code_id" ref="vat_code_base_receivable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_pst_fr"/>
<field name="parent_id" ref="gstpst_sk_sale_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- HST -->
@ -206,6 +230,8 @@
<field name="tax_code_id" ref="vat_code_payable_hst13_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst13_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_hst13_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="hst14_sale_fr" model="account.tax.template">
@ -221,6 +247,8 @@
<field name="tax_code_id" ref="vat_code_payable_hst14_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst14_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_hst14_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<record id="hst15_sale_fr" model="account.tax.template">
@ -236,6 +264,8 @@
<field name="tax_code_id" ref="vat_code_payable_hst15_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst15_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_hst15_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
<!-- GST -->
@ -253,6 +283,8 @@
<field name="tax_code_id" ref="vat_code_payable_gst_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_receivable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_payable_gst_fr"/>
<field name="ref_base_sign" eval="-1"/>
<field name="ref_tax_sign" eval="-1"/>
</record>
@ -268,6 +300,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend">1</field>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="gstpst_purc_bc_gst_fr" model="account.tax.template">
@ -286,6 +320,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
<field name="parent_id" ref="gstpst_bc_purc_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="pst_bc_purc_fr" model="account.tax.template">
@ -303,6 +339,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
<field name="parent_id" ref="gstpst_bc_purc_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- Manitoba PST -->
@ -315,6 +353,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="gstpst_purc_mb_gst_fr" model="account.tax.template">
@ -333,6 +373,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
<field name="parent_id" ref="gstpst_mb_purc_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="pst_mb_purc_fr" model="account.tax.template">
@ -350,6 +392,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
<field name="parent_id" ref="gstpst_mb_purc_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- Quebec PST -->
@ -362,6 +406,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="gstqst_purc_gst_fr" model="account.tax.template">
@ -379,6 +425,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
<field name="parent_id" ref="gstqst_purc_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="tvq_purc_fr" model="account.tax.template">
@ -396,6 +444,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
<field name="parent_id" ref="gstqst_purc_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- Saskatchewan PST -->
@ -408,6 +458,8 @@
<field name="amount">1</field>
<field name="type">percent</field>
<field name="child_depend" eval="True"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="gstpst_purc_sk_gst_fr" model="account.tax.template">
@ -426,6 +478,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
<field name="parent_id" ref="gstpst_sk_purc_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="pst_sk_purc_fr" model="account.tax.template">
@ -443,6 +497,8 @@
<field name="ref_base_code_id" ref="vat_code_base_payable_pst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_pst_fr"/>
<field name="parent_id" ref="gstpst_sk_purc_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- HST -->
@ -460,6 +516,8 @@
<field name="tax_code_id" ref="vat_code_receivable_hst13_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_hst13_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_hst13_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="hst14_purc_fr" model="account.tax.template">
@ -475,6 +533,8 @@
<field name="tax_code_id" ref="vat_code_receivable_hst14_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_hst14_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_hst14_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<record id="hst15_purc_fr" model="account.tax.template">
@ -490,6 +550,8 @@
<field name="tax_code_id" ref="vat_code_receivable_hst15_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_hst15_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_hst15_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
<!-- GST -->
@ -507,6 +569,8 @@
<field name="tax_code_id" ref="vat_code_receivable_gst_fr"/>
<field name="ref_base_code_id" ref="vat_code_base_payable_gst_fr"/>
<field name="ref_tax_code_id" ref="vat_code_receivable_gst_fr"/>
<field name="base_sign" eval="-1"/>
<field name="tax_sign" eval="-1"/>
</record>
</data>

2
addons/note/note.py
View File

@ -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)

4
addons/web/static/src/js/search.js
View File

@ -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();
},

6
addons/web/static/src/xml/base.xml
View File

@ -1789,7 +1789,11 @@
<input type="number" class="field_integer" value = "0" step="1"/>
</t>
<t t-name="SearchView.extended_search.proposition.float">
<input type="number" class="field_float" value = "0.0" step="0.01"/>
<input class="field_float"
t-att-type="widget.decimal_point === '.' ? 'number' : 'text'"
t-attf-title="Number using #{widget.decimal_point || '.' } as decimal separator."
t-attf-pattern="[0-9]+([\\#{widget.decimal_point || '.' }][0-9]+)?"
t-attf-value="0#{widget.decimal_point || '.' }0" step="0.01"/>
</t>
<t t-name="SearchView.extended_search.proposition.selection">
<select>