diff --git a/addons/account/account.py b/addons/account/account.py index 02cb63ca818..5726a5a793c 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2678,7 +2678,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): tax_template_ref[tax.id] = new_tax #deactivate the parent_store functionnality on account_account for rapidity purpose - self.pool._init = True + ctx = context and context.copy() or {} + ctx['defer_parent_store_computation'] = True children_acc_template = obj_acc_template.search(cr, uid, [('parent_id','child_of',[obj_acc_root.id]),('nocreate','!=',True)]) children_acc_template.sort() @@ -2706,10 +2707,9 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'tax_ids': [(6,0,tax_ids)], 'company_id': company_id, } - new_account = obj_acc.create(cr, uid, vals) + new_account = obj_acc.create(cr, uid, vals, context=ctx) acc_template_ref[account_template.id] = new_account #reactivate the parent_store functionnality on account_account - self.pool._init = False self.pool.get('account.account')._parent_store_compute(cr) for key,value in todo_dict.items(): @@ -2857,7 +2857,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'name': tmp, 'currency_id': line.currency_id and line.currency_id.id or False, 'code': new_code, - 'type': 'other', + 'type': 'liquidity', 'user_type': account_template.user_type and account_template.user_type.id or False, 'reconcile': True, 'parent_id': acc_template_ref[ref_acc_bank.id] or False, @@ -2879,7 +2879,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): vals_journal['name']= vals['name'] vals_journal['code']= _('BNK') + str(current_num) vals_journal['sequence_id'] = seq_id - vals_journal['type'] = 'cash' + vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank' vals_journal['company_id'] = company_id vals_journal['analytic_journal_id'] = analitical_journal_bank diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 2d9ac7d6b15..a9bb550429a 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -757,7 +757,7 @@ class account_move_line(osv.osv): if 'comment' in context and context['comment']: libelle = context['comment'] else: - libelle = 'Write-Off' + libelle = _('Write-Off') writeoff_lines = [ (0, 0, { 'name': libelle, diff --git a/addons/account/installer.py b/addons/account/installer.py index 0301126a373..1bda9427e75 100644 --- a/addons/account/installer.py +++ b/addons/account/installer.py @@ -219,7 +219,8 @@ class account_installer(osv.osv_memory): tax_template_ref[tax.id] = new_tax #deactivate the parent_store functionnality on account_account for rapidity purpose - self.pool._init = True + ctx = context and context.copy() or {} + ctx['defer_parent_store_computation'] = True children_acc_template = obj_acc_template.search(cr, uid, [('parent_id', 'child_of', [obj_acc_root.id]), ('nocreate', '!=', True)], context=context) children_acc_template.sort() @@ -248,7 +249,7 @@ class account_installer(osv.osv_memory): 'tax_ids': [(6, 0, tax_ids)], 'company_id': company_id.id, } - new_account = obj_acc.create(cr, uid, vals, context=context) + new_account = obj_acc.create(cr, uid, vals, context=ctx) acc_template_ref[account_template.id] = new_account if account_template.name == 'Bank Current Account': b_vals = { @@ -262,8 +263,7 @@ class account_installer(osv.osv_memory): 'tax_ids': [(6,0,tax_ids)], 'company_id': company_id.id, } - bank_account = obj_acc.create(cr, uid, b_vals, context=context) - + bank_account = obj_acc.create(cr, uid, b_vals, context=ctx) view_id_cash = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal View')], context=context)[0] #why fixed name here? view_id_cur = obj_acc_journal_view.search(cr, uid, [('name', '=', 'Bank/Cash Journal (Multi-Currency) View')], context=context)[0] #Why Fixed name here? @@ -333,7 +333,7 @@ class account_installer(osv.osv_memory): 'parent_id': bank_account, 'company_id': company_id.id } - child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=context) + child_bnk_acc = obj_acc.create(cr, uid, vals_bnk, context=ctx) vals_seq_child = { 'name': _(vals_bnk['name'] + ' ' + 'Journal'), 'code': 'account.journal', @@ -367,7 +367,6 @@ class account_installer(osv.osv_memory): code_cnt += 1 #reactivate the parent_store functionality on account_account - self.pool._init = False obj_acc._parent_store_compute(cr) for key, value in todo_dict.items(): diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index d47d8fb1f6f..159de686764 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -23,10 +23,11 @@ import time from lxml import etree import netsvc -from osv import fields -from osv import osv +from osv import osv, fields +import decimal_precision as dp from tools.translate import _ + class account_move_line(osv.osv): _inherit = 'account.move.line' @@ -145,18 +146,29 @@ class account_voucher(osv.osv): res['arch'] = etree.tostring(doc) return res + def _compute_writeoff_amount(self, cr, uid, line_dr_ids, line_cr_ids, amount): + debit = credit = 0.0 + for l in line_dr_ids: + debit += l['amount'] + for l in line_cr_ids: + credit += l['amount'] + return abs(amount - abs(credit - debit)) + + def onchange_line_ids(self, cr, uid, ids, line_dr_ids, line_cr_ids, amount): + line_dr_ids = [x[2] for x in line_dr_ids] + line_cr_ids = [x[2] for x in line_cr_ids] + return {'value': {'writeoff_amount': self._compute_writeoff_amount(cr, uid, line_dr_ids, line_cr_ids, amount)}} + def _get_writeoff_amount(self, cr, uid, ids, name, args, context=None): if not ids: return {} res = {} + debit = credit = 0.0 for voucher in self.browse(cr, uid, ids, context=context): - debit= credit = 0.0 - if voucher.line_dr_ids: - for line in voucher.line_dr_ids: - debit += line.amount_unreconciled - if voucher.line_cr_ids: - for line in voucher.line_cr_ids: - credit += line.amount_unreconciled - res[voucher.id] = abs(voucher.amount - abs(credit - debit)) + for l in voucher.line_dr_ids: + debit += l.amount + for l in voucher.line_cr_ids: + credit += l.amount + res[voucher.id] = abs(voucher.amount - abs(credit - debit)) return res _name = 'account.voucher' @@ -194,8 +206,8 @@ class account_voucher(osv.osv): \n* The \'Pro-forma\' when voucher is in Pro-forma state,voucher does not have an voucher number. \ \n* The \'Posted\' state is used when user create voucher,a voucher number is generated and voucher entries are created in account \ \n* The \'Cancelled\' state is used when user cancel voucher.'), - 'amount': fields.float('Total', digits=(16, 2), required=True, readonly=True, states={'draft':[('readonly',False)]}), - 'tax_amount':fields.float('Tax Amount', digits=(14,2), readonly=True, states={'draft':[('readonly',False)]}), + 'amount': fields.float('Total', digits_compute=dp.get_precision('Account'), required=True, readonly=True, states={'draft':[('readonly',False)]}), + 'tax_amount':fields.float('Tax Amount', digits_compute=dp.get_precision('Account'), readonly=True, states={'draft':[('readonly',False)]}), 'reference': fields.char('Ref #', size=64, readonly=True, states={'draft':[('readonly',False)]}, help="Transaction reference number."), 'number': fields.char('Number', size=32, readonly=True,), 'move_id':fields.many2one('account.move', 'Account Entry'), @@ -210,14 +222,13 @@ class account_voucher(osv.osv): 'pre_line':fields.boolean('Previous Payments ?', required=False), 'date_due': fields.date('Due Date', readonly=True, states={'draft':[('readonly',False)]}), 'payment_option':fields.selection([ - ('without_writeoff', 'Without Write-off'), - ('with_writeoff', 'With Write-off'), - ], 'Payment Option', required=True, readonly=True, states={'draft': [('readonly', False)]}), + ('without_writeoff', 'Keep Open'), + ('with_writeoff', 'Reconcile with Write-Off'), + ], 'Payment Difference', required=True, readonly=True, states={'draft': [('readonly', False)]}), 'writeoff_acc_id': fields.many2one('account.account', 'Write-Off account', readonly=True, states={'draft': [('readonly', False)]}), - 'writeoff_journal_id': fields.many2one('account.journal', 'Write-Off journal', readonly=True, states={'draft': [('readonly', False)]}), - 'comment': fields.char('Comment', size=64, readonly=True, states={'draft': [('readonly', False)]}), - 'analytic_id': fields.many2one('account.analytic.account','Analytic Account', readonly=True, states={'draft': [('readonly', False)]}), - 'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Writeoff Amount', type='float', readonly=True), + 'comment': fields.char('Write-Off Comment', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}), + 'analytic_id': fields.many2one('account.analytic.account','Write-Off Analytic Account', readonly=True, states={'draft': [('readonly', False)]}), + 'writeoff_amount': fields.function(_get_writeoff_amount, method=True, string='Write-Off Amount', type='float', readonly=True), } _defaults = { 'period_id': _get_period, @@ -235,7 +246,7 @@ class account_voucher(osv.osv): 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'account.voucher',context=c), 'tax_id': _get_tax, 'payment_option': 'without_writeoff', - 'comment': 'Write-Off', + 'comment': _('Write-Off'), } def compute_tax(self, cr, uid, ids, context={}): @@ -390,13 +401,17 @@ class account_voucher(osv.osv): @return: Returns a dict which contains new values, and context """ + if context is None: + context = {} if not journal_id: return {} - if context is None: - context = {} - currency_pool = self.pool.get('res.currency') line_pool = self.pool.get('account.voucher.line') + line_ids = ids and line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) or False + if line_ids: + line_pool.unlink(cr, uid, line_ids) + + currency_pool = self.pool.get('res.currency') move_line_pool = self.pool.get('account.move.line') partner_pool = self.pool.get('res.partner') journal_pool = self.pool.get('account.journal') @@ -410,13 +425,6 @@ class account_voucher(osv.osv): if not partner_id: return default - - if not partner_id and ids: - line_ids = line_pool.search(cr, uid, [('voucher_id', '=', ids[0])]) - if line_ids: - line_pool.unlink(cr, uid, line_ids) - return default - journal = journal_pool.browse(cr, uid, journal_id) partner = partner_pool.browse(cr, uid, partner_id) account_id = False @@ -449,16 +457,6 @@ class account_voucher(osv.osv): ids.reverse() moves = move_line_pool.browse(cr, uid, ids) - priority_moves = [] - unpriority_moves = [] - for line in moves: - original_amount = line.credit or line.debit or 0.0 - if original_amount == price: - priority_moves.append(line) - else: - unpriority_moves.append(line) - moves = priority_moves + unpriority_moves - company_currency = journal.company_id.currency_id.id if company_currency != currency_id and ttype == 'payment': total_debit = currency_pool.compute(cr, uid, currency_id, company_currency, total_debit) @@ -509,6 +507,8 @@ class account_voucher(osv.osv): default['value']['pre_line'] = 1 elif ttype == 'receipt' and len(default['value']['line_dr_ids']) > 0: default['value']['pre_line'] = 1 + default['value']['writeoff_amount'] = self._compute_writeoff_amount(cr, uid, default['value']['line_dr_ids'], default['value']['line_cr_ids'], price) + return default def onchange_date(self, cr, user, ids, date, context={}): @@ -734,16 +734,20 @@ class account_voucher(osv.osv): if line.move_line_id.id: rec_ids = [master_line, line.move_line_id.id] rec_list_ids.append(rec_ids) - writeoff_account_id = False - writeoff_journal_id = False - writeoff_period_id = inv.period_id.id, - comment = False if not currency_pool.is_zero(cr, uid, inv.currency_id, line_total): diff = line_total + account_id = False + if inv.payment_option == 'with_writeoff': + account_id = inv.writeoff_acc_id.id + elif inv.type in ('sale', 'receipt'): +# if inv.journal_id.type in ('sale','sale_refund', 'cash', 'bank'): + account_id = inv.partner_id.property_account_receivable.id + else: + account_id = inv.partner_id.property_account_payable.id move_line = { 'name': name, - 'account_id': False, + 'account_id': account_id, 'move_id': move_id, 'partner_id': inv.partner_id.id, 'date': inv.date, @@ -752,24 +756,8 @@ class account_voucher(osv.osv): 'amount_currency': company_currency <> current_currency and currency_pool.compute(cr, uid, company_currency, current_currency, diff * -1) or 0.0, 'currency_id': company_currency <> current_currency and current_currency or False, } - account_id = False - if inv.type in ('sale', 'receipt'): -# if inv.journal_id.type in ('sale','sale_refund', 'cash', 'bank'): - account_id = inv.partner_id.property_account_receivable.id - else: - account_id = inv.partner_id.property_account_payable.id - move_line['account_id'] = account_id move_line_pool.create(cr, uid, move_line) - for rec_ids in rec_list_ids: - if len(rec_ids) >= 2: - if inv.payment_option == 'with_writeoff': - writeoff_account_id = inv.writeoff_acc_id.id - writeoff_journal_id = inv.writeoff_journal_id.id - comment = inv.comment - move_line_pool.reconcile(cr, uid, rec_ids, 'manual', writeoff_account_id, writeoff_period_id, writeoff_journal_id, context) - else: - move_line_pool.reconcile_partial(cr, uid, rec_ids) self.write(cr, uid, [inv.id], { 'move_id': move_id, @@ -777,6 +765,9 @@ class account_voucher(osv.osv): 'number': name, }) move_pool.post(cr, uid, [move_id], context={}) + for rec_ids in rec_list_ids: + if len(rec_ids) >= 2: + move_line_pool.reconcile_partial(cr, uid, rec_ids) return True def copy(self, cr, uid, id, default={}, context=None): @@ -828,7 +819,7 @@ class account_voucher_line(osv.osv): 'account_id':fields.many2one('account.account','Account', required=True), 'partner_id':fields.related('voucher_id', 'partner_id', type='many2one', relation='res.partner', string='Partner'), 'untax_amount':fields.float('Untax Amount'), - 'amount':fields.float('Amount', digits=(14,2)), + 'amount':fields.float('Amount', digits_compute=dp.get_precision('Account')), 'type':fields.selection([('dr','Debit'),('cr','Credit')], 'Cr/Dr'), 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic Account'), 'move_line_id': fields.many2one('account.move.line', 'Journal Item'), @@ -993,4 +984,4 @@ class account_bank_statement_line(osv.osv): account_bank_statement_line() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 0511a8325d5..c41356f3973 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -70,8 +70,21 @@ - - + + + + + + + + + + + + + + + diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 3a0dbf40f4d..b47fa46bb7e 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -105,7 +105,7 @@ - + - + @@ -198,22 +198,18 @@ - + - - + domain="[('type','=','other')]"/> - @@ -227,8 +223,21 @@ - - + + + + + + + + + + + + + + + @@ -295,7 +304,7 @@ - + - + @@ -330,10 +339,7 @@ attrs="{'invisible':[('payment_option','!=','with_writeoff')]}"/> - - + domain="[('type','=','other')]"/> - - + + + + + + + + + + + + + + + diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 5bef0c26718..2800511a8e0 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -144,8 +144,21 @@ - - + + + + + + + + + + + + + + + @@ -251,8 +264,21 @@ - - + + + + + + + + + + + + + + + diff --git a/addons/crm/crm.py b/addons/crm/crm.py index 5336bdd23fb..b40f7131a47 100644 --- a/addons/crm/crm.py +++ b/addons/crm/crm.py @@ -532,7 +532,7 @@ class crm_case_section(osv.osv): 'reply_to': fields.char('Reply-To', size=64, help="The email address put in the 'Reply-To' of all emails sent by OpenERP about cases in this sales team"), 'parent_id': fields.many2one('crm.case.section', 'Parent Team'), 'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'), - 'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"), + 'resource_calendar_id': fields.many2one('resource.calendar', "Working Time"), 'note': fields.text('Description'), 'working_hours': fields.float('Working Hours', digits=(16,2 )), 'stage_ids': fields.many2many('crm.case.stage', 'section_stage_rel', 'section_id', 'stage_id', 'Stages'), diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index 32478f515a0..7ffb40e1c8d 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -34,8 +34,8 @@ class hr_evaluation_plan(osv.osv): 'name': fields.char("Evaluation Plan", size=64, required=True), 'company_id': fields.many2one('res.company', 'Company', required=True), 'phase_ids': fields.one2many('hr_evaluation.plan.phase', 'plan_id', 'Evaluation Phases'), - 'month_first': fields.integer('Next Evaluation After'), - 'month_next': fields.integer('After the Date of Start'), + 'month_first': fields.integer('First Evaluation in (months)', help="This number of months will be used to schedule the first evaluation date of the employee when selecting an evaluation plan. "), + 'month_next': fields.integer('Periodicity of Evaluations (months)', help="The number of month that depicts the delay between each evaluation of this plan (after the first one)."), 'active': fields.boolean('Active') } _defaults = { @@ -101,7 +101,7 @@ class hr_employee(osv.osv): _inherit="hr.employee" _columns = { 'evaluation_plan_id': fields.many2one('hr_evaluation.plan', 'Evaluation Plan'), - 'evaluation_date': fields.date('Next Evaluation', help="Date of the next evaluation"), + 'evaluation_date': fields.date('Next Evaluation Date', help="The date of the next evaluation is computed by the evaluation plan's dates (first evaluation + periodicity)."), } def run_employee_evaluation(self, cr, uid, automatic=False, use_new_cursor=False, context=None): diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/account_pcmn_belgium.xml index 3f494ae443c..18b974632d4 100644 --- a/addons/l10n_be/account_pcmn_belgium.xml +++ b/addons/l10n_be/account_pcmn_belgium.xml @@ -2913,17 +2913,25 @@ + + Clients + 4000 + receivable + + + + Rabais, remises, ristournes à accorder et autres notes de crédit à établir 4007 - receivable + other Créances résultant de livraisons de biens 4008 - receivable + other @@ -2934,26 +2942,24 @@ - + Effets à recevoir 4010 - receivable + other - - Effets à l'encaissement 4013 - receivable + other Effets à l'escompte 4015 - receivable + other @@ -2967,21 +2973,21 @@ Entreprises liées 4020 - receivable + other Autres entreprises avec lesquelles il existe un lien de participation 4021 - receivable + other Administrateurs et gérants d'entreprise 4022 - receivable + other @@ -2995,63 +3001,63 @@ Entreprises liées 4030 - receivable + other Autres entreprises avec lesquelles il existe un lien de participation 4031 - receivable + other Administrateurs et gérants de l'entreprise 4032 - receivable + other Produits à recevoir 404 - receivable + other Clients : retenues sur garanties 405 - receivable + other Acomptes versés 406 - receivable + other Créances douteuses 407 - receivable + other Compensation clients 408 - receivable + other Réductions de valeur actées 409 - receivable + other @@ -3072,14 +3078,14 @@ Appels de fonds 4100 - receivable + other Actionnaires défaillants 4101 - receivable + other @@ -3128,21 +3134,21 @@ T.V.A. déductible 4111 - receivable + other Compte courant administration T.V.A. 4112 - receivable + other Taxe d'égalisation due 4118 - receivable + other @@ -3156,28 +3162,28 @@ à 4124 Impôts belges sur le résultat 4120 - receivable + other à 4127 Autres impôts belges 4125 - receivable + other Impôts étrangers 4128 - receivable + other Produits à recevoir 414 - receivable + other @@ -3191,42 +3197,42 @@ Associés 4160 - receivable + other Avances et prêts au personnel 4161 - receivable + other Compte courant des associés en S.P.R.L. 4162 - receivable + other Compte courant des administrateurs et gérants 4163 - receivable + other Créances sur sociétés apparentées 4164 - receivable + other Emballages et matériel à rendre 4166 - receivable + other @@ -3240,42 +3246,42 @@ Subsides à recevoir 41670 - receivable + other Autres créances 41671 - receivable + other Rabais, ristournes, remises à obtenir et autres avoirs non encore reçus 4168 - receivable + other Créances douteuses 417 - receivable + other Cautionnements versés en numéraires 418 - receivable + other Réductions de valeur actées 419 - receivable + other @@ -3296,14 +3302,14 @@ Convertibles 4200 - payable + other Non convertibles 4201 - payable + other @@ -3317,14 +3323,14 @@ Convertibles 4210 - payable + other Non convertibles 4211 - payable + other @@ -3338,14 +3344,14 @@ Financement de biens immobiliers 4220 - payable + other Financement de biens mobiliers 4221 - payable + other @@ -3359,28 +3365,28 @@ Dettes en compte 4230 - payable + other Promesses 4231 - payable + other Crédits d'acceptation 4232 - payable + other Autres emprunts 424 - payable + other @@ -3394,21 +3400,21 @@ Fournisseurs 4250 - payable + other Effets à payer 4251 - payable + other Cautionnements reçus en numéraires 426 - payable + other @@ -3422,28 +3428,28 @@ Entreprises liées 4290 - payable + other Entreprises avec lesquelles il existe un lien de participation 4291 - payable + other Administrateurs, gérants, associés 4292 - payable + other Autres dettes 4299 - payable + other @@ -3457,35 +3463,35 @@ Etablissements de crédit. Emprunts en compte à terme fixe 430 - payable + other Etablissements de crédit. Promesses 431 - payable + other Etablissements de crédit. Crédits d'acceptation 432 - payable + other Etablissements de crédit. Dettes en compte courant 433 - payable + other Autres emprunts 439 - payable + other @@ -3521,7 +3527,7 @@ Entreprises avec lesquelles il existe un lien de participation 44001 - payable + other @@ -3535,35 +3541,35 @@ Fournisseurs belges 44010 - payable + other Fournisseurs CEE 44011 - payable + other Fournisseurs importation 44012 - payable + other Dettes envers les coparticipants 4402 - payable + other Fournisseurs - retenues de garanties 4403 - payable + other @@ -3584,14 +3590,14 @@ Entreprises liées 44100 - payable + other Entreprises avec lesquelles il existe un lien de participation 44101 - payable + other @@ -3605,42 +3611,42 @@ Fournisseurs belges 44110 - payable + other Fournisseurs CEE 44111 - payable + other Fournisseurs importation 44112 - payable + other Factures à recevoir 444 - payable + other Acomptes reçus 446 - payable + other Compensations fournisseurs 448 - payable + other @@ -3661,21 +3667,21 @@ à 4504 Impôts sur le résultat 4501 - payable + other à 4507 Autres impôts en Belgique 4505 - payable + other Impôts à l'étranger 4508 - payable + other @@ -3724,21 +3730,21 @@ T.V.A. déductible 4511 - payable + other Compte courant administration T.V.A. 4512 - payable + other Taxe d'égalisation due 4518 - payable + other @@ -3752,7 +3758,7 @@ Autres impôts sur le résultat 4520 - payable + other @@ -3766,35 +3772,35 @@ Précompte immobilier 45250 - payable + other Impôts communaux à payer 45251 - payable + other Impôts provinciaux à payer 45252 - payable + other Autres impôts et taxes à payer 45253 - payable + other Impôts et taxes à l'étranger 4528 - payable + other @@ -3808,35 +3814,35 @@ Précompte professionnel retenu sur rémunérations 4530 - payable + other Précompte professionnel retenu sur tantièmes 4531 - payable + other Précompte mobilier retenu sur dividendes attribués 4532 - payable + other Précompte mobilier retenu sur intérêts payés 4533 - payable + other Autres précomptes retenus 4538 - payable + other @@ -3850,35 +3856,35 @@ Arriérés 4540 - payable + other 1er trimestre 4541 - payable + other 2ème trimestre 4542 - payable + other 3ème trimestre 4543 - payable + other 4ème trimestre 4544 - payable + other @@ -3892,28 +3898,28 @@ Administrateurs, gérants et commissaires 4550 - payable + other Direction 4551 - payable + other Employés 4552 - payable + other Ouvriers 4553 - payable + other @@ -3927,21 +3933,21 @@ Direction 4560 - payable + other Employés 4561 - payable + other Ouvriers 4562 - payable + other @@ -3955,21 +3961,21 @@ Provision pour gratifications de fin d'année 4590 - payable + other Départs de personnel 4591 - payable + other Oppositions sur rémunérations 4592 - payable + other @@ -3983,49 +3989,49 @@ Assurance loi 45930 - payable + other Assurance salaire garanti 45931 - payable + other Assurance groupe 45932 - payable + other Assurances individuelles 45933 - payable + other Caisse d'assurances sociales pour travailleurs indépendants 4594 - payable + other Dettes et provisions sociales diverses 4597 - payable + other ACOMPTES RECUS SUR COMMANDES 46 - payable + other @@ -4039,28 +4045,28 @@ Dividendes et tantièmes d'exercices antérieurs 470 - payable + other Dividendes de l'exercice 471 - payable + other Tantièmes de l'exercice 472 - payable + other Autres allocataires 473 - payable + other @@ -4074,49 +4080,49 @@ Obligations et coupons échus 480 - payable + other Actionnaires - capital à rembourser 481 - payable + other Participation du personnel à payer 482 - payable + other Acomptes reçus d'autres tiers à moins d'un an 483 - payable + other Emballages et matériel consignés 486 - payable + other Cautionnements reçus en numéraires 488 - payable + other Autres dettes diverses 489 - payable + other @@ -4130,7 +4136,7 @@ Charges à reporter 490 - payable + other @@ -4151,21 +4157,21 @@ Ristournes, rabais à obtenir 49100 - payable + other Commissions à obtenir 49101 - payable + other Autres produits d'exploitation 49102 - payable + other @@ -4179,21 +4185,21 @@ Intérêts courus et non échus sur prêts et débits 49110 - payable + other Autres produits financiers 49111 - payable + other Charges à imputer 492 - payable + other @@ -4207,14 +4213,14 @@ Produits d'exploitation à reporter 4930 - payable + other Produits financiers à reporter 4931 - payable + other @@ -4228,21 +4234,21 @@ Compte d'attente 4990 - payable + other Compte de répartition périodique des charges 4991 - payable + other Transferts d'exercice 4999 - payable + other diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index d6ff8a0236f..89344a930eb 100755 --- a/addons/sale_layout/sale_layout.py +++ b/addons/sale_layout/sale_layout.py @@ -113,7 +113,7 @@ class sale_order_line(osv.osv): ('line', 'Separator Line'), ('break', 'Page Break'),] ,'Layout Type', select=True, required=True), - 'sequence': fields.integer('Sequence Number'), + 'sequence': fields.integer('Layout Sequence'), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)), 'product_uom': fields.many2one('product.uom', 'Product UoM'), @@ -156,4 +156,4 @@ class sale_order(osv.osv): sale_order() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml index 03ec9f73c78..af901928037 100755 --- a/addons/sale_layout/sale_layout_view.xml +++ b/addons/sale_layout/sale_layout_view.xml @@ -4,18 +4,6 @@ [('layout_type','=', 'article')] - - sale.order.line.form2.inherit_1 - sale.order.line - - form - - - - - - - sale.order.form.inherit_1 @@ -26,7 +14,7 @@ -
+