[MERGE] Forward-port of bugfixes from saas-1 series up to rev.8759 rev-id: odo@openerp.com-20130820152607-0p0fx87v1rqhk3vy
bzr revid: odo@openerp.com-20130820165258-3mjzbo990xg44dfu
This commit is contained in:
commit
c02afb45fa
|
@ -561,10 +561,14 @@ class account_invoice(osv.osv):
|
|||
|
||||
def onchange_payment_term_date_invoice(self, cr, uid, ids, payment_term_id, date_invoice):
|
||||
res = {}
|
||||
if isinstance(ids, (int, long)):
|
||||
ids = [ids]
|
||||
if not date_invoice:
|
||||
date_invoice = time.strftime('%Y-%m-%d')
|
||||
if not payment_term_id:
|
||||
return {'value':{'date_due': date_invoice}} #To make sure the invoice has a due date when no payment term
|
||||
inv = self.browse(cr, uid, ids[0])
|
||||
#To make sure the invoice due date should contain due date which is entered by user when there is no payment term defined
|
||||
return {'value':{'date_due': inv.date_due and inv.date_due or date_invoice}}
|
||||
pterm_list = self.pool.get('account.payment.term').compute(cr, uid, payment_term_id, value=1, date_ref=date_invoice)
|
||||
if pterm_list:
|
||||
pterm_list = [line[0] for line in pterm_list]
|
||||
|
|
|
@ -800,7 +800,7 @@ class account_move_line(osv.osv):
|
|||
r_id = move_rec_obj.create(cr, uid, {
|
||||
'type': type,
|
||||
'line_partial_ids': map(lambda x: (4,x,False), merges+unmerge)
|
||||
})
|
||||
}, context=context)
|
||||
move_rec_obj.reconcile_partial_check(cr, uid, [r_id] + merges_rec, context=context)
|
||||
return True
|
||||
|
||||
|
|
|
@ -266,7 +266,7 @@ class account_invoice(osv.osv, EDIMixin):
|
|||
params = {
|
||||
"cmd": "_xclick",
|
||||
"business": inv.company_id.paypal_account,
|
||||
"item_name": inv.company_id.name + " Invoice " + inv.number,
|
||||
"item_name": "%s Invoice %s" % (inv.company_id.name, inv.number or ''),
|
||||
"invoice": inv.number,
|
||||
"amount": inv.residual,
|
||||
"currency_code": inv.currency_id.name,
|
||||
|
|
|
@ -25,7 +25,7 @@ from dateutil.relativedelta import relativedelta
|
|||
from operator import itemgetter
|
||||
from os.path import join as opj
|
||||
|
||||
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT as DF
|
||||
from openerp.tools import DEFAULT_SERVER_DATE_FORMAT as DF
|
||||
from openerp.tools.translate import _
|
||||
from openerp.osv import fields, osv
|
||||
from openerp import tools
|
||||
|
|
|
@ -67,9 +67,10 @@
|
|||
Then I cancel Bank Statements and verifies that it raises a warning
|
||||
-
|
||||
!python {model: account.bank.statement}: |
|
||||
from openerp.osv import osv
|
||||
try:
|
||||
self.button_cancel(cr, uid, [ref("account_bank_statement_0")])
|
||||
assert False, "An exception should have been raised, the journal should not let us cancel moves!"
|
||||
except Exception:
|
||||
except osv.except_osv:
|
||||
# exception was raised as expected, as the journal does not allow cancelling moves
|
||||
pass
|
||||
|
|
|
@ -73,14 +73,16 @@
|
|||
I cancel the account move which is in posted state and verifies that it gives warning message
|
||||
-
|
||||
!python {model: account.move}: |
|
||||
from openerp.osv import osv
|
||||
inv_obj = self.pool.get('account.invoice')
|
||||
inv = inv_obj.browse(cr, uid, ref('account_invoice_supplier0'))
|
||||
try:
|
||||
mov_cancel = self.button_cancel(cr, uid, [inv.move_id.id], {'lang': u'en_US', 'tz': False,
|
||||
'active_model': 'ir.ui.menu', 'journal_type': 'purchase', 'active_ids': [ref('menu_action_invoice_tree2')],
|
||||
'type': 'in_invoice', 'active_id': ref('menu_action_invoice_tree2')})
|
||||
except Exception, e:
|
||||
assert e, 'Warning message has not been raised'
|
||||
assert False, "This should never happen!"
|
||||
except osv.except_osv:
|
||||
pass
|
||||
-
|
||||
I verify that 'Period Sum' and 'Year sum' of the tax code are the expected values
|
||||
-
|
||||
|
|
|
@ -11,7 +11,8 @@
|
|||
<separator string="Aged Partner Balance"/>
|
||||
<label string="Aged Partner Balance is a more detailed report of your receivables by intervals. When opening that report, OpenERP asks for the name of the company, the fiscal period and the size of the interval to be analyzed (in days). OpenERP then calculates a table of credit balance by period. So if you request an interval of 30 days OpenERP generates an analysis of creditors for the past month, past two months, and so on. "/>
|
||||
<group col="4">
|
||||
<field name="chart_account_id" widget='selection'/>
|
||||
<field name="chart_account_id" widget='selection' on_change="onchange_chart_id(chart_account_id, context)"/>
|
||||
<field name="fiscalyear_id" invisible="1"/>
|
||||
<newline/>
|
||||
<field name="date_from"/>
|
||||
<field name="period_length"/>
|
||||
|
|
|
@ -34,7 +34,10 @@ class account_common_report(osv.osv_memory):
|
|||
res = {}
|
||||
if chart_account_id:
|
||||
company_id = self.pool.get('account.account').browse(cr, uid, chart_account_id, context=context).company_id.id
|
||||
res['value'] = {'company_id': company_id}
|
||||
now = time.strftime('%Y-%m-%d')
|
||||
domain = [('company_id', '=', company_id), ('date_start', '<', now), ('date_stop', '>', now)]
|
||||
fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, domain, limit=1)
|
||||
res['value'] = {'company_id': company_id, 'fiscalyear_id': fiscalyears and fiscalyears[0] or False}
|
||||
return res
|
||||
|
||||
_columns = {
|
||||
|
@ -124,10 +127,11 @@ class account_common_report(osv.osv_memory):
|
|||
now = time.strftime('%Y-%m-%d')
|
||||
company_id = False
|
||||
ids = context.get('active_ids', [])
|
||||
domain = [('date_start', '<', now), ('date_stop', '>', now)]
|
||||
if ids and context.get('active_model') == 'account.account':
|
||||
company_id = self.pool.get('account.account').browse(cr, uid, ids[0], context=context).company_id.id
|
||||
domain += [('company_id', '=', company_id)]
|
||||
else: # use current company id
|
||||
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
|
||||
domain = [('company_id', '=', company_id), ('date_start', '<', now), ('date_stop', '>', now)]
|
||||
fiscalyears = self.pool.get('account.fiscalyear').search(cr, uid, domain, limit=1)
|
||||
return fiscalyears and fiscalyears[0] or False
|
||||
|
||||
|
|
|
@ -31,10 +31,10 @@ from openerp.report import report_sxw
|
|||
class res_currency(osv.osv):
|
||||
_inherit = "res.currency"
|
||||
|
||||
def _get_current_rate(self, cr, uid, ids, name, arg, context=None):
|
||||
def _get_current_rate(self, cr, uid, ids, raise_on_no_rate=True, context=None):
|
||||
if context is None:
|
||||
context = {}
|
||||
res = super(res_currency, self)._get_current_rate(cr, uid, ids, name, arg, context=context)
|
||||
res = super(res_currency, self)._get_current_rate(cr, uid, ids, raise_on_no_rate, context=context)
|
||||
if context.get('voucher_special_currency') in ids and context.get('voucher_special_currency_rate'):
|
||||
res[context.get('voucher_special_currency')] = context.get('voucher_special_currency_rate')
|
||||
return res
|
||||
|
@ -932,6 +932,8 @@ class account_voucher(osv.osv):
|
|||
move_pool = self.pool.get('account.move')
|
||||
|
||||
for voucher in self.browse(cr, uid, ids, context=context):
|
||||
# refresh to make sure you don't unlink an already removed move
|
||||
voucher.refresh()
|
||||
recs = []
|
||||
for line in voucher.move_ids:
|
||||
if line.reconcile_id:
|
||||
|
@ -1182,7 +1184,7 @@ class account_voucher(osv.osv):
|
|||
for line in voucher.line_ids:
|
||||
#create one move line per voucher line where amount is not 0.0
|
||||
# AND (second part of the clause) only if the original move line was not having debit = credit = 0 (which is a legal value)
|
||||
if not line.amount and not (line.move_line_id and not float_compare(line.move_line_id.debit, line.move_line_id.credit, precision_rounding=prec) and not float_compare(line.move_line_id.debit, 0.0, precision_rounding=prec)):
|
||||
if not line.amount and not (line.move_line_id and not float_compare(line.move_line_id.debit, line.move_line_id.credit, precision_digits=prec) and not float_compare(line.move_line_id.debit, 0.0, precision_digits=prec)):
|
||||
continue
|
||||
# convert the amount set on the voucher line into the currency of the voucher's company
|
||||
# this calls res_curreny.compute() with the right context, so that it will take either the rate on the voucher if it is relevant or will use the default behaviour
|
||||
|
@ -1282,10 +1284,8 @@ class account_voucher(osv.osv):
|
|||
}
|
||||
new_id = move_line_obj.create(cr, uid, move_line_foreign_currency, context=context)
|
||||
rec_ids.append(new_id)
|
||||
|
||||
if line.move_line_id.id:
|
||||
rec_lst_ids.append(rec_ids)
|
||||
|
||||
return (tot_line, rec_lst_ids)
|
||||
|
||||
def writeoff_move_line_get(self, cr, uid, voucher_id, line_total, move_id, name, company_currency, current_currency, context=None):
|
||||
|
|
|
@ -332,14 +332,15 @@
|
|||
<group>
|
||||
<group>
|
||||
<field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
|
||||
<field name="payment_option" required="1"/>
|
||||
<field name="payment_option" required="1" attrs="{'invisible':[('writeoff_amount','=',0)]}"/>
|
||||
<field name="writeoff_acc_id"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
|
||||
attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)], 'required':[('payment_option','=','with_writeoff')]}"
|
||||
domain="[('type','=','other')]"/>
|
||||
<field name="comment"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
||||
attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>
|
||||
<field name="analytic_id"
|
||||
groups="analytic.group_analytic_accounting"/>
|
||||
groups="analytic.group_analytic_accounting"
|
||||
attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>
|
||||
</group>
|
||||
<group>
|
||||
</group>
|
||||
|
@ -494,14 +495,15 @@
|
|||
</group>
|
||||
<group>
|
||||
<field name="writeoff_amount" widget="monetary" options="{'currency_field': 'currency_id'}"/>
|
||||
<field name="payment_option" required="1"/>
|
||||
<field name="payment_option" required="1" attrs="{'invisible':[('writeoff_amount','=',0)]}"/>
|
||||
<field name="writeoff_acc_id"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')], 'required':[('payment_option','=','with_writeoff')]}"
|
||||
attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)], 'required':[('payment_option','=','with_writeoff')]}"
|
||||
domain="[('type','=','other')]"/>
|
||||
<field name="comment"
|
||||
attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/>
|
||||
attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>
|
||||
<field name="analytic_id"
|
||||
groups="analytic.group_analytic_accounting"/>
|
||||
groups="analytic.group_analytic_accounting"
|
||||
attrs="{'invisible':['|', ('payment_option','!=','with_writeoff'), ('writeoff_amount','=',0)]}"/>
|
||||
</group>
|
||||
</group>
|
||||
</page>
|
||||
|
|
|
@ -120,7 +120,7 @@ class res_users(osv.osv):
|
|||
def set_pw(self, cr, uid, id, name, value, args, context):
|
||||
if value:
|
||||
encrypted = md5crypt(value, gen_salt())
|
||||
cr.execute('update res_users set password_crypt=%s where id=%s', (encrypted, int(id)))
|
||||
cr.execute("update res_users set password='', password_crypt=%s where id=%s", (encrypted, id))
|
||||
del value
|
||||
|
||||
def get_pw( self, cr, uid, ids, name, args, context ):
|
||||
|
@ -143,7 +143,7 @@ class res_users(osv.osv):
|
|||
cr.execute('SELECT password, password_crypt FROM res_users WHERE id=%s AND active', (uid,))
|
||||
if cr.rowcount:
|
||||
stored_password, stored_password_crypt = cr.fetchone()
|
||||
if password and not stored_password_crypt:
|
||||
if stored_password and not stored_password_crypt:
|
||||
salt = gen_salt()
|
||||
stored_password_crypt = md5crypt(stored_password, salt)
|
||||
cr.execute("UPDATE res_users SET password='', password_crypt=%s WHERE id=%s", (stored_password_crypt, uid))
|
||||
|
@ -151,14 +151,15 @@ class res_users(osv.osv):
|
|||
return super(res_users, self).check_credentials(cr, uid, password)
|
||||
except openerp.exceptions.AccessDenied:
|
||||
# check md5crypt
|
||||
if stored_password_crypt[:len(magic_md5)] == magic_md5:
|
||||
salt = stored_password_crypt[len(magic_md5):11]
|
||||
if stored_password_crypt == md5crypt(password, salt):
|
||||
return
|
||||
elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
|
||||
salt = stored_password_crypt[len(magic_md5):11]
|
||||
if stored_password_crypt == md5crypt(password, salt):
|
||||
return
|
||||
if stored_password_crypt:
|
||||
if stored_password_crypt[:len(magic_md5)] == magic_md5:
|
||||
salt = stored_password_crypt[len(magic_md5):11]
|
||||
if stored_password_crypt == md5crypt(password, salt):
|
||||
return
|
||||
elif stored_password_crypt[:len(magic_md5)] == magic_sha256:
|
||||
salt = stored_password_crypt[len(magic_md5):11]
|
||||
if stored_password_crypt == md5crypt(password, salt):
|
||||
return
|
||||
# Reraise password incorrect
|
||||
raise
|
||||
|
||||
|
|
|
@ -92,11 +92,6 @@ allows pre-setting the default groups and menus of the first-time users.
|
|||
user with the same login (and a blank password), then rename this new
|
||||
user to a username that does not exist in LDAP, and setup its groups
|
||||
the way you want.
|
||||
|
||||
Interaction with base_crypt:
|
||||
----------------------------
|
||||
The base_crypt module is not compatible with this module, and will disable LDAP
|
||||
authentication if installed at the same time.
|
||||
""",
|
||||
'website' : 'http://www.openerp.com',
|
||||
'category' : 'Authentication',
|
||||
|
|
|
@ -26,6 +26,7 @@ import openerp.exceptions
|
|||
from openerp import tools
|
||||
from openerp.osv import fields, osv
|
||||
from openerp import SUPERUSER_ID
|
||||
from openerp.modules.registry import RegistryManager
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
class CompanyLDAP(osv.osv):
|
||||
|
@ -190,9 +191,9 @@ class CompanyLDAP(osv.osv):
|
|||
user_obj = self.pool['res.users']
|
||||
values = self.map_ldap_attributes(cr, uid, conf, login, ldap_entry)
|
||||
if conf['user']:
|
||||
values['active'] = True
|
||||
user_id = user_obj.copy(cr, SUPERUSER_ID, conf['user'],
|
||||
default={'active': True})
|
||||
user_obj.write(cr, SUPERUSER_ID, user_id, values)
|
||||
default=values)
|
||||
else:
|
||||
user_id = user_obj.create(cr, SUPERUSER_ID, values)
|
||||
return user_id
|
||||
|
@ -243,41 +244,31 @@ class users(osv.osv):
|
|||
user_id = super(users, self).login(db, login, password)
|
||||
if user_id:
|
||||
return user_id
|
||||
cr = self.pool.db.cursor()
|
||||
ldap_obj = self.pool['res.company.ldap']
|
||||
for conf in ldap_obj.get_ldap_dicts(cr):
|
||||
entry = ldap_obj.authenticate(conf, login, password)
|
||||
if entry:
|
||||
user_id = ldap_obj.get_or_create_user(
|
||||
cr, SUPERUSER_ID, conf, login, entry)
|
||||
if user_id:
|
||||
cr.execute("""UPDATE res_users
|
||||
SET login_date=now() AT TIME ZONE 'UTC'
|
||||
WHERE login=%s""",
|
||||
(tools.ustr(login),))
|
||||
cr.commit()
|
||||
break
|
||||
cr.close()
|
||||
return user_id
|
||||
|
||||
def check(self, db, uid, passwd):
|
||||
try:
|
||||
return super(users,self).check(db, uid, passwd)
|
||||
except openerp.exceptions.AccessDenied:
|
||||
pass
|
||||
|
||||
cr = self.pool.db.cursor()
|
||||
cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE',
|
||||
(int(uid),))
|
||||
res = cr.fetchone()
|
||||
if res:
|
||||
ldap_obj = self.pool['res.company.ldap']
|
||||
registry = RegistryManager.get(db)
|
||||
with registry.cursor() as cr:
|
||||
ldap_obj = registry.get('res.company.ldap')
|
||||
for conf in ldap_obj.get_ldap_dicts(cr):
|
||||
if ldap_obj.authenticate(conf, res[0], passwd):
|
||||
self._uid_cache.setdefault(db, {})[uid] = passwd
|
||||
cr.close()
|
||||
return True
|
||||
cr.close()
|
||||
raise openerp.exceptions.AccessDenied()
|
||||
entry = ldap_obj.authenticate(conf, login, password)
|
||||
if entry:
|
||||
user_id = ldap_obj.get_or_create_user(
|
||||
cr, SUPERUSER_ID, conf, login, entry)
|
||||
if user_id:
|
||||
break
|
||||
return user_id
|
||||
|
||||
def check_credentials(self, cr, uid, password):
|
||||
try:
|
||||
super(users, self).check_credentials(cr, uid, password)
|
||||
except openerp.exceptions.AccessDenied:
|
||||
|
||||
cr.execute('SELECT login FROM res_users WHERE id=%s AND active=TRUE',
|
||||
(int(uid),))
|
||||
res = cr.fetchone()
|
||||
if res:
|
||||
ldap_obj = self.pool['res.company.ldap']
|
||||
for conf in ldap_obj.get_ldap_dicts(cr):
|
||||
if ldap_obj.authenticate(conf, res[0], password):
|
||||
return
|
||||
raise
|
||||
|
||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||
|
|
|
@ -1,4 +1,6 @@
|
|||
openerp.auth_oauth = function(instance) {
|
||||
var _t = instance.web._t,
|
||||
_lt = instance.web._lt;
|
||||
var QWeb = instance.web.qweb;
|
||||
|
||||
instance.web.Login.include({
|
||||
|
@ -9,9 +11,11 @@ openerp.auth_oauth = function(instance) {
|
|||
this.$el.on('click', 'a.zocial', this.on_oauth_sign_in);
|
||||
this.oauth_providers = [];
|
||||
if(this.params.oauth_error === 1) {
|
||||
this.do_warn("Sign up error.","Sign up is not allowed on this database.");
|
||||
this.do_warn(_t("Sign up error"),_t("Sign up is not allowed on this database."), true);
|
||||
} else if(this.params.oauth_error === 2) {
|
||||
this.do_warn("Authentication error","");
|
||||
this.do_warn(_t("Authentication error"),_t("Access Denied"), true);
|
||||
} else if(this.params.oauth_error === 3) {
|
||||
this.do_warn(_t("Authentication error"),_t("You do not have access to this database or your invitation has expired. Please ask for an invitation and be sure to follow the link in your invitation email."), true);
|
||||
}
|
||||
return d.done(this.do_oauth_load).fail(function() {
|
||||
self.do_oauth_load([]);
|
||||
|
|
|
@ -23,6 +23,7 @@ import logging
|
|||
import simplejson
|
||||
|
||||
import openerp
|
||||
from openerp.addons.auth_signup.res_users import SignupError
|
||||
from openerp.osv import osv, fields
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
@ -35,7 +36,7 @@ class res_users(osv.Model):
|
|||
try:
|
||||
login = super(res_users, self)._auth_oauth_signin(cr, uid, provider, validation, params, context=context)
|
||||
|
||||
except openerp.exceptions.AccessDenied:
|
||||
except openerp.exceptions.AccessDenied, access_denied_exception:
|
||||
if context and context.get('no_user_creation'):
|
||||
return None
|
||||
state = simplejson.loads(params['state'])
|
||||
|
@ -52,6 +53,8 @@ class res_users(osv.Model):
|
|||
'oauth_access_token': params['access_token'],
|
||||
'active': True,
|
||||
}
|
||||
_, login, _ = self.signup(cr, uid, values, token, context=context)
|
||||
|
||||
try:
|
||||
_, login, _ = self.signup(cr, uid, values, token, context=context)
|
||||
except SignupError:
|
||||
raise access_denied_exception
|
||||
return login
|
||||
|
|
|
@ -26,7 +26,7 @@ from urlparse import urljoin
|
|||
from openerp.addons.base.ir.ir_mail_server import MailDeliveryException
|
||||
from openerp.osv import osv, fields
|
||||
from openerp.tools.misc import DEFAULT_SERVER_DATETIME_FORMAT
|
||||
from openerp.tools.safe_eval import safe_eval
|
||||
from ast import literal_eval
|
||||
from openerp.tools.translate import _
|
||||
|
||||
class SignupError(Exception):
|
||||
|
@ -221,12 +221,12 @@ class res_users(osv.Model):
|
|||
def _signup_create_user(self, cr, uid, values, context=None):
|
||||
""" create a new user from the template user """
|
||||
ir_config_parameter = self.pool.get('ir.config_parameter')
|
||||
template_user_id = safe_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.template_user_id', 'False'))
|
||||
template_user_id = literal_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.template_user_id', 'False'))
|
||||
assert template_user_id and self.exists(cr, uid, template_user_id, context=context), 'Signup: invalid template user'
|
||||
|
||||
# check that uninvited users may sign up
|
||||
if 'partner_id' not in values:
|
||||
if not safe_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')):
|
||||
if not literal_eval(ir_config_parameter.get_param(cr, uid, 'auth_signup.allow_uninvited', 'False')):
|
||||
raise SignupError('Signup is not allowed for uninvited users')
|
||||
|
||||
assert values.get('login'), "Signup: no login given for new user"
|
||||
|
|
|
@ -1187,8 +1187,8 @@ rule or repeating pattern of time to exclude from the recurring rule."),
|
|||
context = {}
|
||||
|
||||
result = []
|
||||
for data in super(calendar_event, self).read(cr, uid, select, ['rrule', 'exdate', 'exrule', 'date'], context=context):
|
||||
if not data['rrule']:
|
||||
for data in super(calendar_event, self).read(cr, uid, select, ['rrule', 'recurrency', 'exdate', 'exrule', 'date'], context=context):
|
||||
if not data['recurrency'] or not data['rrule']:
|
||||
result.append(data['id'])
|
||||
continue
|
||||
event_date = datetime.strptime(data['date'], "%Y-%m-%d %H:%M:%S")
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#########################################################################
|
||||
#
|
||||
# Copyright (c) 2003-2004 Danny Brewer d29583@groovegarden.com
|
||||
# Copyright (C) 2004-2010 OpenERP SA (<http://openerp.com>).
|
||||
# Copyright (C) 2004-2013 OpenERP SA (<http://openerp.com>).
|
||||
#
|
||||
# This library is free software; you can redistribute it and/or
|
||||
# modify it under the terms of the GNU Lesser General Public
|
||||
|
@ -78,7 +78,7 @@ class ExportToRML( unohelper.Base, XJobExecutor ):
|
|||
|
||||
res = self.sock.execute(database, uid, self.password, 'ir.actions.report.xml', 'sxwtorml',base64.encodestring(data),file_type)
|
||||
if res['report_rml_content']:
|
||||
write_data_to_file( get_absolute_file_path( filename[7:] ), res['report_rml_content'] )
|
||||
write_data_to_file(get_absolute_file_path(filename), res['report_rml_content'])
|
||||
except Exception,e:
|
||||
import traceback,sys
|
||||
info = reduce(lambda x, y: x+y, traceback.format_exception(sys.exc_type, sys.exc_value, sys.exc_traceback))
|
||||
|
@ -99,8 +99,12 @@ class ExportToRML( unohelper.Base, XJobExecutor ):
|
|||
|
||||
oFileDialog.setDefaultName(f_path )
|
||||
|
||||
sPath = oFileDialog.execute() == 1 and oFileDialog.Files[0] or None
|
||||
sPath = oFileDialog.execute() == 1 and oFileDialog.Files[0] or ''
|
||||
oFileDialog.dispose()
|
||||
sPath = sPath[7:]
|
||||
if sPath.startswith('localhost/'):
|
||||
slash = int(os.name == 'nt')
|
||||
sPath = sPath[9 + slash:]
|
||||
return sPath
|
||||
|
||||
if __name__<>"package" and __name__=="__main__":
|
||||
|
|
Binary file not shown.
|
@ -381,6 +381,10 @@ instance.board.AddToDashboard = instance.web.search.Input.extend({
|
|||
_.each(data.contexts, context.add, context);
|
||||
_.each(data.domains, domain.add, domain);
|
||||
|
||||
context.add({
|
||||
group_by: instance.web.pyeval.eval('groupbys', data.groupbys || [])
|
||||
});
|
||||
|
||||
var c = instance.web.pyeval.eval('context', context);
|
||||
for(var k in c) {
|
||||
if (c.hasOwnProperty(k) && /^search_default_/.test(k)) {
|
||||
|
|
|
@ -68,11 +68,14 @@ class document_file(osv.osv):
|
|||
]
|
||||
|
||||
def check(self, cr, uid, ids, mode, context=None, values=None):
|
||||
"""Check access wrt. res_model, relax the rule of ir.attachment parent
|
||||
With 'document' installed, everybody will have access to attachments of
|
||||
any resources they can *read*.
|
||||
"""
|
||||
return super(document_file, self).check(cr, uid, ids, mode='read', context=context, values=values)
|
||||
"""Overwrite check to verify access on directory to validate specifications of doc/access_permissions.rst"""
|
||||
super(document_file, self).check(cr, uid, ids, mode, context=context, values=values)
|
||||
if ids:
|
||||
self.pool.get('ir.model.access').check(cr, uid, 'document.directory', mode)
|
||||
|
||||
# use SQL to avoid recursive loop on read
|
||||
cr.execute('SELECT DISTINCT parent_id from ir_attachment WHERE id in %s AND parent_id is not NULL', (tuple(ids),))
|
||||
self.pool.get('document.directory').check_access_rule(cr, uid, [parent_id for (parent_id,) in cr.fetchall()], mode, context=context)
|
||||
|
||||
def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False):
|
||||
# Grab ids, bypassing 'count'
|
||||
|
|
|
@ -157,7 +157,8 @@ class mail_compose_message(osv.TransientModel):
|
|||
values['body'] = values.pop('body_html', '')
|
||||
|
||||
# transform email_to, email_cc into partner_ids
|
||||
partner_ids = self._get_or_create_partners_from_values(cr, uid, values, context=context)
|
||||
ctx = dict((k, v) for k, v in (context or {}).items() if not k.startswith('default_'))
|
||||
partner_ids = self._get_or_create_partners_from_values(cr, uid, values, context=ctx)
|
||||
# legacy template behavior: void values do not erase existing values and the
|
||||
# related key is removed from the values dict
|
||||
if partner_ids:
|
||||
|
|
|
@ -173,10 +173,9 @@ class account_analytic_line(osv.osv):
|
|||
data = {}
|
||||
|
||||
journal_types = {}
|
||||
price = 0.0
|
||||
|
||||
# prepare for iteration on journal and accounts
|
||||
for line in self.pool.get('account.analytic.line').browse(cr, uid, ids, context=context):
|
||||
price += line.amount*-1
|
||||
line_name = line.name
|
||||
if line.journal_id.type not in journal_types:
|
||||
journal_types[line.journal_id.type] = set()
|
||||
journal_types[line.journal_id.type].add(line.account_id.id)
|
||||
|
@ -217,53 +216,56 @@ class account_analytic_line(osv.osv):
|
|||
last_invoice = invoice_obj.create(cr, uid, curr_invoice, context=context2)
|
||||
invoices.append(last_invoice)
|
||||
|
||||
cr.execute("""SELECT product_id, user_id, to_invoice, sum(unit_amount), product_uom_id
|
||||
cr.execute("""SELECT product_id, user_id, to_invoice, sum(amount), sum(unit_amount), product_uom_id
|
||||
FROM account_analytic_line as line LEFT JOIN account_analytic_journal journal ON (line.journal_id = journal.id)
|
||||
WHERE account_id = %s
|
||||
AND line.id IN %s AND journal.type = %s AND to_invoice IS NOT NULL
|
||||
GROUP BY product_id, user_id, to_invoice, product_uom_id""", (account.id, tuple(ids), journal_type))
|
||||
|
||||
for product_id, user_id, factor_id, qty, uom in cr.fetchall():
|
||||
for product_id, user_id, factor_id, total_price, qty, uom in cr.fetchall():
|
||||
context2.update({'uom': uom})
|
||||
|
||||
if data.get('product'):
|
||||
# force product, use its public price
|
||||
product_id = data['product'][0]
|
||||
product = product_obj.browse(cr, uid, product_id, context=context2)
|
||||
unit_price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, context2)
|
||||
elif journal_type == 'general' and product_id:
|
||||
# timesheets, use sale price
|
||||
unit_price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, context2)
|
||||
else:
|
||||
# expenses, using price from amount field
|
||||
unit_price = total_price*-1.0 / qty
|
||||
|
||||
factor = invoice_factor_obj.browse(cr, uid, factor_id, context=context2)
|
||||
factor_name = factor.customer_name and line_name + ' - ' + factor.customer_name or line_name
|
||||
# factor_name = factor.customer_name and line_name + ' - ' + factor.customer_name or line_name
|
||||
factor_name = factor.customer_name
|
||||
curr_line = {
|
||||
'price_unit': price,
|
||||
'price_unit': unit_price,
|
||||
'quantity': qty,
|
||||
'product_id': product_id or False,
|
||||
'discount': factor.factor,
|
||||
'invoice_id': last_invoice,
|
||||
'name': factor_name,
|
||||
'uos_id': uom,
|
||||
'account_analytic_id': account.id,
|
||||
}
|
||||
product = product_obj.browse(cr, uid, product_id, context=context2)
|
||||
if product:
|
||||
factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
|
||||
if factor.customer_name:
|
||||
factor_name += ' - ' + factor.customer_name
|
||||
|
||||
ctx = context.copy()
|
||||
ctx.update({'uom': uom})
|
||||
|
||||
# check force product
|
||||
if data.get('product'):
|
||||
price = self._get_invoice_price(cr, uid, account, product_id, user_id, qty, ctx)
|
||||
|
||||
general_account = product.property_account_income or product.categ_id.property_account_income_categ
|
||||
if not general_account:
|
||||
raise osv.except_osv(_("Configuration Error!"), _("Please define income account for product '%s'.") % product.name)
|
||||
taxes = product.taxes_id or general_account.tax_ids
|
||||
tax = fiscal_pos_obj.map_tax(cr, uid, account.partner_id.property_account_position, taxes)
|
||||
curr_line.update({
|
||||
'price_unit': price,
|
||||
'invoice_line_tax_id': [(6,0,tax )],
|
||||
'name': factor_name,
|
||||
'product_id': product_id,
|
||||
'invoice_line_tax_id': [(6,0,tax)],
|
||||
'account_id': general_account.id,
|
||||
})
|
||||
|
||||
#
|
||||
# Compute for lines
|
||||
#
|
||||
|
@ -284,7 +286,6 @@ class account_analytic_line(osv.osv):
|
|||
if data.get('name', False):
|
||||
details.append(line['name'])
|
||||
note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
|
||||
|
||||
if note:
|
||||
curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
|
||||
invoice_line_obj.create(cr, uid, curr_line, context=context)
|
||||
|
|
|
@ -61,12 +61,13 @@
|
|||
!python {model: hr_timesheet_sheet.sheet}: |
|
||||
uid = ref('base.user_root')
|
||||
from openerp import netsvc
|
||||
from openerp.osv import osv
|
||||
try:
|
||||
self.button_confirm(cr, uid, [ref('hr_timesheet_sheet_sheet_deddk0')], {"active_ids":
|
||||
[ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form")],"active_id": ref("hr_timesheet_sheet.menu_act_hr_timesheet_sheet_form"),
|
||||
})
|
||||
assert True, "The validation of the timesheet was unexpectedly accepted despite the 2:30 hours of difference"
|
||||
except:
|
||||
assert False, "The validation of the timesheet was unexpectedly accepted despite the 2:30 hours of difference"
|
||||
except osv.except_osv:
|
||||
pass
|
||||
-
|
||||
I Modified the timesheet record and make the difference less than 1 hour.
|
||||
|
|
|
@ -58,6 +58,7 @@ Wizards provided by this module:
|
|||
'base_iban',
|
||||
'account_chart',
|
||||
'l10n_be_coda',
|
||||
'l10n_multilang',
|
||||
],
|
||||
'data': [
|
||||
'account_financial_report.xml',
|
||||
|
@ -68,11 +69,11 @@ Wizards provided by this module:
|
|||
'wizard/l10n_be_account_vat_declaration_view.xml',
|
||||
'wizard/l10n_be_vat_intra_view.xml',
|
||||
'wizard/l10n_be_partner_vat_listing.xml',
|
||||
'wizard/account_wizard.xml',
|
||||
'l10n_be_sequence.xml',
|
||||
'fiscal_templates.xml',
|
||||
'account_fiscal_position_tax_template.xml',
|
||||
'security/ir.model.access.csv',
|
||||
'l10n_be_wizard.yml'
|
||||
],
|
||||
'demo': [],
|
||||
'installable': True,
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
<field name="property_account_payable" ref="a_pay"/>
|
||||
<field name="property_account_expense_categ" ref="a_expense"/>
|
||||
<field name="property_account_income_categ" ref="a_sale"/>
|
||||
<field name="spoken_languages" eval="'nl_BE'"/>
|
||||
</record>
|
||||
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,7 @@
|
|||
<openerp>
|
||||
<data noupdate="1">
|
||||
<record id="account.action_wizard_multi_chart_todo" model="ir.actions.todo">
|
||||
<field name="state">open</field>
|
||||
</record>
|
||||
</data>
|
||||
</openerp>
|
|
@ -202,11 +202,11 @@ class partner_vat_intra(osv.osv_memory):
|
|||
'vatnum': row['vat'][2:].replace(' ','').upper(),
|
||||
'vat': row['vat'],
|
||||
'country': row['vat'][:2],
|
||||
'amount': amt,
|
||||
'amount': round(amt,2),
|
||||
'intra_code': row['intra_code'],
|
||||
'code': intra_code})
|
||||
|
||||
xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': amount_sum, 'partner_wo_vat': p_count})
|
||||
xmldict.update({'dnum': dnum, 'clientnbr': str(seq), 'amountsum': round(amount_sum,2), 'partner_wo_vat': p_count})
|
||||
return xmldict
|
||||
|
||||
def create_xml(self, cursor, user, ids, context=None):
|
||||
|
|
|
@ -32,6 +32,7 @@ Accounting Data for Belgian Payroll Rules.
|
|||
'auto_install': True,
|
||||
'demo': [],
|
||||
'data':[
|
||||
'l10n_be_wizard.yml',
|
||||
'l10n_be_hr_payroll_account_data.xml',
|
||||
'data/hr.salary.rule.csv',
|
||||
],
|
||||
|
|
|
@ -207,6 +207,19 @@ class account_invoice(osv.osv):
|
|||
'\nPlease create manually a unique BBA Structured Communication.'))
|
||||
return super(account_invoice, self).write(cr, uid, ids, vals, context)
|
||||
|
||||
def copy(self, cr, uid, id, default=None, context=None):
|
||||
default = default or {}
|
||||
invoice = self.browse(cr, uid, id, context=context)
|
||||
if invoice.type in ['out_invoice']:
|
||||
reference_type = invoice.reference_type or 'none'
|
||||
default['reference_type'] = reference_type
|
||||
if reference_type == 'bba':
|
||||
partner = invoice.partner_id
|
||||
default['reference'] = self.generate_bbacomm(cr, uid, id,
|
||||
invoice.type, reference_type,
|
||||
partner.id, '', context=context)['value']['reference']
|
||||
return super(account_invoice, self).copy(cr, uid, id, default, context=context)
|
||||
|
||||
_columns = {
|
||||
'reference': fields.char('Communication', size=64, help="The partner reference of this invoice."),
|
||||
'reference_type': fields.selection(_get_reference_type, 'Communication Type',
|
||||
|
|
|
@ -20,7 +20,7 @@
|
|||
##############################################################################
|
||||
{
|
||||
'name': 'Canada - Accounting',
|
||||
'version': '1.1',
|
||||
'version': '1.2',
|
||||
'author': 'Savoir-faire Linux',
|
||||
'website': 'http://www.savoirfairelinux.com',
|
||||
'category': 'Localization/Account Charts',
|
||||
|
@ -29,6 +29,28 @@ This is the module to manage the English and French - Canadian accounting chart
|
|||
===========================================================================================
|
||||
|
||||
Canadian accounting charts and localizations.
|
||||
|
||||
Fiscal positions
|
||||
----------------
|
||||
|
||||
When considering taxes to be applied, it is the province where the delivery occurs that matters.
|
||||
Therefore we decided to implement the most common case in the fiscal positions: delivery is the
|
||||
responsibility of the supplier and done at the customer location.
|
||||
|
||||
Some examples:
|
||||
|
||||
1) You have a customer from another province and you deliver to his location.
|
||||
On the customer, set the fiscal position to his province.
|
||||
|
||||
2) You have a customer from another province. However this customer comes to your location
|
||||
with their truck to pick up products. On the customer, do not set any fiscal position.
|
||||
|
||||
3) An international supplier doesn't charge you any tax. Taxes are charged at customs
|
||||
by the customs broker. On the supplier, set the fiscal position to International.
|
||||
|
||||
4) An international supplier charge you your provincial tax. They are registered with your
|
||||
provincial government and remit taxes themselves. On the supplier, do not set any fiscal
|
||||
position.
|
||||
""",
|
||||
'depends': [
|
||||
'base',
|
||||
|
|
|
@ -131,7 +131,7 @@
|
|||
<field name="parent_id" ref="chart118_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_receivable"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">GST receivable</field>
|
||||
</record>
|
||||
|
||||
|
@ -140,17 +140,43 @@
|
|||
<field name="parent_id" ref="chart118_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_receivable"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">PST/QST receivable</field>
|
||||
</record>
|
||||
|
||||
<record id="chart1183_en" model="account.account.template">
|
||||
<field name="code">1183</field>
|
||||
<field name="parent_id" ref="chart118_en"/>
|
||||
<field name="type">view</field>
|
||||
<field name="user_type" ref="account.data_account_type_view"/>
|
||||
<field name="name">HST receivable</field>
|
||||
</record>
|
||||
|
||||
<record id="chart11831_en" model="account.account.template">
|
||||
<field name="code">11831</field>
|
||||
<field name="parent_id" ref="chart1183_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_receivable"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="name">HST receivable</field>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">HST receivable - 13%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart11832_en" model="account.account.template">
|
||||
<field name="code">11832</field>
|
||||
<field name="parent_id" ref="chart1183_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_receivable"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">HST receivable - 14%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart11833_en" model="account.account.template">
|
||||
<field name="code">11833</field>
|
||||
<field name="parent_id" ref="chart1183_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_receivable"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">HST receivable - 15%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart15_en" model="account.account.template">
|
||||
|
@ -257,7 +283,7 @@
|
|||
<field name="parent_id" ref="chart213_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_payable"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">GST to pay</field>
|
||||
</record>
|
||||
|
||||
|
@ -266,17 +292,43 @@
|
|||
<field name="parent_id" ref="chart213_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_payable"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">PST/QST to pay</field>
|
||||
</record>
|
||||
|
||||
<record id="chart2133_en" model="account.account.template">
|
||||
<field name="code">2133</field>
|
||||
<field name="parent_id" ref="chart213_en"/>
|
||||
<field name="type">view</field>
|
||||
<field name="user_type" ref="account.data_account_type_view"/>
|
||||
<field name="name">HST to pay</field>
|
||||
</record>
|
||||
|
||||
<record id="chart21331_en" model="account.account.template">
|
||||
<field name="code">21331</field>
|
||||
<field name="parent_id" ref="chart2133_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_payable"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="name">HST to pay</field>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">HST to pay - 13%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart21332_en" model="account.account.template">
|
||||
<field name="code">21332</field>
|
||||
<field name="parent_id" ref="chart2133_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_payable"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">HST to pay - 14%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart21333_en" model="account.account.template">
|
||||
<field name="code">21333</field>
|
||||
<field name="parent_id" ref="chart2133_en"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_payable"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">HST to pay - 15%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart214_en" model="account.account.template">
|
||||
|
|
|
@ -130,7 +130,7 @@
|
|||
<field name="parent_id" ref="chart118_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_asset"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TPS à recevoir</field>
|
||||
</record>
|
||||
|
||||
|
@ -139,17 +139,43 @@
|
|||
<field name="parent_id" ref="chart118_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_asset"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TVP/TVQ à recevoir</field>
|
||||
</record>
|
||||
|
||||
<record id="chart1183_fr" model="account.account.template">
|
||||
<field name="code">1183</field>
|
||||
<field name="parent_id" ref="chart118_fr"/>
|
||||
<field name="type">view</field>
|
||||
<field name="user_type" ref="account.data_account_type_view"/>
|
||||
<field name="name">TVH à recevoir</field>
|
||||
</record>
|
||||
|
||||
<record id="chart11831_fr" model="account.account.template">
|
||||
<field name="code">11831</field>
|
||||
<field name="parent_id" ref="chart1183_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_asset"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="name">TVH à recevoir</field>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TVH à recevoir - 13%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart11832_fr" model="account.account.template">
|
||||
<field name="code">11832</field>
|
||||
<field name="parent_id" ref="chart1183_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_asset"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TVH à recevoir - 14%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart11833_fr" model="account.account.template">
|
||||
<field name="code">11833</field>
|
||||
<field name="parent_id" ref="chart1183_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_asset"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TVH à recevoir - 15%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart15_fr" model="account.account.template">
|
||||
|
@ -256,7 +282,7 @@
|
|||
<field name="parent_id" ref="chart213_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_liability"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TPS à payer</field>
|
||||
</record>
|
||||
|
||||
|
@ -265,17 +291,43 @@
|
|||
<field name="parent_id" ref="chart213_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_liability"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TVP/TVQ à payer</field>
|
||||
</record>
|
||||
|
||||
<record id="chart2133_fr" model="account.account.template">
|
||||
<field name="code">2133</field>
|
||||
<field name="parent_id" ref="chart213_fr"/>
|
||||
<field name="type">view</field>
|
||||
<field name="user_type" ref="account.data_account_type_view"/>
|
||||
<field name="name">TVH à payer</field>
|
||||
</record>
|
||||
|
||||
<record id="chart21331_fr" model="account.account.template">
|
||||
<field name="code">21331</field>
|
||||
<field name="parent_id" ref="chart2133_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_liability"/>
|
||||
<field name="reconcile" eval="True"/>
|
||||
<field name="name">TVH à payer</field>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TVH à payer - 13%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart21332_fr" model="account.account.template">
|
||||
<field name="code">21332</field>
|
||||
<field name="parent_id" ref="chart2133_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_liability"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TVH à payer - 14%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart21333_fr" model="account.account.template">
|
||||
<field name="code">21333</field>
|
||||
<field name="parent_id" ref="chart2133_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_liability"/>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="name">TVH à payer - 15%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart214_fr" model="account.account.template">
|
||||
|
@ -672,7 +724,7 @@
|
|||
<field name="code">5112</field>
|
||||
<field name="parent_id" ref="chart511_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_income"/>
|
||||
<field name="user_type" ref="account.data_account_type_expense"/>
|
||||
<field name="name">Achats dans des provinces harmonisées</field>
|
||||
</record>
|
||||
|
||||
|
@ -680,7 +732,7 @@
|
|||
<field name="code">5113</field>
|
||||
<field name="parent_id" ref="chart511_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_income"/>
|
||||
<field name="user_type" ref="account.data_account_type_expense"/>
|
||||
<field name="name">Achats dans des provinces non-harmonisées</field>
|
||||
</record>
|
||||
|
||||
|
@ -688,7 +740,7 @@
|
|||
<field name="code">5114</field>
|
||||
<field name="parent_id" ref="chart511_fr"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account.data_account_type_income"/>
|
||||
<field name="user_type" ref="account.data_account_type_expense"/>
|
||||
<field name="name">Achats à l'étranger</field>
|
||||
</record>
|
||||
|
||||
|
|
|
@ -31,6 +31,21 @@
|
|||
<field name="parent_id" ref="vat_code_receivable_tva_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_hst13_en">
|
||||
<field name="name">HST paid - 13%</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_hst14_en">
|
||||
<field name="name">HST paid - 14%</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_hst15_en">
|
||||
<field name="name">HST paid - 15%</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_en">
|
||||
<field name="name">Taxes received</field>
|
||||
<field name="parent_id" ref="vat_code_balance_net_en"/>
|
||||
|
@ -51,6 +66,21 @@
|
|||
<field name="parent_id" ref="vat_code_payable_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_hst13_en">
|
||||
<field name="name">HST received - 13%</field>
|
||||
<field name="parent_id" ref="vat_code_payable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_hst14_en">
|
||||
<field name="name">HST received - 14%</field>
|
||||
<field name="parent_id" ref="vat_code_payable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_hst15_en">
|
||||
<field name="name">HST received - 15%</field>
|
||||
<field name="parent_id" ref="vat_code_payable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_net_en">
|
||||
<field name="name">Taxes Base</field>
|
||||
<field name="parent_id" ref="vat_code_tax_en"/>
|
||||
|
@ -76,6 +106,21 @@
|
|||
<field name="parent_id" ref="vat_code_base_receivable_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_hst13_en">
|
||||
<field name="name">Base of HST for Sales - 13%</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_hst14_en">
|
||||
<field name="name">Base of HST for Sales - 14%</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_hst15_en">
|
||||
<field name="name">Base of HST for Sales - 15%</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_en">
|
||||
<field name="name">Base of Purchases Tax</field>
|
||||
<field name="parent_id" ref="vat_code_base_net_en"/>
|
||||
|
@ -96,5 +141,20 @@
|
|||
<field name="parent_id" ref="vat_code_base_payable_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_hst13_en">
|
||||
<field name="name">Base of HST for Purchases - 13%</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_hst14_en">
|
||||
<field name="name">Base of HST for Purchases - 14%</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_hst15_en">
|
||||
<field name="name">Base of HST for Purchases - 15%</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_hst_en"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
@ -16,41 +16,71 @@
|
|||
<field name="parent_id" ref="vat_code_balance_net_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_tps_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_gst_fr">
|
||||
<field name="name">TPS payée</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_tvp_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_pst_fr">
|
||||
<field name="name">TVP/TVQ payée</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_tvh_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_hst_fr">
|
||||
<field name="name">TVH payée</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_tva_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_hst13_fr">
|
||||
<field name="name">TVH payée - 13%</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_hst14_fr">
|
||||
<field name="name">TVH payée - 14%</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_receivable_hst15_fr">
|
||||
<field name="name">TVH payée - 15%</field>
|
||||
<field name="parent_id" ref="vat_code_receivable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_fr">
|
||||
<field name="name">Taxes reçues</field>
|
||||
<field name="parent_id" ref="vat_code_balance_net_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_tps_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_payable_gst_fr">
|
||||
<field name="name">TPS reçue</field>
|
||||
<field name="parent_id" ref="vat_code_payable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_tvp_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_payable_pst_fr">
|
||||
<field name="name">TVP/TVQ reçue</field>
|
||||
<field name="parent_id" ref="vat_code_payable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_tvh_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_payable_hst_fr">
|
||||
<field name="name">TVH reçue</field>
|
||||
<field name="parent_id" ref="vat_code_payable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_hst13_fr">
|
||||
<field name="name">TVH reçue - 13%</field>
|
||||
<field name="parent_id" ref="vat_code_payable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_hst14_fr">
|
||||
<field name="name">TVH reçue - 14%</field>
|
||||
<field name="parent_id" ref="vat_code_payable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_payable_hst15_fr">
|
||||
<field name="name">TVH reçue - 15%</field>
|
||||
<field name="parent_id" ref="vat_code_payable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_net_fr">
|
||||
<field name="name">Base de taxes</field>
|
||||
<field name="parent_id" ref="vat_code_tax_fr"/>
|
||||
|
@ -61,40 +91,70 @@
|
|||
<field name="parent_id" ref="vat_code_base_net_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_tps_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_gst_fr">
|
||||
<field name="name">Base de la TPS pour les ventes</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_tvp_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_pst_fr">
|
||||
<field name="name">Base de la TVP/TVQ pour les ventes</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_tvh_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_hst_fr">
|
||||
<field name="name">Base de la TVH pour les ventes</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_hst13_fr">
|
||||
<field name="name">Base de la TVH pour les ventes - 13%</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_hst14_fr">
|
||||
<field name="name">Base de la TVH pour les ventes - 14%</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_receivable_hst15_fr">
|
||||
<field name="name">Base de la TVH pour les ventes - 15%</field>
|
||||
<field name="parent_id" ref="vat_code_base_receivable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_fr">
|
||||
<field name="name">Base des taxes d'achats</field>
|
||||
<field name="parent_id" ref="vat_code_base_net_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_tps_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_gst_fr">
|
||||
<field name="name">Base de la TPS pour les achats</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_tvp_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_pst_fr">
|
||||
<field name="name">Base de la TVP/TVQ pour les achats</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_tvh_fr">
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_hst_fr">
|
||||
<field name="name">Base de la TVH pour les achats</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_hst13_fr">
|
||||
<field name="name">Base de la TVH pour les achats - 13%</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_hst14_fr">
|
||||
<field name="name">Base de la TVH pour les achats - 14%</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
<record model="account.tax.code.template" id="vat_code_base_payable_hst15_fr">
|
||||
<field name="name">Base de la TVH pour les achats - 15%</field>
|
||||
<field name="parent_id" ref="vat_code_base_payable_hst_fr"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
|
|
@ -4,6 +4,53 @@
|
|||
|
||||
<!-- SALES TAXES -->
|
||||
|
||||
<!-- British Columbia PST -->
|
||||
|
||||
<record id="gstpst_bc_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST + PST for sales (BC)</field>
|
||||
<field name="description">GSTPST_BC_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend">1</field>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_sale_bc_gst_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST for sales - 5% (BC)</field>
|
||||
<field name="description">GST</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart2131_en"/>
|
||||
<field name="account_paid_id" ref="chart2131_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
|
||||
<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="parent_id" ref="gstpst_bc_sale_en"/>
|
||||
</record>
|
||||
|
||||
<record id="pst_bc_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">PST for sales - 7% (BC)</field>
|
||||
<field name="description">PST</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart2132_en"/>
|
||||
<field name="account_paid_id" ref="chart2132_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_pst_en"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- Manitoba PST -->
|
||||
|
||||
<record id="gstpst_mb_sale_en" model="account.tax.template">
|
||||
|
@ -13,6 +60,7 @@
|
|||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_sale_mb_gst_en" model="account.tax.template">
|
||||
|
@ -35,10 +83,10 @@
|
|||
|
||||
<record id="pst_mb_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">PST for sales - 7%</field>
|
||||
<field name="name">PST for sales - 8% (MB)</field>
|
||||
<field name="description">PST</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="amount">0.080000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart2132_en"/>
|
||||
|
@ -50,65 +98,19 @@
|
|||
<field name="parent_id" ref="gstpst_mb_sale_en"/>
|
||||
</record>
|
||||
|
||||
<!-- Prince Edward Island PST -->
|
||||
|
||||
<record id="gstpst_pe_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST + PST for sales (PE)</field>
|
||||
<field name="description">GSTPST_PE_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="child_depend">1</field>
|
||||
<field name="type">percent</field>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_sale_pe_gst_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST for sales - 5% (PE)</field>
|
||||
<field name="description">GST</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart2131_en"/>
|
||||
<field name="account_paid_id" ref="chart2131_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_gst_en"/>
|
||||
<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="parent_id" ref="gstpst_pe_sale_en"/>
|
||||
</record>
|
||||
|
||||
<record id="pst_pe_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">PST for sale - 10%</field>
|
||||
<field name="description">PST</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.100000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart2132_en"/>
|
||||
<field name="account_paid_id" ref="chart2132_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_pst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_pst_en"/>
|
||||
<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_pe_sale_en"/>
|
||||
</record>
|
||||
|
||||
<!-- Quebec PST -->
|
||||
|
||||
<record id="gsttvq_sale_en" model="account.tax.template">
|
||||
<record id="gstqst_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST + QST for sales</field>
|
||||
<field name="description">GSTQST_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="gsttvq_sale_gst_en" model="account.tax.template">
|
||||
<record id="gstqst_sale_gst_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST for sales - 5% (QC)</field>
|
||||
<field name="description">GST</field>
|
||||
|
@ -122,10 +124,10 @@
|
|||
<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="parent_id" ref="gsttvq_sale_en"/>
|
||||
<field name="parent_id" ref="gstqst_sale_en"/>
|
||||
</record>
|
||||
|
||||
<record id="tvq_sale_en" model="account.tax.template">
|
||||
<record id="qst_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">QST for sales - 9.975%</field>
|
||||
<field name="description">QST</field>
|
||||
|
@ -139,7 +141,7 @@
|
|||
<field name="tax_code_id" ref="vat_code_payable_pst_en"/>
|
||||
<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="gsttvq_sale_en"/>
|
||||
<field name="parent_id" ref="gstqst_sale_en"/>
|
||||
</record>
|
||||
|
||||
<!-- Saskatchewan PST -->
|
||||
|
@ -151,6 +153,7 @@
|
|||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_sale_sk_gst_en" model="account.tax.template">
|
||||
|
@ -190,21 +193,6 @@
|
|||
|
||||
<!-- HST -->
|
||||
|
||||
<record id="hst12_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">HST for sales - 12%</field>
|
||||
<field name="description">HST12_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.120000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2133_en"/>
|
||||
<field name="account_paid_id" ref="chart2133_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_hst_en"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record id="hst13_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">HST for sales - 13%</field>
|
||||
|
@ -212,27 +200,27 @@
|
|||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.130000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2133_en"/>
|
||||
<field name="account_paid_id" ref="chart2133_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_hst_en"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
|
||||
<field name="account_collected_id" ref="chart21331_en"/>
|
||||
<field name="account_paid_id" ref="chart21331_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst13_en"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<record id="hst135_sale_en" model="account.tax.template">
|
||||
<record id="hst14_sale_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">HST for sales - 13.5%</field>
|
||||
<field name="description">HST135_SALE</field>
|
||||
<field name="name">HST for sales - 14%</field>
|
||||
<field name="description">HST14_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.135000</field>
|
||||
<field name="amount">0.14000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2133_en"/>
|
||||
<field name="account_paid_id" ref="chart2133_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_hst_en"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
|
||||
<field name="account_collected_id" ref="chart21332_en"/>
|
||||
<field name="account_paid_id" ref="chart21332_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst14_en"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<record id="hst15_sale_en" model="account.tax.template">
|
||||
|
@ -242,12 +230,12 @@
|
|||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.150000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2133_en"/>
|
||||
<field name="account_paid_id" ref="chart2133_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_hst_en"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_hst_en"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_hst_en"/>
|
||||
<field name="account_collected_id" ref="chart21333_en"/>
|
||||
<field name="account_paid_id" ref="chart21333_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst15_en"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- GST -->
|
||||
|
@ -267,9 +255,55 @@
|
|||
<field name="ref_tax_code_id" ref="vat_code_payable_gst_en"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- PURCHASE TAXES -->
|
||||
|
||||
<!-- British Columbia PST -->
|
||||
|
||||
<record id="gstpst_bc_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST + PST for purchases (BC)</field>
|
||||
<field name="description">GSTPST_BC_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend">1</field>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_purc_bc_gst_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST for purchases - 5% (BC)</field>
|
||||
<field name="description">GST</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart1181_en"/>
|
||||
<field name="account_paid_id" ref="chart1181_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
|
||||
<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="parent_id" ref="gstpst_bc_purc_en"/>
|
||||
</record>
|
||||
|
||||
<record id="pst_bc_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">PST for purchases - 7% (BC)</field>
|
||||
<field name="description">PST</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart1182_en"/>
|
||||
<field name="account_paid_id" ref="chart1182_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- Manitoba PST -->
|
||||
|
||||
<record id="gstpst_mb_purc_en" model="account.tax.template">
|
||||
|
@ -279,6 +313,7 @@
|
|||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_purc_mb_gst_en" model="account.tax.template">
|
||||
|
@ -301,10 +336,10 @@
|
|||
|
||||
<record id="pst_mb_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">PST for purchases - 7%</field>
|
||||
<field name="name">PST for purchases - 8% (MB)</field>
|
||||
<field name="description">PST</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="amount">0.080000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart1182_en"/>
|
||||
|
@ -316,65 +351,19 @@
|
|||
<field name="parent_id" ref="gstpst_mb_purc_en"/>
|
||||
</record>
|
||||
|
||||
<!-- Prince Edward Island PST -->
|
||||
|
||||
<record id="gstpst_pe_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST + PST for purchases (PE)</field>
|
||||
<field name="description">GSTPST_PE_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="child_depend">1</field>
|
||||
<field name="type">percent</field>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_purc_pe_gst_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST for purchases - 5% (PE)</field>
|
||||
<field name="description">GST</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart1181_en"/>
|
||||
<field name="account_paid_id" ref="chart1181_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_gst_en"/>
|
||||
<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="parent_id" ref="gstpst_pe_purc_en"/>
|
||||
</record>
|
||||
|
||||
<record id="pst_pe_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">PST for purchases - 10%</field>
|
||||
<field name="description">PST</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.100000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart1182_en"/>
|
||||
<field name="account_paid_id" ref="chart1182_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_pst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
|
||||
<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_pe_purc_en"/>
|
||||
</record>
|
||||
|
||||
<!-- Quebec PST -->
|
||||
|
||||
<record id="gsttvq_purc_en" model="account.tax.template">
|
||||
<record id="gstqst_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST + QST for purchases</field>
|
||||
<field name="description">GSTQST_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="gsttvq_purc_gst_en" model="account.tax.template">
|
||||
<record id="gstqst_purc_gst_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">GST for purchases - 5% (QC)</field>
|
||||
<field name="description">GST</field>
|
||||
|
@ -388,10 +377,10 @@
|
|||
<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="parent_id" ref="gsttvq_purc_en"/>
|
||||
<field name="parent_id" ref="gstqst_purc_en"/>
|
||||
</record>
|
||||
|
||||
<record id="tvq_purc_en" model="account.tax.template">
|
||||
<record id="qst_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">QST for purchases - 9.975%</field>
|
||||
<field name="description">QST</field>
|
||||
|
@ -405,7 +394,7 @@
|
|||
<field name="tax_code_id" ref="vat_code_receivable_pst_en"/>
|
||||
<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="gsttvq_purc_en"/>
|
||||
<field name="parent_id" ref="gstqst_purc_en"/>
|
||||
</record>
|
||||
|
||||
<!-- Saskatchewan PST -->
|
||||
|
@ -417,6 +406,7 @@
|
|||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_purc_sk_gst_en" model="account.tax.template">
|
||||
|
@ -456,21 +446,6 @@
|
|||
|
||||
<!-- HST -->
|
||||
|
||||
<record id="hst12_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">HST for purchases - 12%</field>
|
||||
<field name="description">HST12_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.120000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1183_en"/>
|
||||
<field name="account_paid_id" ref="chart1183_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
|
||||
</record>
|
||||
|
||||
<record id="hst13_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">HST for purchases - 13%</field>
|
||||
|
@ -478,27 +453,27 @@
|
|||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.130000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1183_en"/>
|
||||
<field name="account_paid_id" ref="chart1183_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
|
||||
<field name="account_collected_id" ref="chart11831_en"/>
|
||||
<field name="account_paid_id" ref="chart11831_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst13_en"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<record id="hst135_purc_en" model="account.tax.template">
|
||||
<record id="hst14_purc_en" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_en_chart_template_en"/>
|
||||
<field name="name">HST for purchases - 13.5%</field>
|
||||
<field name="description">HST135_PURC</field>
|
||||
<field name="name">HST for purchases - 14%</field>
|
||||
<field name="description">HST14_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.135000</field>
|
||||
<field name="amount">0.140000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1183_en"/>
|
||||
<field name="account_paid_id" ref="chart1183_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
|
||||
<field name="account_collected_id" ref="chart11832_en"/>
|
||||
<field name="account_paid_id" ref="chart11832_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst14_en"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<record id="hst15_purc_en" model="account.tax.template">
|
||||
|
@ -508,12 +483,12 @@
|
|||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.150000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1183_en"/>
|
||||
<field name="account_paid_id" ref="chart1183_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst_en"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_hst_en"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_hst_en"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_hst_en"/>
|
||||
<field name="account_collected_id" ref="chart11833_en"/>
|
||||
<field name="account_paid_id" ref="chart11833_en"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst15_en"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- GST -->
|
||||
|
|
|
@ -4,18 +4,66 @@
|
|||
|
||||
<!-- SALES TAXES -->
|
||||
|
||||
<!-- British Columbia PST -->
|
||||
|
||||
<record id="gstpst_bc_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVP sur les ventes (BC)</field>
|
||||
<field name="description">TPSTVP_BC_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="child_depend">1</field>
|
||||
<field name="type">percent</field>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_sale_bc_gst_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les ventes - 5% (BC)</field>
|
||||
<field name="description">TPS</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart2131_fr"/>
|
||||
<field name="account_paid_id" ref="chart2131_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
|
||||
<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="parent_id" ref="gstpst_bc_sale_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="pst_bc_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVP sur les ventes - 7% (BC)</field>
|
||||
<field name="description">TVP</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart2132_fr"/>
|
||||
<field name="account_paid_id" ref="chart2132_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- Manitoba PST -->
|
||||
|
||||
<record id="tpstvp_mb_sale_fr" model="account.tax.template">
|
||||
<record id="gstpst_mb_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVP sur les ventes (MB)</field>
|
||||
<field name="description">TPSTVP_MB_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="tpstvp_sale_mb_tps_fr" model="account.tax.template">
|
||||
<record id="gstpst_sale_mb_gst_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les ventes - 5% (MB)</field>
|
||||
<field name="description">TPS</field>
|
||||
|
@ -26,89 +74,43 @@
|
|||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart2131_fr"/>
|
||||
<field name="account_paid_id" ref="chart2131_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_mb_sale_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
|
||||
<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="parent_id" ref="gstpst_mb_sale_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvp_mb_sale_fr" model="account.tax.template">
|
||||
<record id="pst_mb_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVP sur les ventes - 7%</field>
|
||||
<field name="name">TVP sur les ventes - 8% (MB)</field>
|
||||
<field name="description">TVP</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="amount">0.080000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart2132_fr"/>
|
||||
<field name="account_paid_id" ref="chart2132_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_mb_sale_fr"/>
|
||||
</record>
|
||||
|
||||
<!-- Prince Edward Island PST -->
|
||||
|
||||
<record id="tpstvp_pe_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVP sur les ventes (PE)</field>
|
||||
<field name="description">TPSTVP_PE_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="child_depend">1</field>
|
||||
<field name="type">percent</field>
|
||||
</record>
|
||||
|
||||
<record id="tpstvp_sale_pe_tps_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les ventes - 5% (PE)</field>
|
||||
<field name="description">TPS</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart2131_fr"/>
|
||||
<field name="account_paid_id" ref="chart2131_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_pe_sale_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvp_pe_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVP for sale - 10%</field>
|
||||
<field name="description">TVP</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.100000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart2132_fr"/>
|
||||
<field name="account_paid_id" ref="chart2132_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_pe_sale_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- Quebec PST -->
|
||||
|
||||
<record id="tpstvq_sale_fr" model="account.tax.template">
|
||||
<record id="gstqst_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVQ sur les ventes</field>
|
||||
<field name="description">TPSTVQ_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="tpstvq_sale_tps_fr" model="account.tax.template">
|
||||
<record id="gstqst_sale_gst_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les ventes - 5% (QC)</field>
|
||||
<field name="description">TPS</field>
|
||||
|
@ -118,11 +120,11 @@
|
|||
<field name="sequence">1</field>
|
||||
<field name="account_collected_id" ref="chart2131_fr"/>
|
||||
<field name="account_paid_id" ref="chart2131_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="parent_id" ref="tpstvq_sale_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
|
||||
<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="parent_id" ref="gstqst_sale_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvq_sale_fr" model="account.tax.template">
|
||||
|
@ -135,25 +137,26 @@
|
|||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart2132_fr"/>
|
||||
<field name="account_paid_id" ref="chart2132_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
|
||||
<field name="parent_id" ref="tpstvq_sale_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- Saskatchewan PST -->
|
||||
|
||||
<record id="tpstvp_sk_sale_fr" model="account.tax.template">
|
||||
<record id="gstpst_sk_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVP sur les ventes (SK)</field>
|
||||
<field name="description">TPSTVP_SK_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="tpstvp_sale_sk_tps_fr" model="account.tax.template">
|
||||
<record id="gstpst_sale_sk_gst_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les ventes - 5% (SK)</field>
|
||||
<field name="description">TPS</field>
|
||||
|
@ -164,14 +167,14 @@
|
|||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart2131_fr"/>
|
||||
<field name="account_paid_id" ref="chart2131_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_sk_sale_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
|
||||
<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="parent_id" ref="gstpst_sk_sale_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvp_sk_sale_fr" model="account.tax.template">
|
||||
<record id="pst_sk_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVP sur les ventes - 5% (SK)</field>
|
||||
<field name="description">TVP</field>
|
||||
|
@ -181,78 +184,63 @@
|
|||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart2132_fr"/>
|
||||
<field name="account_paid_id" ref="chart2132_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tvp_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tvp_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tvp_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_sk_sale_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_pst_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_pst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- HST -->
|
||||
|
||||
<record id="tvh12_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVH sur les ventes - 12%</field>
|
||||
<field name="description">TVH12_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.120000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2133_fr"/>
|
||||
<field name="account_paid_id" ref="chart2133_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvh13_sale_fr" model="account.tax.template">
|
||||
<record id="hst13_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVH sur les ventes - 13%</field>
|
||||
<field name="description">TVH13_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.130000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2133_fr"/>
|
||||
<field name="account_paid_id" ref="chart2133_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
|
||||
<field name="account_collected_id" ref="chart21331_fr"/>
|
||||
<field name="account_paid_id" ref="chart21331_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst13_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<record id="tvh135_sale_fr" model="account.tax.template">
|
||||
<record id="hst14_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVH sur les ventes - 13.5%</field>
|
||||
<field name="description">TVH135_SALE</field>
|
||||
<field name="name">TVH sur les ventes - 14%</field>
|
||||
<field name="description">TVH14_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.135000</field>
|
||||
<field name="amount">0.140000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2133_fr"/>
|
||||
<field name="account_paid_id" ref="chart2133_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
|
||||
<field name="account_collected_id" ref="chart21332_fr"/>
|
||||
<field name="account_paid_id" ref="chart21332_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst14_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<record id="tvh15_sale_fr" model="account.tax.template">
|
||||
<record id="hst15_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVH sur les ventes - 15%</field>
|
||||
<field name="description">TVH15_SALE</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="amount">0.150000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2133_fr"/>
|
||||
<field name="account_paid_id" ref="chart2133_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tvh_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tvh_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tvh_fr"/>
|
||||
<field name="account_collected_id" ref="chart21333_fr"/>
|
||||
<field name="account_paid_id" ref="chart21333_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_hst15_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- GST -->
|
||||
|
||||
<record id="tps_sale_fr" model="account.tax.template">
|
||||
<record id="gst_sale_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les ventes - 5%</field>
|
||||
<field name="description">TPS_SALE</field>
|
||||
|
@ -261,27 +249,75 @@
|
|||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart2131_fr"/>
|
||||
<field name="account_paid_id" ref="chart2131_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_receivable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable_tps_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_receivable_gst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
|
||||
<!-- PURCHASE TAXES -->
|
||||
|
||||
<!-- British Columbia PST -->
|
||||
|
||||
<record id="gstpst_bc_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVP sur les achats (BC)</field>
|
||||
<field name="description">TPSTVP_BC_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend">1</field>
|
||||
</record>
|
||||
|
||||
<record id="gstpst_purc_bc_gst_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les achats - 5% (BC)</field>
|
||||
<field name="description">TPS</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart1181_fr"/>
|
||||
<field name="account_paid_id" ref="chart1181_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
|
||||
<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="parent_id" ref="gstpst_bc_purc_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="pst_bc_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVP sur les achats - 7% (BC)</field>
|
||||
<field name="description">TVP</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart1182_fr"/>
|
||||
<field name="account_paid_id" ref="chart1182_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- Manitoba PST -->
|
||||
|
||||
<record id="tpstvp_mb_purc_fr" model="account.tax.template">
|
||||
<record id="gstpst_mb_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVP sur les achats (MB)</field>
|
||||
<field name="description">TPSTVP_MB_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="tpstvp_purc_mb_tps_fr" model="account.tax.template">
|
||||
<record id="gstpst_purc_mb_gst_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les achats - 5% (MB)</field>
|
||||
<field name="description">TPS</field>
|
||||
|
@ -292,89 +328,43 @@
|
|||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart1181_fr"/>
|
||||
<field name="account_paid_id" ref="chart1181_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_mb_purc_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
|
||||
<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="parent_id" ref="gstpst_mb_purc_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvp_mb_purc_fr" model="account.tax.template">
|
||||
<record id="pst_mb_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVP sur les achats - 7%</field>
|
||||
<field name="name">TVP sur les achats - 8% (MB)</field>
|
||||
<field name="description">TVP</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="amount">0.080000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart1182_fr"/>
|
||||
<field name="account_paid_id" ref="chart1182_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_mb_purc_fr"/>
|
||||
</record>
|
||||
|
||||
<!-- Prince Edward Island PST -->
|
||||
|
||||
<record id="tpstvp_pe_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVP sur les achats (PE)</field>
|
||||
<field name="description">TPSTVP_PE_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="child_depend">1</field>
|
||||
<field name="type">percent</field>
|
||||
</record>
|
||||
|
||||
<record id="tpstvp_purc_pe_tps_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les achats - 5% (PE)</field>
|
||||
<field name="description">TPS</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">1</field>
|
||||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart1181_fr"/>
|
||||
<field name="account_paid_id" ref="chart1181_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_pe_purc_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvp_pe_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVP sur les achats - 10%</field>
|
||||
<field name="description">TVP</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.100000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart1182_fr"/>
|
||||
<field name="account_paid_id" ref="chart1182_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_pe_purc_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- Quebec PST -->
|
||||
|
||||
<record id="tpstvq_purc_fr" model="account.tax.template">
|
||||
<record id="gstqst_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVQ sur les achats</field>
|
||||
<field name="description">TPSTVQ_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="tpstvq_purc_tps_fr" model="account.tax.template">
|
||||
<record id="gstqst_purc_gst_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les achats - 5% (QC)</field>
|
||||
<field name="description">TPS</field>
|
||||
|
@ -384,11 +374,11 @@
|
|||
<field name="sequence">1</field>
|
||||
<field name="account_collected_id" ref="chart1181_fr"/>
|
||||
<field name="account_paid_id" ref="chart1181_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="parent_id" ref="tpstvq_purc_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
|
||||
<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="parent_id" ref="gstqst_purc_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvq_purc_fr" model="account.tax.template">
|
||||
|
@ -401,25 +391,26 @@
|
|||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart1182_fr"/>
|
||||
<field name="account_paid_id" ref="chart1182_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
|
||||
<field name="parent_id" ref="tpstvq_purc_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- Saskatchewan PST -->
|
||||
|
||||
<record id="tpstvp_sk_purc_fr" model="account.tax.template">
|
||||
<record id="gstpst_sk_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS + TVP sur les achats (SK)</field>
|
||||
<field name="description">TPSTVP_SK_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">1</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="child_depend" eval="True"/>
|
||||
</record>
|
||||
|
||||
<record id="tpstvp_purc_sk_tps_fr" model="account.tax.template">
|
||||
<record id="gstpst_purc_sk_gst_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les achats - 5% (SK)</field>
|
||||
<field name="description">TPS</field>
|
||||
|
@ -430,14 +421,14 @@
|
|||
<field name="include_base_amount" eval="True"/>
|
||||
<field name="account_collected_id" ref="chart1181_fr"/>
|
||||
<field name="account_paid_id" ref="chart1181_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_sk_purc_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
|
||||
<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="parent_id" ref="gstpst_sk_purc_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvp_sk_purc_fr" model="account.tax.template">
|
||||
<record id="pst_sk_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVP sur les achats - 5% (SK)</field>
|
||||
<field name="description">TVP</field>
|
||||
|
@ -447,78 +438,63 @@
|
|||
<field name="sequence">2</field>
|
||||
<field name="account_collected_id" ref="chart1182_fr"/>
|
||||
<field name="account_paid_id" ref="chart1182_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tvp_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tvp_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tvp_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tvp_fr"/>
|
||||
<field name="parent_id" ref="tpstvp_sk_purc_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_pst_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_pst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- HST -->
|
||||
|
||||
<record id="tvh12_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVH sur les achats - 12%</field>
|
||||
<field name="description">TVH12_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.120000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1183_fr"/>
|
||||
<field name="account_paid_id" ref="chart1183_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
|
||||
</record>
|
||||
|
||||
<record id="tvh13_purc_fr" model="account.tax.template">
|
||||
<record id="hst13_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVH sur les achats - 13%</field>
|
||||
<field name="description">TVH13_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.130000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1183_fr"/>
|
||||
<field name="account_paid_id" ref="chart1183_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
|
||||
<field name="account_collected_id" ref="chart11831_fr"/>
|
||||
<field name="account_paid_id" ref="chart11831_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst13_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<record id="tvh135_purc_fr" model="account.tax.template">
|
||||
<record id="hst14_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVH sur les achats - 13.5%</field>
|
||||
<field name="description">TVH135_PURC</field>
|
||||
<field name="name">TVH sur les achats - 14%</field>
|
||||
<field name="description">TVH14_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.135000</field>
|
||||
<field name="amount">0.140000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1183_fr"/>
|
||||
<field name="account_paid_id" ref="chart1183_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
|
||||
<field name="account_collected_id" ref="chart11832_fr"/>
|
||||
<field name="account_paid_id" ref="chart11832_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst14_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<record id="tvh15_purc_fr" model="account.tax.template">
|
||||
<record id="hst15_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TVH sur les achats - 15%</field>
|
||||
<field name="description">TVH15_PURC</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="amount">0.150000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1183_fr"/>
|
||||
<field name="account_paid_id" ref="chart1183_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tvh_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tvh_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tvh_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tvh_fr"/>
|
||||
<field name="account_collected_id" ref="chart11833_fr"/>
|
||||
<field name="account_paid_id" ref="chart11833_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_hst15_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
<!-- GST -->
|
||||
|
||||
<record id="tps_purc_fr" model="account.tax.template">
|
||||
<record id="gst_purc_fr" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="ca_fr_chart_template_fr"/>
|
||||
<field name="name">TPS sur les achats - 5%</field>
|
||||
<field name="description">TPS_PURC</field>
|
||||
|
@ -527,10 +503,10 @@
|
|||
<field name="type">percent</field>
|
||||
<field name="account_collected_id" ref="chart1181_fr"/>
|
||||
<field name="account_paid_id" ref="chart1181_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_payable_tps_fr"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_receivable_tps_fr"/>
|
||||
<field name="base_code_id" ref="vat_code_base_payable_gst_fr"/>
|
||||
<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"/>
|
||||
</record>
|
||||
|
||||
</data>
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
;Product/Service is delivered in;;;;;;;;;;;;;
|
||||
Supplier is in ;Alberta;British Columbia;Manitoba;New Brunswick;"Newfoundland
|
||||
And Labrador";Nova Scotia;"Northwest
|
||||
Territories";Nunavut;Ontario;"Prince Edward
|
||||
Islands";Quebec;Saskatchewan;Yukon;International
|
||||
Alberta;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
British Columbia;GST – 5%;"GST – 5%
|
||||
PST – 7%";GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
Manitoba;GST – 5%;GST – 5%;"GST – 5%
|
||||
PST – 8%";HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
New Brunswick;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
Newfoundland and Labrador;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
Nova Scotia;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
Northwest Territories;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
Nunavut;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
Ontario;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
Prince Edward Islands;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
Quebec;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;"GST – 5%
|
||||
QST – 9,975%";GST – 5%;GST – 5%;
|
||||
Saskatchewan;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;"GST – 5%
|
||||
PST – 5%";GST – 5%;
|
||||
Yukon;GST – 5%;GST – 5%;GST – 5%;HST – 13%;HST – 13%;HST – 15%;GST – 5%;GST – 5%;HST – 13%;HST – 14%;GST – 5%;GST – 5%;GST – 5%;
|
||||
International;;;;;;;;;;;;;;
|
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -978,7 +978,7 @@
|
|||
<field name="parent_id" ref="chart222020000"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account_type_cash"/>
|
||||
<field name="name">Rozliczenie naliczonego VAT-22%</field>
|
||||
<field name="name">Rozliczenie naliczonego VAT-23%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart222020200" model="account.account.template">
|
||||
|
@ -987,7 +987,16 @@
|
|||
<field name="parent_id" ref="chart222020000"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account_type_cash"/>
|
||||
<field name="name">Rozliczenie naliczonego VAT-7%</field>
|
||||
<field name="name">Rozliczenie naliczonego VAT-8%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart222020400" model="account.account.template">
|
||||
<field name="code">222020400</field>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="parent_id" ref="chart222020000"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account_type_cash"/>
|
||||
<field name="name">Rozliczenie naliczonego VAT-5%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart222020300" model="account.account.template">
|
||||
|
@ -1014,7 +1023,7 @@
|
|||
<field name="parent_id" ref="chart222030000"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account_type_cash"/>
|
||||
<field name="name">Rozliczenie należnego VAT-22%</field>
|
||||
<field name="name">Rozliczenie należnego VAT-23%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart222030200" model="account.account.template">
|
||||
|
@ -1023,7 +1032,16 @@
|
|||
<field name="parent_id" ref="chart222030000"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account_type_cash"/>
|
||||
<field name="name">Rozliczenie należnego VAT-7%</field>
|
||||
<field name="name">Rozliczenie należnego VAT-8%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart222030400" model="account.account.template">
|
||||
<field name="code">222030400</field>
|
||||
<field name="reconcile" eval="False"/>
|
||||
<field name="parent_id" ref="chart222030000"/>
|
||||
<field name="type">other</field>
|
||||
<field name="user_type" ref="account_type_cash"/>
|
||||
<field name="name">Rozliczenie należnego VAT-5%</field>
|
||||
</record>
|
||||
|
||||
<record id="chart222030300" model="account.account.template">
|
||||
|
@ -3176,11 +3194,11 @@
|
|||
|
||||
<!-- Chart template -->
|
||||
<record id="pl_chart_template" model="account.chart.template">
|
||||
<field name="name">Polska - Plan kont</field>
|
||||
<field name="account_root_id" ref="chart0"/>
|
||||
<field name="tax_code_root_id" ref="vat_code_tax"/>
|
||||
<field name="bank_account_view_id" ref="chart113010000"/>
|
||||
<field name="property_account_receivable" ref="chart220000000"/>
|
||||
<field name="name">Polska - Plan kont</field>
|
||||
<field name="account_root_id" ref="chart0"/>
|
||||
<field name="tax_code_root_id" ref="vat_code_tax"/>
|
||||
<field name="bank_account_view_id" ref="chart113010000"/>
|
||||
<field name="property_account_receivable" ref="chart220000000"/>
|
||||
<field name="property_account_payable" ref="chart221000000"/>
|
||||
<field name="property_account_expense_categ" ref="chart330020000"/>
|
||||
<field name="property_account_income_categ" ref="chart773010000"/>
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<openerp>
|
||||
<data noupdate="1">
|
||||
<record id="tax1" model="account.tax.template">
|
||||
<record id="tax_vat_23_due" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="pl_chart_template"/>
|
||||
<field name="name">VAT-22%(22.0%)</field>
|
||||
<field name="amount">0.220000</field>
|
||||
<field name="name">VAT-23%(23.0%)</field>
|
||||
<field name="amount">0.230000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="account_collected_id" ref="chart222030100"/>
|
||||
|
@ -16,10 +16,10 @@
|
|||
<field name="ref_base_sign" eval="-1"/>
|
||||
<field name="ref_tax_sign" eval="-1"/>
|
||||
</record>
|
||||
<record id="tax2" model="account.tax.template">
|
||||
<record id="tax_vat_8_due" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="pl_chart_template"/>
|
||||
<field name="name">VAT-7%(7.0%)</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="name">VAT-8%(8.0%)</field>
|
||||
<field name="amount">0.080000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="account_collected_id" ref="chart222030200"/>
|
||||
|
@ -31,7 +31,22 @@
|
|||
<field name="ref_base_sign" eval="-1"/>
|
||||
<field name="ref_tax_sign" eval="-1"/>
|
||||
</record>
|
||||
<record id="tax3" model="account.tax.template">
|
||||
<record id="tax_vat_5_due" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="pl_chart_template"/>
|
||||
<field name="name">VAT-5%(5.0%)</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">sale</field>
|
||||
<field name="account_collected_id" ref="chart222030400"/>
|
||||
<field name="account_paid_id" ref="chart222030400"/>
|
||||
<field name="base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_base_due"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_due_tva"/>
|
||||
<field name="ref_base_sign" eval="-1"/>
|
||||
<field name="ref_tax_sign" eval="-1"/>
|
||||
</record>
|
||||
<record id="tax_vat_0_due" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="pl_chart_template"/>
|
||||
<field name="name">VAT-0%(0.0%)</field>
|
||||
<field name="amount">0.000000</field>
|
||||
|
@ -46,10 +61,11 @@
|
|||
<field name="ref_base_sign" eval="-1"/>
|
||||
<field name="ref_tax_sign" eval="-1"/>
|
||||
</record>
|
||||
<record id="tax4" model="account.tax.template">
|
||||
|
||||
<record id="tax_vat_23_recivable" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="pl_chart_template"/>
|
||||
<field name="name">VAT naliczony-22%(22.0%)</field>
|
||||
<field name="amount">0.220000</field>
|
||||
<field name="name">VAT naliczony-23%(23.0%)</field>
|
||||
<field name="amount">0.230000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="account_collected_id" ref="chart222020100"/>
|
||||
|
@ -61,10 +77,10 @@
|
|||
<field name="ref_base_sign" eval="-1"/>
|
||||
<field name="ref_tax_sign" eval="-1"/>
|
||||
</record>
|
||||
<record id="tax5" model="account.tax.template">
|
||||
<record id="tax_vat_8_recivable" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="pl_chart_template"/>
|
||||
<field name="name">VAT naliczony-7%(7.0%)</field>
|
||||
<field name="amount">0.070000</field>
|
||||
<field name="name">VAT naliczony-8%(8.0%)</field>
|
||||
<field name="amount">0.080000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="account_collected_id" ref="chart222020200"/>
|
||||
|
@ -76,7 +92,22 @@
|
|||
<field name="ref_base_sign" eval="-1"/>
|
||||
<field name="ref_tax_sign" eval="-1"/>
|
||||
</record>
|
||||
<record id="tax6" model="account.tax.template">
|
||||
<record id="tax_vat_5_recivable" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="pl_chart_template"/>
|
||||
<field name="name">VAT naliczony-5%(5.0%)</field>
|
||||
<field name="amount">0.050000</field>
|
||||
<field name="type">percent</field>
|
||||
<field name="type_tax_use">purchase</field>
|
||||
<field name="account_collected_id" ref="chart222020400"/>
|
||||
<field name="account_paid_id" ref="chart222020200"/>
|
||||
<field name="base_code_id" ref="vat_code_receivable_net"/>
|
||||
<field name="tax_code_id" ref="vat_code_payable"/>
|
||||
<field name="ref_base_code_id" ref="vat_code_receivable_net"/>
|
||||
<field name="ref_tax_code_id" ref="vat_code_payable"/>
|
||||
<field name="ref_base_sign" eval="-1"/>
|
||||
<field name="ref_tax_sign" eval="-1"/>
|
||||
</record>
|
||||
<record id="tax_vat_0_recivable" model="account.tax.template">
|
||||
<field name="chart_template_id" ref="pl_chart_template"/>
|
||||
<field name="name">VAT naliczony-0%(0.0%)</field>
|
||||
<field name="amount">0.000000</field>
|
||||
|
|
|
@ -327,6 +327,7 @@ class mail_mail(osv.Model):
|
|||
email_list.append(self.send_get_email_dict(cr, uid, mail, partner=partner, context=context))
|
||||
|
||||
# build an RFC2822 email.message.Message object and send it without queuing
|
||||
res = None
|
||||
for email in email_list:
|
||||
msg = ir_mail_server.build_email(
|
||||
email_from = mail.email_from,
|
||||
|
|
|
@ -77,9 +77,9 @@ Dashboard / Reports for MRP will include:
|
|||
#TODO: This yml tests are needed to be completely reviewed again because the product wood panel is removed in product demo as it does not suit for new demo context of computer and consultant company
|
||||
# so the ymls are too complex to change at this stage
|
||||
'test': [
|
||||
# 'test/order_demo.yml',
|
||||
# 'test/order_process.yml',
|
||||
# 'test/cancel_order.yml',
|
||||
'test/order_demo.yml',
|
||||
'test/order_process.yml',
|
||||
'test/cancel_order.yml',
|
||||
],
|
||||
'installable': True,
|
||||
'application': True,
|
||||
|
|
|
@ -23,11 +23,12 @@ import time
|
|||
from datetime import datetime
|
||||
|
||||
import openerp.addons.decimal_precision as dp
|
||||
from openerp.osv import fields, osv
|
||||
from openerp.osv import fields, osv, orm
|
||||
from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP
|
||||
from openerp.tools import float_compare
|
||||
from openerp.tools.translate import _
|
||||
from openerp import tools
|
||||
from openerp import SUPERUSER_ID
|
||||
|
||||
#----------------------------------------------------------
|
||||
# Work Centers
|
||||
|
@ -405,12 +406,20 @@ class mrp_production(osv.osv):
|
|||
return result
|
||||
|
||||
def _src_id_default(self, cr, uid, ids, context=None):
|
||||
src_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
|
||||
return src_location_id.id
|
||||
try:
|
||||
location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
|
||||
except (orm.except_orm, ValueError):
|
||||
location_id = False
|
||||
return location_id
|
||||
|
||||
def _dest_id_default(self, cr, uid, ids, context=None):
|
||||
dest_location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
|
||||
return dest_location_id.id
|
||||
try:
|
||||
location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
|
||||
except (orm.except_orm, ValueError):
|
||||
location_id = False
|
||||
return location_id
|
||||
|
||||
def _get_progress(self, cr, uid, ids, name, arg, context=None):
|
||||
""" Return product quantity percentage """
|
||||
|
@ -605,8 +614,12 @@ class mrp_production(osv.osv):
|
|||
prod_line_obj = self.pool.get('mrp.production.product.line')
|
||||
workcenter_line_obj = self.pool.get('mrp.production.workcenter.line')
|
||||
for production in self.browse(cr, uid, ids):
|
||||
cr.execute('delete from mrp_production_product_line where production_id=%s', (production.id,))
|
||||
cr.execute('delete from mrp_production_workcenter_line where production_id=%s', (production.id,))
|
||||
|
||||
p_ids = prod_line_obj.search(cr, SUPERUSER_ID, [('production_id', '=', production.id)], context=context)
|
||||
prod_line_obj.unlink(cr, SUPERUSER_ID, p_ids, context=context)
|
||||
w_ids = workcenter_line_obj.search(cr, SUPERUSER_ID, [('production_id', '=', production.id)], context=context)
|
||||
workcenter_line_obj.unlink(cr, SUPERUSER_ID, w_ids, context=context)
|
||||
|
||||
bom_point = production.bom_id
|
||||
bom_id = production.bom_id.id
|
||||
if not bom_point:
|
||||
|
@ -872,7 +885,7 @@ class mrp_production(osv.osv):
|
|||
'move_id': shipment_move_id,
|
||||
'company_id': production.company_id.id,
|
||||
})
|
||||
self.signal_button_confirm(cr, uid, [procurement_id])
|
||||
procurement_order.signal_button_confirm(cr, uid, [procurement_id])
|
||||
return procurement_id
|
||||
|
||||
def _make_production_internal_shipment_line(self, cr, uid, production_line, shipment_id, parent_move_id, destination_location_id=False, context=None):
|
||||
|
|
|
@ -619,8 +619,8 @@
|
|||
<form string="Manufacturing Orders" version="7.0">
|
||||
<header>
|
||||
<button name="button_confirm" states="draft" string="Confirm Production" class="oe_highlight"/>
|
||||
<button name="%(act_mrp_product_produce)d" states="confirmed,ready,in_production" string="Produce" type="action" class="oe_highlight"/>
|
||||
<button name="force_production" states="confirmed" string="Force Reservation" type="object"/>
|
||||
<button name="%(act_mrp_product_produce)d" states="ready,in_production" string="Produce" type="action" class="oe_highlight"/>
|
||||
<button name="force_production" states="confirmed" string="Force Reservation" type="object" class="oe_highlight"/>
|
||||
<button name="force_production" states="picking_except" string="Force Reservation" type="object"/>
|
||||
<button name="button_produce" states="ready" string="Mark as Started"/>
|
||||
<button name="button_recreate" states="picking_except" string="Recreate Picking"/>
|
||||
|
|
|
@ -94,6 +94,11 @@
|
|||
procurement_ids = procurement.search(cr, uid, [('move_id','=',move_line.id)])
|
||||
assert procurement_ids, "Procurement should be created for shipment line of raw materials."
|
||||
shipment_procurement = procurement.browse(cr, uid, procurement_ids[0], context=context)
|
||||
# procurement state should be `confirmed` at this stage, except if mrp_jit is installed, in which
|
||||
# case it could already be in `running` or `exception` state (not enough stock)
|
||||
expected_states = ('confirmed', 'running', 'exception')
|
||||
assert shipment_procurement.state in expected_states, 'Procurement state is `%s` for %s, expected one of %s' % \
|
||||
(shipment_procurement.state, shipment_procurement.product_id.name, expected_states)
|
||||
assert shipment_procurement.date_planned == date_planned, "Planned date is not correspond in procurement."
|
||||
assert shipment_procurement.product_id.id == order_line.product_id.id, "Product is not correspond in procurement."
|
||||
assert shipment_procurement.product_qty == order_line.product_qty, "Qty is not correspond in procurement."
|
||||
|
@ -157,9 +162,9 @@
|
|||
scrap_location_id = scrap_location_ids[0]
|
||||
order = self.browse(cr, uid, ref("mrp_production_test1"))
|
||||
for move in order.move_lines:
|
||||
move.action_consume(move.product_qty)
|
||||
if move.product_id.id == ref("product.product_product_6"):
|
||||
move.action_scrap(5.0, scrap_location_id)
|
||||
move.action_consume(move.product_qty)
|
||||
-
|
||||
I produce product.
|
||||
-
|
||||
|
|
|
@ -111,7 +111,8 @@ class pos_config(osv.osv):
|
|||
return result
|
||||
|
||||
def _default_sale_journal(self, cr, uid, context=None):
|
||||
res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale')], limit=1)
|
||||
company_id = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id
|
||||
res = self.pool.get('account.journal').search(cr, uid, [('type', '=', 'sale'), ('company_id', '=', company_id)], limit=1, context=context)
|
||||
return res and res[0] or False
|
||||
|
||||
def _default_warehouse(self, cr, uid, context=None):
|
||||
|
|
|
@ -290,7 +290,7 @@
|
|||
<record id="peche" model="product.product">
|
||||
<field name="available_in_pos">True</field>
|
||||
<field name="list_price">5.10</field>
|
||||
<field name="name">Fishing</field>
|
||||
<field name="name">Peaches</field>
|
||||
<field name="to_weight">True</field>
|
||||
<field name="ean13">2300001000008</field>
|
||||
<field name="pos_categ_id" ref="rouges_noyau_fruits"/>
|
||||
|
|
|
@ -12,6 +12,8 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
|
|||
|
||||
this.weight = 0;
|
||||
this.weighting = false;
|
||||
this.debug_weight = 0;
|
||||
this.use_debug_weight = false;
|
||||
|
||||
this.paying = false;
|
||||
this.default_payment_status = {
|
||||
|
@ -92,38 +94,36 @@ function openerp_pos_devices(instance,module){ //module is instance.point_of_sal
|
|||
// and a weighting_end()
|
||||
weighting_read_kg: function(){
|
||||
var self = this;
|
||||
if(this.bypass_proxy){
|
||||
return this.weight;
|
||||
}else{
|
||||
this.message('weighting_read_kg',{})
|
||||
.done(function(weight){
|
||||
if(self.weighting && !self.bypass_proxy){
|
||||
this.message('weighting_read_kg',{})
|
||||
.done(function(weight){
|
||||
if(self.weighting){
|
||||
if(self.use_debug_weight){
|
||||
self.weight = self.debug_weight;
|
||||
}else{
|
||||
self.weight = weight;
|
||||
}
|
||||
});
|
||||
return this.weight;
|
||||
}
|
||||
}
|
||||
});
|
||||
return this.weight;
|
||||
},
|
||||
|
||||
// sets a custom weight, ignoring the proxy returned value.
|
||||
debug_set_weight: function(kg){
|
||||
this.bypass_proxy = true;
|
||||
this.weight = kg;
|
||||
this.use_debug_weight = true;
|
||||
this.debug_weight = kg;
|
||||
},
|
||||
|
||||
// resets the custom weight and re-enable listening to the proxy for weight values
|
||||
debug_reset_weight: function(){
|
||||
this.bypass_proxy = false;
|
||||
this.weight = 0;
|
||||
this.use_debug_weight = false;
|
||||
this.debug_weight = 0;
|
||||
},
|
||||
|
||||
// the client has finished weighting products
|
||||
weighting_end: function(){
|
||||
if(!this.bypass_proxy){
|
||||
this.weight = 0;
|
||||
this.weighting = false;
|
||||
this.message('weighting_end');
|
||||
}
|
||||
this.weight = 0;
|
||||
this.weighting = false;
|
||||
this.message('weighting_end');
|
||||
},
|
||||
|
||||
// the pos asks the client to pay 'price' units
|
||||
|
|
|
@ -234,8 +234,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
|
|||
on_removed_order: function(removed_order){
|
||||
if( this.get('orders').isEmpty()){
|
||||
this.add_new_order();
|
||||
}
|
||||
if( this.get('selectedOrder') === removed_order){
|
||||
}else{
|
||||
this.set({ selectedOrder: this.get('orders').last() });
|
||||
}
|
||||
},
|
||||
|
|
|
@ -467,7 +467,6 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
|
|||
icon: '/point_of_sale/static/src/img/icons/png48/go-previous.png',
|
||||
click: function(){
|
||||
clearInterval(this.intervalID);
|
||||
self.pos.proxy.weighting_end();
|
||||
self.pos_widget.screen_selector.set_current_screen(self.previous_screen);
|
||||
}
|
||||
});
|
||||
|
@ -828,7 +827,7 @@ function openerp_pos_screens(instance, module){ //module is instance.point_of_sa
|
|||
click: function() { self.finishOrder(); },
|
||||
});
|
||||
|
||||
window.print();
|
||||
this.print();
|
||||
|
||||
// THIS IS THE HACK OF THE CENTURY
|
||||
//
|
||||
|
|
|
@ -752,6 +752,7 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
|
|||
}
|
||||
});
|
||||
this.$('.button.reset_weight').click(function(){
|
||||
self.$('input.weight').val('');
|
||||
self.pos.proxy.debug_reset_weight();
|
||||
});
|
||||
this.$('.button.custom_ean').click(function(){
|
||||
|
|
|
@ -742,7 +742,8 @@ class task(osv.osv):
|
|||
" * Blocked indicates something is preventing the progress of this task\n"
|
||||
" * Ready for next stage indicates the task is ready to be pulled to the next stage",
|
||||
readonly=True, required=False),
|
||||
'create_date': fields.datetime('Create Date', readonly=True,select=True),
|
||||
'create_date': fields.datetime('Create Date', readonly=True, select=True),
|
||||
'write_date': fields.datetime('Last Modification Date', readonly=True, select=True), #not displayed in the view but it might be useful with base_action_rule module (and it needs to be defined first for that)
|
||||
'date_start': fields.datetime('Starting Date',select=True),
|
||||
'date_end': fields.datetime('Ending Date',select=True),
|
||||
'date_deadline': fields.date('Deadline',select=True),
|
||||
|
|
|
@ -393,6 +393,8 @@ class project_issue(osv.Model):
|
|||
# stage change: update date_last_stage_update
|
||||
if 'stage_id' in vals:
|
||||
vals['date_last_stage_update'] = fields.datetime.now()
|
||||
if 'kanban_state' not in vals:
|
||||
vals['kanban_state'] = 'normal'
|
||||
# user_id change: update date_start
|
||||
if vals.get('user_id'):
|
||||
vals['date_start'] = fields.datetime.now()
|
||||
|
|
|
@ -62,8 +62,9 @@ This module requires the ``wkthtmltopdf`` library to render HTML documents as
|
|||
PDF. Version 0.9.9 or later is necessary, and can be found at
|
||||
http://code.google.com/p/wkhtmltopdf/ for Linux, Mac OS X (i386) and Windows (32bits).
|
||||
|
||||
After installing the library on the OpenERP Server machine, you need to set the
|
||||
path to the ``wkthtmltopdf`` executable file on each Company.
|
||||
After installing the library on the OpenERP Server machine, you may need to set
|
||||
the path to the ``wkthtmltopdf`` executable file in a system parameter named
|
||||
``webkit_path`` in Settings -> Customization -> Parameters -> System Parameters
|
||||
|
||||
If you are experiencing missing header/footer problems on Linux, be sure to
|
||||
install a 'static' version of the library. The default ``wkhtmltopdf`` on
|
||||
|
|
|
@ -11,8 +11,9 @@
|
|||
<field name="webkit_header"/>
|
||||
<field name="webkit_debug"/>
|
||||
<field name="precise_mode"/>
|
||||
<separator string="Webkit Template (used if Report File is not found)" colspan="4"/>
|
||||
<field name="report_webkit_data" colspan="4" nolabel="1"/>
|
||||
</group>
|
||||
<group string="Webkit Template (used if Report File is not found)">
|
||||
<field name="report_webkit_data" nolabel="1"/>
|
||||
</group>
|
||||
</page>
|
||||
</xpath>
|
||||
|
|
|
@ -96,6 +96,13 @@ class res_users(osv.Model):
|
|||
'default_section_id': fields.many2one('crm.case.section', 'Default Sales Team'),
|
||||
}
|
||||
|
||||
def __init__(self, pool, cr):
|
||||
init_res = super(res_users, self).__init__(pool, cr)
|
||||
# duplicate list to avoid modifying the original reference
|
||||
self.SELF_WRITEABLE_FIELDS = list(self.SELF_WRITEABLE_FIELDS)
|
||||
self.SELF_WRITEABLE_FIELDS.extend(['default_section_id'])
|
||||
return init_res
|
||||
|
||||
|
||||
class sale_crm_lead(osv.Model):
|
||||
_inherit = 'crm.lead'
|
||||
|
|
|
@ -116,7 +116,7 @@
|
|||
<field name="arch" type="xml">
|
||||
<data>
|
||||
<xpath expr="//field[@name='company_id']" position="before">
|
||||
<field name="default_section_id"/>
|
||||
<field name="default_section_id" readonly="0"/>
|
||||
</xpath>
|
||||
</data>
|
||||
</field>
|
||||
|
|
|
@ -25,7 +25,7 @@ import time
|
|||
from operator import itemgetter
|
||||
from itertools import groupby
|
||||
|
||||
from openerp.osv import fields, osv
|
||||
from openerp.osv import fields, osv, orm
|
||||
from openerp.tools.translate import _
|
||||
from openerp import netsvc
|
||||
from openerp import tools
|
||||
|
@ -558,12 +558,11 @@ class stock_picking(osv.osv):
|
|||
ids = [ids]
|
||||
for pick in self.browse(cr, uid, ids, context=context):
|
||||
sql_str = """update stock_move set
|
||||
date='%s'
|
||||
date_expected='%s'
|
||||
where
|
||||
picking_id=%d """ % (value, pick.id)
|
||||
|
||||
if pick.max_date:
|
||||
sql_str += " and (date='" + pick.max_date + "' or date>'" + value + "')"
|
||||
sql_str += " and (date_expected='" + pick.max_date + "')"
|
||||
cr.execute(sql_str)
|
||||
return True
|
||||
|
||||
|
@ -580,11 +579,11 @@ class stock_picking(osv.osv):
|
|||
ids = [ids]
|
||||
for pick in self.browse(cr, uid, ids, context=context):
|
||||
sql_str = """update stock_move set
|
||||
date='%s'
|
||||
date_expected='%s'
|
||||
where
|
||||
picking_id=%s """ % (value, pick.id)
|
||||
if pick.min_date:
|
||||
sql_str += " and (date='" + pick.min_date + "' or date<'" + value + "')"
|
||||
sql_str += " and (date_expected='" + pick.min_date + "')"
|
||||
cr.execute(sql_str)
|
||||
return True
|
||||
|
||||
|
@ -1692,7 +1691,12 @@ class stock_move(osv.osv):
|
|||
elif picking_type == 'out':
|
||||
location_xml_id = 'stock_location_customers'
|
||||
if location_xml_id:
|
||||
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
|
||||
try:
|
||||
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
|
||||
except (orm.except_orm, ValueError):
|
||||
location_id = False
|
||||
|
||||
return location_id
|
||||
|
||||
def _default_location_source(self, cr, uid, context=None):
|
||||
|
@ -1721,7 +1725,12 @@ class stock_move(osv.osv):
|
|||
elif picking_type in ('out', 'internal'):
|
||||
location_xml_id = 'stock_location_stock'
|
||||
if location_xml_id:
|
||||
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
|
||||
try:
|
||||
location_model, location_id = mod_obj.get_object_reference(cr, uid, 'stock', location_xml_id)
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
|
||||
except (orm.except_orm, ValueError):
|
||||
location_id = False
|
||||
|
||||
return location_id
|
||||
|
||||
def _default_destination_address(self, cr, uid, context=None):
|
||||
|
@ -1939,8 +1948,16 @@ class stock_move(osv.osv):
|
|||
elif type == 'out':
|
||||
location_source_id = 'stock_location_stock'
|
||||
location_dest_id = 'stock_location_customers'
|
||||
source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
|
||||
dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
|
||||
try:
|
||||
source_location = mod_obj.get_object_reference(cr, uid, 'stock', location_source_id)
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [source_location[1]], 'read', context=context)
|
||||
except (orm.except_orm, ValueError):
|
||||
source_location = False
|
||||
try:
|
||||
dest_location = mod_obj.get_object_reference(cr, uid, 'stock', location_dest_id)
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [dest_location[1]], 'read', context=context)
|
||||
except (orm.except_orm, ValueError):
|
||||
dest_location = False
|
||||
return {'value':{'location_id': source_location and source_location[1] or False, 'location_dest_id': dest_location and dest_location[1] or False}}
|
||||
|
||||
def onchange_date(self, cr, uid, ids, date, date_expected, context=None):
|
||||
|
@ -2870,8 +2887,12 @@ class stock_inventory_line(osv.osv):
|
|||
}
|
||||
|
||||
def _default_stock_location(self, cr, uid, context=None):
|
||||
stock_location = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock')
|
||||
return stock_location.id
|
||||
try:
|
||||
location_model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
|
||||
except (orm.except_orm, ValueError):
|
||||
location_id = False
|
||||
return location_id
|
||||
|
||||
_defaults = {
|
||||
'location_id': _default_stock_location
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
#
|
||||
##############################################################################
|
||||
|
||||
from openerp.osv import fields, osv
|
||||
from openerp.osv import fields, osv, orm
|
||||
import openerp.addons.decimal_precision as dp
|
||||
from openerp.tools.translate import _
|
||||
from openerp import tools
|
||||
|
@ -62,8 +62,12 @@ class stock_change_product_qty(osv.osv_memory):
|
|||
if 'product_id' in fields:
|
||||
res.update({'product_id': product_id})
|
||||
if 'location_id' in fields:
|
||||
location_id = self.pool.get('ir.model.data').get_object(cr, uid, 'stock', 'stock_location_stock', context=context)
|
||||
res.update({'location_id': location_id and location_id.id or False})
|
||||
try:
|
||||
model, location_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', 'stock_location_stock')
|
||||
self.pool.get('stock.location').check_access_rule(cr, uid, [location_id], 'read', context=context)
|
||||
except (orm.except_orm, ValueError):
|
||||
location_id = False
|
||||
res.update({'location_id': location_id})
|
||||
return res
|
||||
|
||||
def change_product_qty(self, cr, uid, ids, context=None):
|
||||
|
|
Loading…
Reference in New Issue