diff --git a/addons/account/account.py b/addons/account/account.py index 39e680fa414..b19ad71602e 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -623,7 +623,7 @@ class account_journal(osv.osv): 'currency': fields.many2one('res.currency', 'Currency', help='The currency used to enter statement'), 'entry_posted': fields.boolean('Skip \'Draft\' State for Manual Entries', help='Check this box if you don\'t want new journal entries to pass through the \'draft\' state and instead goes directly to the \'posted state\' without any manual validation. \nNote that journal entries that are automatically created by the system are always skipping that state.'), 'company_id': fields.many2one('res.company', 'Company', required=True, select=1, help="Company related to this journal"), - 'allow_date':fields.boolean('Check Date not in the Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'), + 'allow_date':fields.boolean('Check Date in Period', help= 'If set to True then do not accept the entry if the entry date is not into the period dates'), } _defaults = { diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 06a3d8c44e9..e0b0fb3de58 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -588,10 +588,18 @@ class account_move_line(osv.osv): return False return True + def _check_date(self, cr, uid, ids, context=None): + for l in self.browse(cr, uid, ids, context=context): + if l.journal_id.allow_date: + if not time.strptime(l.date[:10],'%Y-%m-%d') >= time.strptime(l.period_id.date_start, '%Y-%m-%d') or not time.strptime(l.date[:10], '%Y-%m-%d') <= time.strptime(l.period_id.date_stop, '%Y-%m-%d'): + return False + return True + _constraints = [ (_check_no_view, 'You can not create move line on view account.', ['account_id']), (_check_no_closed, 'You can not create move line on closed account.', ['account_id']), (_check_company_id, 'Company must be same for its related account and period.',['company_id'] ), + (_check_date, 'The date of your Journal Entry is not in the defined period!',['date'] ), ] #TODO: ONCHANGE_ACCOUNT_ID: set account_tax_id @@ -1098,35 +1106,6 @@ class account_move_line(osv.osv): move_obj.validate(cr, uid, move_ids, context=context) return result - def _check_date(self, cr, uid, vals, context=None, check=True): - if context is None: - context = {} - move_obj = self.pool.get('account.move') - journal_obj = self.pool.get('account.journal') - period_obj = self.pool.get('account.period') - journal_id = False - if 'date' in vals.keys(): - if 'journal_id' in vals and 'journal_id' not in context: - journal_id = vals['journal_id'] - if 'period_id' in vals and 'period_id' not in context: - period_id = vals['period_id'] - elif 'journal_id' not in context and 'move_id' in vals: - if vals.get('move_id', False): - m = move_obj.browse(cr, uid, vals['move_id']) - journal_id = m.journal_id.id - period_id = m.period_id.id - else: - journal_id = context.get('journal_id', False) - period_id = context.get('period_id', False) - if journal_id: - journal = journal_obj.browse(cr, uid, journal_id, context=context) - if journal.allow_date and period_id: - period = period_obj.browse(cr, uid, period_id, context=context) - if not time.strptime(vals['date'][:10],'%Y-%m-%d') >= time.strptime(period.date_start, '%Y-%m-%d') or not time.strptime(vals['date'][:10], '%Y-%m-%d') <= time.strptime(period.date_stop, '%Y-%m-%d'): - raise osv.except_osv(_('Error'),_('The date of your Journal Entry is not in the defined period!')) - else: - return True - def write(self, cr, uid, ids, vals, context=None, check=True, update_check=True): if context is None: context={} @@ -1137,7 +1116,6 @@ class account_move_line(osv.osv): ids = [ids] if vals.get('account_tax_id', False): raise osv.except_osv(_('Unable to change tax !'), _('You can not change the tax, you should remove and recreate lines !')) - self._check_date(cr, uid, vals, context, check) if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']: raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!')) if update_check: @@ -1221,7 +1199,6 @@ class account_move_line(osv.osv): company_id = self.pool.get('account.move').read(cr, uid, vals['move_id'], ['company_id']).get('company_id', False) if company_id: vals['company_id'] = company_id[0] - self._check_date(cr, uid, vals, context, check) if ('account_id' in vals) and not account_obj.read(cr, uid, vals['account_id'], ['active'])['active']: raise osv.except_osv(_('Bad account!'), _('You can not use an inactive account!')) if 'journal_id' in vals: @@ -1232,7 +1209,6 @@ class account_move_line(osv.osv): m = move_obj.browse(cr, uid, vals['move_id']) context['journal_id'] = m.journal_id.id context['period_id'] = m.period_id.id - self._update_journal_check(cr, uid, context['journal_id'], context['period_id'], context) move_id = vals.get('move_id', False) journal = journal_obj.browse(cr, uid, context['journal_id'], context=context) diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 382fabf09fa..9f6997dd496 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -451,8 +451,6 @@ msgstr "" #: field:account.move.bank.reconcile,journal_id:0 #: view:account.move.line:0 #: field:account.move.line,journal_id:0 -#: report:account.third_party_ledger:0 -#: report:account.third_party_ledger_other:0 #: code:addons/account/account_move_line.py:983 #: view:analytic.entries.report:0 #: field:analytic.entries.report,journal_id:0 @@ -1071,6 +1069,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.tax.code.entries:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 @@ -1258,6 +1257,16 @@ msgstr "" #: selection:account.partner.balance,display_partner:0 #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "With balance is not equal to 0" msgstr "" @@ -1980,6 +1989,9 @@ msgstr "" #. module: account #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 + msgid "Entries Sorted By" msgstr "" @@ -2001,11 +2013,16 @@ msgstr "" #. module: account #: report:account.account.balance:0 #: report:account.central.journal:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: view:account.entries.report:0 #: field:account.entries.report,fiscalyear_id:0 #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2305,6 +2322,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.overdue:0 #: report:account.third_party_ledger:0 @@ -2537,6 +2555,8 @@ msgstr "" #. module: account #: view:account.pl.report:0 #: model:ir.ui.menu,name:account.menu_account_pl_report +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Profit And Loss" msgstr "" @@ -2786,7 +2806,6 @@ msgstr "" #: report:account.general.journal:0 #: field:account.general.journal,journal_ids:0 #: view:account.journal.period:0 -#: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 #: field:account.partner.ledger,journal_ids:0 #: field:account.pl.report,journal_ids:0 @@ -2800,6 +2819,17 @@ msgstr "" #: model:ir.ui.menu,name:account.menu_action_account_journal_form #: model:ir.ui.menu,name:account.menu_journals #: model:ir.ui.menu,name:account.menu_journals_report +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.central.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Journals" msgstr "" @@ -3001,6 +3031,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Counterpart" msgstr "" @@ -3477,11 +3508,10 @@ msgid "Analytic Balance" msgstr "" #. module: account -#: code:addons/account/report/account_balance_sheet.py:76 -#: code:addons/account/report/account_balance_sheet.py:122 -#: code:addons/account/report/account_profit_loss.py:76 -#: code:addons/account/report/account_profit_loss.py:124 -#, python-format +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Net Loss" msgstr "" @@ -4267,7 +4297,6 @@ msgid "Analytic Balance -" msgstr "" #. module: account -#: report:account.account.balance:0 #: field:account.aged.trial.balance,target_move:0 #: field:account.balance.report,target_move:0 #: field:account.bs.report,target_move:0 @@ -4280,10 +4309,8 @@ msgstr "" #: field:account.common.report,target_move:0 #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 -#: report:account.partner.balance:0 #: field:account.partner.balance,target_move:0 #: field:account.partner.ledger,target_move:0 #: field:account.pl.report,target_move:0 @@ -4293,6 +4320,16 @@ msgstr "" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: field:account.vat.declaration,target_move:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Target Moves" msgstr "" @@ -4408,6 +4445,8 @@ msgstr "" #: view:account.bs.report:0 #: model:ir.actions.act_window,name:account.action_account_bs_report #: model:ir.ui.menu,name:account.menu_account_bs_report +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 msgid "Balance Sheet" msgstr "" @@ -5081,6 +5120,19 @@ msgstr "" #. module: account #: code:addons/account/report/common_report_header.py:100 #, python-format +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +#: report:account.vat.declaration:0 msgid "No Filter" msgstr "" @@ -5938,6 +5990,7 @@ msgstr "" #. module: account #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.report.general.ledger:0 #: model:ir.actions.act_window,name:account.action_account_general_ledger_menu #: model:ir.actions.report.xml,name:account.account_general_ledger @@ -6756,6 +6809,7 @@ msgstr "" #: view:account.entries.report:0 #: field:account.entries.report,partner_id:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: view:account.invoice:0 #: field:account.invoice,partner_id:0 #: field:account.invoice.line,partner_id:0 @@ -6997,6 +7051,19 @@ msgstr "" #: field:account.tax.chart,period_id:0 #: code:addons/account/account_move_line.py:982 #: field:validate.account.move,period_id:0 +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +#: report:account.vat.declaration:0 #, python-format msgid "Period" msgstr "" @@ -7068,11 +7135,17 @@ msgid "Company Currency" msgstr "" #. module: account -#: report:account.general.ledger:0 +#: report:account.account.balance:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 -msgid "Chart of Account" +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +msgid "Chart of Accounts" msgstr "" #. module: account @@ -7181,6 +7254,12 @@ msgstr "" #: report:account.central.journal:0 #: report:account.general.journal:0 #: report:account.partner.balance:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Filter By" msgstr "" @@ -7405,6 +7484,7 @@ msgstr "" #: field:account.entries.report,currency_id:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: field:account.invoice,currency_id:0 #: field:account.invoice.report,currency_id:0 #: field:account.journal,currency:0 @@ -7658,12 +7738,17 @@ msgstr "" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Start Period" msgstr "" @@ -7775,7 +7860,12 @@ msgstr "" #: report:account.central.journal:0 #: field:account.entries.report,balance:0 #: report:account.general.journal:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -7794,6 +7884,15 @@ msgstr "" #. module: account #: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Display Account" msgstr "" @@ -7991,12 +8090,17 @@ msgstr "" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "End Period" msgstr "" @@ -8186,6 +8290,7 @@ msgstr "" #: field:account.entries.report,credit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,credit:0 #: field:account.move.line,credit:0 @@ -8262,6 +8367,18 @@ msgstr "" #: selection:account.pl.report,filter:0 #: selection:account.print.journal,filter:0 #: selection:account.report.general.ledger,filter:0 +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: report:account.vat.declaration:0 #: view:account.vat.declaration:0 #: selection:account.vat.declaration,filter:0 @@ -8463,13 +8580,10 @@ msgid "Tax Source" msgstr "" #. module: account -#: code:addons/account/report/account_balance_sheet.py:71 -#: code:addons/account/report/account_balance_sheet.py:116 -#: code:addons/account/report/account_balance_sheet.py:119 -#: code:addons/account/report/account_balance_sheet.py:120 -#: code:addons/account/report/account_profit_loss.py:71 -#: code:addons/account/report/account_profit_loss.py:127 -#, python-format +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Net Profit" msgstr "" @@ -8493,7 +8607,7 @@ msgstr "" #: report:account.general.ledger:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 -msgid "JNRL" +msgid "JRNL" msgstr "" #. module: account @@ -8695,6 +8809,7 @@ msgstr "" #: field:account.entries.report,debit:0 #: report:account.general.journal:0 #: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.model.line,debit:0 #: field:account.move.line,debit:0 @@ -8764,6 +8879,16 @@ msgstr "" #: selection:account.common.account.report,display_account:0 #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "With movements" msgstr "" @@ -9115,3 +9240,14 @@ msgstr "" msgid "The residual amount on a receivable or payable of a journal entry expressed in its currency (maybe different of the company currency)." msgstr "" +#. module: account +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +msgid "Assets" +msgstr "" + +#. module: account +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +msgid "Liabilities" +msgstr "" \ No newline at end of file diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index 8ef4509a658..7b383c2e421 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -1435,6 +1435,16 @@ msgstr "Vous ne pouvez pas utiliser ce compte général dans ce journal !" #: selection:account.partner.balance,display_partner:0 #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "With balance is not equal to 0" msgstr "Avec la balance qui n'est pas égale à 0" @@ -2251,6 +2261,8 @@ msgstr "Propriétés des comptes" #: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.print.journal,sort_selection:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 msgid "Entries Sorted By" msgstr "Écritures triées par" @@ -2272,12 +2284,16 @@ msgstr "Modèle de produit" #. module: account #: report:account.account.balance:0 #: report:account.central.journal:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: view:account.entries.report:0 #: field:account.entries.report,fiscalyear_id:0 #: field:account.fiscalyear,name:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 -#: report:account.general.ledger_landscape:0 #: field:account.journal.period,fiscalyear_id:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 @@ -2887,8 +2903,10 @@ msgstr "Comptabilité financière" #. module: account #: view:account.pl.report:0 #: model:ir.ui.menu,name:account.menu_account_pl_report +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Profit And Loss" -msgstr "Pertes et profits" +msgstr "Compte de résultat" #. module: account #: view:account.fiscal.position:0 @@ -3168,7 +3186,6 @@ msgstr "Laisser vide pour utiliser le compte de dépense" #: field:account.general.journal,journal_ids:0 #: report:account.general.ledger_landscape:0 #: view:account.journal.period:0 -#: report:account.partner.balance:0 #: field:account.partner.balance,journal_ids:0 #: field:account.partner.ledger,journal_ids:0 #: field:account.pl.report,journal_ids:0 @@ -3182,6 +3199,17 @@ msgstr "Laisser vide pour utiliser le compte de dépense" #: model:ir.ui.menu,name:account.menu_action_account_journal_form #: model:ir.ui.menu,name:account.menu_journals #: model:ir.ui.menu,name:account.menu_journals_report +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.central.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Journals" msgstr "Journaux" @@ -3920,11 +3948,10 @@ msgid "Analytic Balance" msgstr "Balance analytique" #. module: account -#: code:addons/account/report/account_balance_sheet.py:76 -#: code:addons/account/report/account_balance_sheet.py:122 -#: code:addons/account/report/account_profit_loss.py:76 -#: code:addons/account/report/account_profit_loss.py:124 -#, python-format +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Net Loss" msgstr "Perte nette" @@ -4776,7 +4803,6 @@ msgid "Analytic Balance -" msgstr "Balance Analytique -" #. module: account -#: report:account.account.balance:0 #: field:account.aged.trial.balance,target_move:0 #: field:account.balance.report,target_move:0 #: field:account.bs.report,target_move:0 @@ -4789,11 +4815,8 @@ msgstr "Balance Analytique -" #: field:account.common.report,target_move:0 #: report:account.general.journal:0 #: field:account.general.journal,target_move:0 -#: report:account.general.ledger:0 -#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: field:account.move.journal,target_move:0 -#: report:account.partner.balance:0 #: field:account.partner.balance,target_move:0 #: field:account.partner.ledger,target_move:0 #: field:account.pl.report,target_move:0 @@ -4803,11 +4826,16 @@ msgstr "Balance Analytique -" #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: field:account.vat.declaration,target_move:0 -#: report:account.balancesheet.horizontal:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 #: report:account.balancesheet:0 -#: report:pl.account.horizontal:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:pl.account:0 -#: report:account.aged_trial_balance:0 +#: report:pl.account.horizontal:0 msgid "Target Moves" msgstr "Mouvements Cibles" @@ -4924,8 +4952,8 @@ msgstr "Résultat du lettrage" #: view:account.bs.report:0 #: model:ir.actions.act_window,name:account.action_account_bs_report #: model:ir.ui.menu,name:account.menu_account_bs_report -#: report:account.balancesheet.horizontal:0 #: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 msgid "Balance Sheet" msgstr "Bilan" @@ -5642,6 +5670,16 @@ msgstr "La nouvelle devise n'est pas correctement paramétrée !" #: field:account.print.journal,filter:0 #: field:account.report.general.ledger,filter:0 #: field:account.vat.declaration,filter:0 +#: field:account.account.balance,filter:0 +#: field:account.central.journal,filter:0 +#: field:account.general.journal,filter:0 +#: field:account.partner.balance,filter:0 +#: field:account.balancesheet,filter:0 +#: field:account.balancesheet.horizontal,filter:0 +#: field:account.general.ledger,filter:0 +#: field:account.general.ledger_landscape,filter:0 +#: field:pl.account,filter:0 +#: field:pl.account.horizontal,filter:0 msgid "Filter by" msgstr "Filtrer par" @@ -5673,6 +5711,19 @@ msgstr "Journal général de comptabilité" #. module: account #: code:addons/account/report/common_report_header.py:100 #, python-format +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +#: report:account.vat.declaration:0 msgid "No Filter" msgstr "Pas de filtre" @@ -7925,6 +7976,19 @@ msgstr "Gestion de la comptabilité et des finances" #: field:account.tax.chart,period_id:0 #: code:addons/account/account_move_line.py:982 #: field:validate.account.move,period_id:0 +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 +#: report:account.vat.declaration:0 #, python-format msgid "Period" msgstr "Période" @@ -8021,16 +8085,17 @@ msgid "Company Currency" msgstr "Devise société" #. module: account -#: report:account.general.ledger:0 +#: report:account.account.balance:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 -#: report:account.balancesheet.horizontal:0 #: report:account.balancesheet:0 -#: report:pl.account.horizontal:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:pl.account:0 -#: report:account.aged_trial_balance:0 -msgid "Chart of Account" +#: report:pl.account.horizontal:0 +msgid "Chart of Accounts" msgstr "Plan comptable" #. module: account @@ -8151,10 +8216,12 @@ msgstr "Journal d'avoirs" #: report:account.general.journal:0 #: report:account.general.ledger_landscape:0 #: report:account.partner.balance:0 -#: report:account.balancesheet.horizontal:0 #: report:account.balancesheet:0 -#: report:pl.account.horizontal:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Filter By" msgstr "Filtré par" @@ -8724,15 +8791,19 @@ msgstr "Gestion des suivis" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 -#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Start Period" -msgstr "Démarrer la période" +msgstr "Période de début" #. module: account #: code:addons/account/account.py:2357 @@ -8859,8 +8930,12 @@ msgstr "Laisser vide pour utiliser le compte de revenu" #: report:account.central.journal:0 #: field:account.entries.report,balance:0 #: report:account.general.journal:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 #: report:account.general.ledger:0 #: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: field:account.move.line,balance:0 #: report:account.partner.balance:0 #: selection:account.payment.term.line,value:0 @@ -8874,7 +8949,7 @@ msgstr "Laisser vide pour utiliser le compte de revenu" #: report:pl.account.horizontal:0 #: report:pl.account:0 msgid "Balance" -msgstr "Solde de la balance" +msgstr "Balance" #. module: account #: model:process.node,note:account.process_node_supplierbankstatement0 @@ -8883,11 +8958,15 @@ msgstr "Saisi manuellement ou automatiquement dans le système" #. module: account #: report:account.account.balance:0 -#: report:account.general.ledger_landscape:0 -#: report:account.balancesheet.horizontal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 #: report:account.balancesheet:0 -#: report:pl.account.horizontal:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 #: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Display Account" msgstr "Afficher le compte" @@ -9116,15 +9195,19 @@ msgstr "Solde analytique" #: report:account.account.balance:0 #: report:account.central.journal:0 #: report:account.general.journal:0 -#: report:account.general.ledger:0 -#: report:account.general.ledger_landscape:0 #: report:account.journal.period.print:0 #: report:account.partner.balance:0 #: report:account.third_party_ledger:0 #: report:account.third_party_ledger_other:0 #: report:account.vat.declaration:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "End Period" -msgstr "Fin de période" +msgstr "Période de fin" #. module: account #: field:account.aged.trial.balance,chart_account_id:0 @@ -9429,6 +9512,18 @@ msgstr "Général" #: selection:account.pl.report,filter:0 #: selection:account.print.journal,filter:0 #: selection:account.report.general.ledger,filter:0 +#: report:account.account.balance:0 +#: report:account.central.journal:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.journal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 #: report:account.vat.declaration:0 #: view:account.vat.declaration:0 #: selection:account.vat.declaration,filter:0 @@ -9647,13 +9742,10 @@ msgid "Tax Source" msgstr "Base de la taxe" #. module: account -#: code:addons/account/report/account_balance_sheet.py:71 -#: code:addons/account/report/account_balance_sheet.py:116 -#: code:addons/account/report/account_balance_sheet.py:119 -#: code:addons/account/report/account_balance_sheet.py:120 -#: code:addons/account/report/account_profit_loss.py:71 -#: code:addons/account/report/account_profit_loss.py:127 -#, python-format +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "Net Profit" msgstr "Profit net" @@ -9973,6 +10065,16 @@ msgstr "" #: selection:account.common.account.report,display_account:0 #: selection:account.pl.report,display_account:0 #: selection:account.report.general.ledger,display_account:0 +#: report:account.account.balance:0 +#: report:account.partner.balance:0 +#: report:account.third_party_ledger:0 +#: report:account.third_party_ledger_other:0 +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +#: report:account.general.ledger:0 +#: report:account.general.ledger_landscape:0 +#: report:pl.account:0 +#: report:pl.account.horizontal:0 msgid "With movements" msgstr "Avec mouvements" @@ -10365,6 +10467,24 @@ msgstr "" "exprimée dans la devise du journal (si elle est différente de la devise de " "la société)" +#. module: account +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +msgid "Assets" +msgstr "Actif" + +#. module: account +#: report:account.balancesheet:0 +#: report:account.balancesheet.horizontal:0 +msgid "Liabilities" +msgstr "Passif" + +#~ msgid "Keep empty to use the period of the validation date." +#~ msgstr "Laissez vide pour utiliser la période de la date de validation" + +#~ msgid "Error! You can not create recursive account." +#~ msgstr "Erreur! Vous ne pouvez pas créer de comptes récursifs" + #~ msgid "Aged Trial Balance" #~ msgstr "Balance Agée" diff --git a/addons/account/report/account_aged_partner_balance.rml b/addons/account/report/account_aged_partner_balance.rml index c76aba31763..ace66af0584 100644 --- a/addons/account/report/account_aged_partner_balance.rml +++ b/addons/account/report/account_aged_partner_balance.rml @@ -112,7 +112,7 @@ - Chart of Account + Chart of Accounts Fiscal Year diff --git a/addons/account/report/account_balance.rml b/addons/account/report/account_balance.rml index 3d971862bdc..fac964eb46d 100644 --- a/addons/account/report/account_balance.rml +++ b/addons/account/report/account_balance.rml @@ -212,7 +212,7 @@ [[ data['model']=='account.account' and 'Company'or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year diff --git a/addons/account/report/account_balance_sheet.rml b/addons/account/report/account_balance_sheet.rml index 205bfff497b..8b9f6d1b5a3 100644 --- a/addons/account/report/account_balance_sheet.rml +++ b/addons/account/report/account_balance_sheet.rml @@ -172,9 +172,9 @@ - Chart of Account + Chart of Accounts Fiscal Year - Filter By [[ get_filter(data)!='No Filter' and '' or removeParentNode('font') ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account Target Moves diff --git a/addons/account/report/account_balance_sheet_horizontal.rml b/addons/account/report/account_balance_sheet_horizontal.rml index 7e4f9f844a5..d9f0bcba6a7 100644 --- a/addons/account/report/account_balance_sheet_horizontal.rml +++ b/addons/account/report/account_balance_sheet_horizontal.rml @@ -132,7 +132,7 @@ - Chart of Account + Chart of Accounts Fiscal Year Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account @@ -196,28 +196,40 @@ - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code1'] ]] + + [[ repeatIn(get_lines(),'a' ) ]] [[ a['code1'] ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + - [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] + + [[ '. '*(a['level1']-1) ]][[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name1'] ]] + - [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a['balance1']) ]] [[ company.currency_id.symbol ]] + + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[ formatLang(a['balance1']) ]] [[ company.currency_id.symbol ]] + - [[ repeatIn(get_lines(), 'a') ]] [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['code'] ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] + + [[ a['code'] ]][[ ( a['level']<4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + - [[ '. '*(a['level']-1) ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]][[ a['name'] ]][[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Bold_9'}) or removeParentNode('font') ]] + + [[ '. '*(a['level']-1) ]] + [[ (a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) and a['name']!='Net Profit') or removeParentNode('font') ]][[ a['name'] ]] + - [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] -[[ a['name']=='Net Profit' and setTag('para','para',{'style':'terp_default_Right_9_Bold'}) or removeParentNode('font') ]] - [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]] + + [[ ( a['level']<4 or a['name']=='Net Profit') and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]] + [[(a['code'] and a['name']) and formatLang(a['balance']) or removeParentNode('font')]] [[ company.currency_id.symbol ]] + - - - + + + Balance: diff --git a/addons/account/report/account_central_journal.rml b/addons/account/report/account_central_journal.rml index 33566083652..fe064132cbc 100644 --- a/addons/account/report/account_central_journal.rml +++ b/addons/account/report/account_central_journal.rml @@ -235,8 +235,7 @@ - [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + Chart of Accounts Fiscal Year Journal Filter By [[get_filter(data)!='No Filter' and get_filter(data) ]] diff --git a/addons/account/report/account_general_journal.rml b/addons/account/report/account_general_journal.rml index f4cc13069c8..6424a24f8aa 100644 --- a/addons/account/report/account_general_journal.rml +++ b/addons/account/report/account_general_journal.rml @@ -221,7 +221,7 @@ [[ data['model']=='account.journal.period' and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year Journals Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index 15614444822..7a8454d714a 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -270,7 +270,7 @@ Date - JNRL + JRNL Partner @@ -304,7 +304,7 @@ Date - JNRL + JRNL Partner @@ -344,16 +344,16 @@ - Chart of Account + Chart of Accounts Fiscal Year - Journal + Journals - Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] + Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Target Moves @@ -431,7 +431,7 @@ Date - JNRL + JRNL Partner @@ -530,7 +530,7 @@ Date - JNRL + JRNL Partner diff --git a/addons/account/report/account_general_ledger_landscape.rml b/addons/account/report/account_general_ledger_landscape.rml index ac100c3ecd0..96a78b5fd9b 100644 --- a/addons/account/report/account_general_ledger_landscape.rml +++ b/addons/account/report/account_general_ledger_landscape.rml @@ -361,7 +361,7 @@ [[ data['model']=='account.account' and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year diff --git a/addons/account/report/account_journal.rml b/addons/account/report/account_journal.rml index 9b0ac55bb56..3825eb58d76 100644 --- a/addons/account/report/account_journal.rml +++ b/addons/account/report/account_journal.rml @@ -186,7 +186,7 @@ [[ data['model']=='account.journal.period'and 'Company' or removeParentNode('para') ]] - [[ data['model']=='ir.ui.menu' and 'Chart of Account' or removeParentNode('para') ]] + [[ data['model']=='ir.ui.menu' and 'Chart of Accounts' or removeParentNode('para') ]] Fiscal Year Journal Filters By diff --git a/addons/account/report/account_partner_balance.rml b/addons/account/report/account_partner_balance.rml index 6425d6a4db6..baf43435a44 100644 --- a/addons/account/report/account_partner_balance.rml +++ b/addons/account/report/account_partner_balance.rml @@ -184,7 +184,7 @@ - Chart of Account + Chart of Accounts Fiscal Year Journals Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] diff --git a/addons/account/report/account_partner_ledger.rml b/addons/account/report/account_partner_ledger.rml index c1ef9b22502..b1fc8ae712f 100644 --- a/addons/account/report/account_partner_ledger.rml +++ b/addons/account/report/account_partner_ledger.rml @@ -280,7 +280,7 @@ Date - JNRL + JRNL Ref @@ -308,7 +308,7 @@ Date - JNRL + JRNL Ref @@ -346,13 +346,13 @@ - Chart of Account + Chart of Accounts Fiscal Year - Journal + Journals Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]] @@ -443,7 +443,7 @@ Date - JNRL + JRNL Ref @@ -544,7 +544,7 @@ Date - JNRL + JRNL Ref diff --git a/addons/account/report/account_partner_ledger_other.rml b/addons/account/report/account_partner_ledger_other.rml index 2f58fc8ec95..7c134270c5c 100644 --- a/addons/account/report/account_partner_ledger_other.rml +++ b/addons/account/report/account_partner_ledger_other.rml @@ -281,7 +281,7 @@ Date - JNRL + JRNL Ref @@ -310,7 +310,7 @@ Date - JNRL + JRNL Ref @@ -347,13 +347,13 @@ - Chart of Account + Chart of Accounts Fiscal Year - Journal + Journals Filters By [[ data['form']['filter'] not in ('filter_no','unreconciled') and get_filter(data) ]] @@ -441,7 +441,7 @@ Date - JNRL + JRNL Ref @@ -546,7 +546,7 @@ Date - JNRL + JRNL Ref diff --git a/addons/account/report/account_profit_horizontal.rml b/addons/account/report/account_profit_horizontal.rml index 6c70bb47310..bf19d0b61fc 100644 --- a/addons/account/report/account_profit_horizontal.rml +++ b/addons/account/report/account_profit_horizontal.rml @@ -149,7 +149,7 @@ [[ get_data(data) or removeParentNode('para')]] - Chart of Account + Chart of Accounts Fiscal Year Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account @@ -193,7 +193,7 @@ Code - Particular + Expenses Balance @@ -202,7 +202,7 @@ Code - Particular + Income Balance @@ -212,7 +212,7 @@ - [[ repeatIn(get_lines(),'a' ) ]] [[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] + [[ repeatIn(get_lines(),'a' ) ]] [[ a['code'] ]][[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Bold_9'})) or removeParentNode('font') ]] @@ -234,7 +234,7 @@ - [[ a['level']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] + [[ a['level1']<4 and ( setTag('para','para',{'style':'terp_default_Right_9_Bold'})) or removeParentNode('font') ]][[(a['code1'] and a['name1']) and formatLang(abs(a['balance1'])) or removeParentNode('font') ]] [[ company.currency_id.symbol ]] diff --git a/addons/account/report/account_profit_loss.rml b/addons/account/report/account_profit_loss.rml index 2b29f479478..f0c549e7412 100644 --- a/addons/account/report/account_profit_loss.rml +++ b/addons/account/report/account_profit_loss.rml @@ -172,7 +172,7 @@ - Chart of Account + Chart of Accounts Fiscal Year Filter By [[ get_filter(data)!='No Filter' and get_filter(data) ]] Display Account diff --git a/addons/account/report/common_report_header.py b/addons/account/report/common_report_header.py index 48e26e839d3..5769248405f 100644 --- a/addons/account/report/common_report_header.py +++ b/addons/account/report/common_report_header.py @@ -94,10 +94,10 @@ class common_report_header(object): def _get_filter(self, data): if data.get('form', False) and data['form'].get('filter', False): if data['form']['filter'] == 'filter_date': - return _('Date') + return 'Date' elif data['form']['filter'] == 'filter_period': - return _('Periods') - return _('No Filter') + return 'Periods' + return 'No Filter' def _sum_debit_period(self, period_id, journal_id=None): journals = journal_id or self.journal_ids diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py index 3a4e10740ec..bacd29f1607 100644 --- a/addons/account_asset/account_asset.py +++ b/addons/account_asset/account_asset.py @@ -112,6 +112,12 @@ class account_asset_asset(osv.osv): amount = (amount_to_depr / asset.method_number) / total_days * (total_days - days) elif asset.method == 'degressive': amount = residual_amount * asset.method_progress_factor + if asset.prorata: + days = total_days - float(depreciation_date.strftime('%j')) + if i == 1: + amount = (residual_amount * asset.method_progress_factor) / total_days * days + elif i == undone_dotation_number: + amount = (residual_amount * asset.method_progress_factor) / total_days * (total_days - days) return amount def _compute_board_undone_dotation_nb(self, cr, uid, asset, depreciation_date, total_days, context=None): @@ -242,13 +248,13 @@ class account_asset_asset(osv.osv): def _check_prorata(self, cr, uid, ids, context=None): for asset in self.browse(cr, uid, ids, context=context): - if asset.prorata and (asset.method != 'linear' or asset.method_time != 'number'): + if asset.prorata and asset.method_time != 'number': return False return True _constraints = [ (_check_recursion, 'Error ! You can not create recursive assets.', ['parent_id']), - (_check_prorata, 'Prorata temporis can be applied only for computation method "linear" and time method "number of depreciations".', ['prorata']), + (_check_prorata, 'Prorata temporis can be applied only for time method "number of depreciations".', ['prorata']), ] def onchange_category_id(self, cr, uid, ids, category_id, context=None): @@ -267,9 +273,9 @@ class account_asset_asset(osv.osv): } return res - def onchange_method_time(self, cr, uid, ids, method='linear', method_time='number', context=None): + def onchange_method_time(self, cr, uid, ids, method_time='number', context=None): res = {'value': {}} - if method != 'linear' or method_time != 'number': + if method_time != 'number': res['value'] = {'prorata': False} return res diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index f9bbf551330..1cf76e5c6b5 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -29,7 +29,7 @@ - + @@ -109,9 +109,9 @@ - + - + diff --git a/addons/base_action_rule/i18n/sl.po b/addons/base_action_rule/i18n/sl.po new file mode 100644 index 00000000000..a61482c4783 --- /dev/null +++ b/addons/base_action_rule/i18n/sl.po @@ -0,0 +1,505 @@ +# Slovenian translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2011-09-15 06:14+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Slovenian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-09-16 04:36+0000\n" +"X-Generator: Launchpad (build 13955)\n" + +#. module: base_action_rule +#: help:base.action.rule,act_mail_to_user:0 +msgid "" +"Check this if you want the rule to send an email to the responsible person." +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_remind_partner:0 +msgid "Remind Partner" +msgstr "Opomni partnerja" + +#. module: base_action_rule +#: field:base.action.rule,trg_partner_categ_id:0 +msgid "Partner Category" +msgstr "Kategorija partnerja" + +#. module: base_action_rule +#: field:base.action.rule,act_mail_to_watchers:0 +msgid "Mail to Watchers (CC)" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_state_to:0 +msgid "Button Pressed" +msgstr "Pritisnjeni gumb" + +#. module: base_action_rule +#: field:base.action.rule,model_id:0 +msgid "Object" +msgstr "Predmet" + +#. module: base_action_rule +#: field:base.action.rule,act_mail_to_email:0 +msgid "Mail to these Emails" +msgstr "Sporočila na te e-pošte" + +#. module: base_action_rule +#: field:base.action.rule,act_state:0 +msgid "Set State to" +msgstr "Nastavi stanje na" + +#. module: base_action_rule +#: field:base.action.rule,act_email_from:0 +msgid "Email From" +msgstr "E-pošta od" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Email Body" +msgstr "Vsebina e-pošte" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_range_type:0 +msgid "Days" +msgstr "Dnevi" + +#. module: base_action_rule +#: field:base.action.rule,last_run:0 +msgid "Last Run" +msgstr "Zadnji zagon" + +#. module: base_action_rule +#: code:addons/base_action_rule/base_action_rule.py:313 +#, python-format +msgid "Error!" +msgstr "Napaka!" + +#. module: base_action_rule +#: field:base.action.rule,act_reply_to:0 +msgid "Reply-To" +msgstr "Odgovori-na" + +#. module: base_action_rule +#: help:base.action.rule,act_email_cc:0 +msgid "" +"These people will receive a copy of the future communication between partner " +"and users by email" +msgstr "" +"Ti ljudje bodo prejeli kopijo bodočih komunikacij med partnerjem in " +"uporabniki po e-pošti" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_range_type:0 +msgid "Minutes" +msgstr "Minute" + +#. module: base_action_rule +#: field:base.action.rule,name:0 +msgid "Rule Name" +msgstr "Ime pravila" + +#. module: base_action_rule +#: help:base.action.rule,act_remind_partner:0 +msgid "" +"Check this if you want the rule to send a reminder by email to the partner." +msgstr "" +"Označite to, če želite da pravilo pošlje opomnik po e-pošti partnerju." + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions on Model Partner" +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "Deadline" +msgstr "Rok" + +#. module: base_action_rule +#: field:base.action.rule,trg_partner_id:0 +msgid "Partner" +msgstr "Stranka" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_subject)s = Object subject" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Email Reminders" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Special Keywords to Be Used in The Body" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_state_from:0 +msgid "State" +msgstr "" + +#. module: base_action_rule +#: model:ir.actions.act_window,help:base_action_rule.base_action_rule_act +msgid "" +"Use automated actions to automatically trigger actions for various screens. " +"Example: a lead created by a specific user may be automatically set to a " +"specific sales team, or an opportunity which still has status pending after " +"14 days might trigger an automatic reminder email." +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_mail_to_email:0 +msgid "Email-id of the persons whom mail is to be sent" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +#: model:ir.module.module,shortdesc:base_action_rule.module_meta_information +msgid "Action Rule" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Fields to Change" +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "Creation Date" +msgstr "Ustvarjeno dne" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "Last Action Date" +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_range_type:0 +msgid "Hours" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_id)s = Object ID" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Delay After Trigger Date" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_remind_attach:0 +msgid "Remind with Attachment" +msgstr "" + +#. module: base_action_rule +#: constraint:ir.cron:0 +msgid "Invalid arguments" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_user_id:0 +msgid "Set Responsible to" +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "None" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_email_to:0 +msgid "" +"Use a python expression to specify the right field on which one than we will " +"use for the 'To' field of the header" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_user_phone)s = Responsible phone" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "" +"The rule uses the AND operator. The model must match all non-empty fields so " +"that the rule executes the action described in the 'Actions' tab." +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_date_range_type:0 +msgid "Delay type" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,regex_name:0 +msgid "" +"Regular expression for matching name of the resource\n" +"e.g.: 'urgent.*' will search for records having name starting with the " +"string 'urgent'\n" +"Note: This is case sensitive search." +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_method:0 +msgid "Call Object Method" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_email_to:0 +msgid "Email To" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_mail_to_watchers:0 +msgid "" +"Check this if you want the rule to mark CC(mail to any other person defined " +"in actions)." +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(partner)s = Partner name" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Note" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_email_from:0 +msgid "" +"Use a python expression to specify the right field on which one than we will " +"use for the 'From' field of the header" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_date_range:0 +msgid "Delay after trigger date" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,trg_date_range:0 +msgid "" +"Delay After Trigger Date,specifies you can put a negative number. If you " +"need a delay before the trigger date, like sending a reminder 15 minutes " +"before a meeting." +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,active:0 +msgid "Active" +msgstr "" + +#. module: base_action_rule +#: code:addons/base_action_rule/base_action_rule.py:314 +#, python-format +msgid "No E-Mail ID Found for your Company address!" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_remind_user:0 +msgid "Remind Responsible" +msgstr "" + +#. module: base_action_rule +#: model:ir.module.module,description:base_action_rule.module_meta_information +msgid "This module allows to implement action rules for any object." +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,sequence:0 +msgid "Gives the sequence order when displaying a list of rules." +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_range_type:0 +msgid "Months" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,filter_id:0 +msgid "Filter" +msgstr "" + +#. module: base_action_rule +#: selection:base.action.rule,trg_date_type:0 +msgid "Date" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,server_action_id:0 +msgid "" +"Describes the action name.\n" +"eg:on which object which action to be taken on basis of which condition" +msgstr "" + +#. module: base_action_rule +#: model:ir.model,name:base_action_rule.model_ir_cron +msgid "ir.cron" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_description)s = Object description" +msgstr "" + +#. module: base_action_rule +#: constraint:base.action.rule:0 +msgid "Error: The mail is not well formated" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Email Actions" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Email Information" +msgstr "" + +#. module: base_action_rule +#: model:ir.model,name:base_action_rule.model_base_action_rule +msgid "Action Rules" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_mail_body:0 +msgid "Content of mail" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_user_id:0 +msgid "Responsible" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(partner_email)s = Partner Email" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_date)s = Creation date" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_user_email)s = Responsible Email" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_mail_body:0 +msgid "Mail body" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_remind_user:0 +msgid "" +"Check this if you want the rule to send a reminder by email to the user." +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Server Action to be Triggered" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_mail_to_user:0 +msgid "Mail to Responsible" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,act_email_cc:0 +msgid "Add Watchers (Cc)" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions on Model Fields" +msgstr "" + +#. module: base_action_rule +#: model:ir.actions.act_window,name:base_action_rule.base_action_rule_act +#: model:ir.ui.menu,name:base_action_rule.menu_base_action_rule_form +msgid "Automated Actions" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,server_action_id:0 +msgid "Server Action" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,regex_name:0 +msgid "Regex on Resource Name" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,act_remind_attach:0 +msgid "" +"Check this if you want that all documents attached to the object be attached " +"to the reminder email sent." +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions on Timing" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Actions" +msgstr "" + +#. module: base_action_rule +#: help:base.action.rule,active:0 +msgid "" +"If the active field is set to False, it will allow you to hide the rule " +"without removing it." +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "%(object_user)s = Responsible name" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,create_date:0 +msgid "Create Date" +msgstr "" + +#. module: base_action_rule +#: view:base.action.rule:0 +msgid "Conditions on States" +msgstr "" + +#. module: base_action_rule +#: field:base.action.rule,trg_date_type:0 +msgid "Trigger Date" +msgstr "" diff --git a/addons/base_synchro/wizard/base_synchro.py b/addons/base_synchro/wizard/base_synchro.py index 1a593684b59..bc16b558ce5 100644 --- a/addons/base_synchro/wizard/base_synchro.py +++ b/addons/base_synchro/wizard/base_synchro.py @@ -170,7 +170,7 @@ class base_synchro(osv.osv_memory): # # If not synchronized, try to find it with name_get/name_search # - names = pool_src.get(object).name_get(cr, uid, [id], context)[0][1] + names = pool_src.get(object).name_get(cr, uid, [id])[0][1] res = pool_dest.get(object).name_search(cr, uid, names, [], 'like') if res: result = res[0][0] @@ -189,7 +189,7 @@ class base_synchro(osv.osv_memory): def data_transform(self, cr, uid, pool_src, pool_dest, object, data, action='u', context=None): self.meta.setdefault(pool_src, {}) if not object in self.meta[pool_src]: - self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid, context) + self.meta[pool_src][object] = pool_src.get(object).fields_get(cr, uid) fields = self.meta[pool_src][object] for f in fields: diff --git a/addons/base_synchro/wizard/base_synchro_view.xml b/addons/base_synchro/wizard/base_synchro_view.xml index 231fc7b055f..ccebb6145c2 100644 --- a/addons/base_synchro/wizard/base_synchro_view.xml +++ b/addons/base_synchro/wizard/base_synchro_view.xml @@ -7,6 +7,7 @@ Base Synchronization base.synchro form + 1
@@ -29,19 +30,18 @@ new - Base Synchronization base.synchro form - +