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

[MERGE] forward port of branch 7.0 up to 03df412f

This commit is contained in:
Denis Ledoux 2014-10-07 17:34:42 +02:00
parent 4202ea7c19 03df412faf
commit b13898c058
9 changed files with 1816 additions and 1183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account_bank_statement.py
View File

@ -224,7 +224,7 @@ class account_bank_statement(osv.osv):
amount_currency=amt_cur, currency_id=cur_id, analytic_id=anl_id, context=context) amount_currency=amt_cur, currency_id=cur_id, analytic_id=anl_id, context=context)
return res return res
def _get_counter_part_account(sefl, cr, uid, st_line, context=None): def _get_counter_part_account(self, cr, uid, st_line, context=None):
"""Retrieve the account to use in the counterpart move. """Retrieve the account to use in the counterpart move.
This method may be overridden to implement custom move generation (making sure to This method may be overridden to implement custom move generation (making sure to
call super() to establish a clean extension chain). call super() to establish a clean extension chain).
@ -237,7 +237,7 @@ class account_bank_statement(osv.osv):
return st_line.statement_id.journal_id.default_credit_account_id.id return st_line.statement_id.journal_id.default_credit_account_id.id
return st_line.statement_id.journal_id.default_debit_account_id.id return st_line.statement_id.journal_id.default_debit_account_id.id
def _get_counter_part_partner(sefl, cr, uid, st_line, context=None): def _get_counter_part_partner(self, cr, uid, st_line, context=None):
"""Retrieve the partner to use in the counterpart move. """Retrieve the partner to use in the counterpart move.
This method may be overridden to implement custom move generation (making sure to This method may be overridden to implement custom move generation (making sure to
call super() to establish a clean extension chain). call super() to establish a clean extension chain).

2
addons/account/account_invoice.py
View File

@ -854,7 +854,7 @@ class account_invoice(osv.osv):
raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !')) raise osv.except_osv(_('Warning!'), _('Global taxes defined, but they are not in invoice lines !'))
base = compute_taxes[key]['base'] base = compute_taxes[key]['base']
precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account') precision = self.pool.get('decimal.precision').precision_get(cr, uid, 'Account')
if float_compare(abs(base - tax.base), company_currency.rounding, precision_rounding=precision) == 1: if float_compare(abs(base - tax.base), company_currency.rounding, precision_digits=precision) == 1:
raise osv.except_osv(_('Warning!'), _('Tax base different!\nClick on compute to update the tax base.')) raise osv.except_osv(_('Warning!'), _('Tax base different!\nClick on compute to update the tax base.'))
for key in compute_taxes: for key in compute_taxes:
if not key in tax_key: if not key in tax_key:

1
addons/l10n_lu/__openerp__.py
View File

@ -41,6 +41,7 @@ This is the base module to manage the accounting chart for Luxembourg.
'data': [ 'data': [
# basic accounting data # basic accounting data
'account_financial_report.xml', 'account_financial_report.xml',
'account_financial_report_abr.xml',
'account.account.type-2011.csv', 'account.account.type-2011.csv',
'account.account.template-2011.csv', 'account.account.template-2011.csv',
'account.tax.code.template-2011.csv', 'account.tax.code.template-2011.csv',

2319
addons/l10n_lu/account.account.template-2011.csv
View File

File diff suppressed because it is too large Load Diff

635
addons/l10n_lu/account_financial_report_abr.xml Normal file
View File

@ -0,0 +1,635 @@
<openerp>
<data>
<!-- balance sheet abbreviated model (CA_BILANABR) -->
<record model="account.financial.report" id="account_financial_report_abr_13">
<field name="name">Luxembourg Balance Sheet (abbreviated)</field>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
</record>
<record model="account.financial.report" id="account_financial_report_abr_15">
<field name="name">ACTIF</field>
<field name="sequence">201</field>
<field name="style_overwrite" eval="1"/>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_13"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_16">
<field name="name">A. Capital souscrit non vers&#233;</field>
<field name="sequence">101</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_15"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_17">
<field name="name">I. Capital souscrit non appel&#233;</field>
<field name="sequence">103</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_16"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_18">
<field name="name">II. Capital souscrit appel&#233; et non vers&#233;</field>
<field name="sequence">105</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_16"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_19">
<field name="name">B. Frais d&#8217;&#233;tablissement</field>
<field name="sequence">107</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_15"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_20">
<field name="name">C. Actif immobilis&#233;</field>
<field name="sequence">109</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_15"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_21">
<field name="name">I. Immobilisations incorporelles</field>
<field name="sequence">111</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_20"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_28">
<field name="name">II. Immobilisations corporelles</field>
<field name="sequence">125</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_20"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_33">
<field name="name">III. Immobilisations financi&#232;res</field>
<field name="sequence">135</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_20"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_41">
<field name="name">D. Actif circulant</field>
<field name="sequence">151</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_15"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_42">
<field name="name">I. Stocks</field>
<field name="sequence">153</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_41"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_47">
<field name="name">II. Cr&#233;ances</field>
<field name="sequence">163</field>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_41"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_49">
<field name="name">a) dont la dur&#233;e r&#233;siduelle est inf&#233;rieure ou &#233;gale &#224; un an</field>
<field name="sequence">167</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_47"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_50">
<field name="name">b) dont la dur&#233;e r&#233;siduelle est sup&#233;rieure &#224; un an</field>
<field name="sequence">169</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_47"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_60">
<field name="name">III. Valeurs mobili&#232;res</field>
<field name="sequence">189</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_41"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_64">
<field name="name">IV. Avoirs en banques, avoirs en compte de ch&#232;ques postaux, ch&#232;ques et en caisse</field>
<field name="sequence">197</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_41"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_65">
<field name="name">E. Comptes de r&#233;gularisation</field>
<field name="sequence">199</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_15"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_66">
<field name="name">PASSIF</field>
<field name="sequence">405</field>
<field name="style_overwrite" eval="1"/>
<field name="sign" eval="-1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_13"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_67">
<field name="name">A. Capitaux propres</field>
<field name="sequence">301</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="-1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_66"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_68">
<field name="name">I. Capital souscrit</field>
<field name="sequence">303</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_69">
<field name="name">II. Primes d'&#233;missions et primes assimil&#233;es</field>
<field name="sequence">305</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_70">
<field name="name">III. R&#233;serves de r&#233;&#233;valuation</field>
<field name="sequence">307</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_71">
<field name="name">IV. R&#233;serves</field>
<field name="sequence">309</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_76">
<field name="name">V. R&#233;sultats report&#233;s</field>
<field name="sequence">319</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_77">
<field name="name">VI. R&#233;sultat de l'exercice</field>
<field name="sequence">321</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_78">
<field name="name">VII. Acomptes sur dividendes</field>
<field name="sequence">323</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_79">
<field name="name">VIII. Subventions d&#8217;investissement en capital</field>
<field name="sequence">325</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_80">
<field name="name">IX. Plus-values immunis&#233;es</field>
<field name="sequence">327</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_67"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_81">
<field name="name">B. Dettes subordonn&#233;es</field>
<field name="sequence">329</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_66"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_82">
<field name="name">C. Provisions</field>
<field name="sequence">331</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_66"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_86">
<field name="name">D. Dettes non subordonn&#233;es</field>
<field name="sequence">339</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="-1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_66"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_89">
<field name="name">a) dont la dur&#233;e r&#233;siduelle est inf&#233;rieure ou &#233;gale &#224; un an</field>
<field name="sequence">345</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_86"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_90">
<field name="name">b) dont la dur&#233;e r&#233;siduelle est sup&#233;rieure &#224; un an</field>
<field name="sequence">347</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_86"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_118">
<field name="name">E. Comptes de r&#233;gularisation</field>
<field name="sequence">403</field>
<field name="style_overwrite" eval="2"/>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_66"/>
</record>
<!-- profit and loss abbreviated model (CA_COMPPABR) -->
<record model="account.financial.report" id="account_financial_report_abr_14">
<field name="name">Luxembourg Profit &amp; Loss (abbreviated)</field>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
</record>
<!-- p&l full model (CA_COMPP) -->
<record model="account.financial.report" id="account_financial_report_abr_119">
<field name="name">A. CHARGES</field>
<field name="sequence">641</field>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_14"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_120">
<field name="name">1. &#224; 2. Charges brutes (moins B.1 &#224; B.4)</field>
<field name="sequence">601</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_122">
<field name="name">3. Frais de personnel</field>
<field name="sequence">605</field>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_123">
<field name="name">a) Salaires et traitements</field>
<field name="sequence">607</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_122"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_124">
<field name="name">b) Charges sociales couvrant les salaires et traitements</field>
<field name="sequence">609</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_122"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_125">
<field name="name">c) Pensions compl&#233;mentaires</field>
<field name="sequence">611</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_122"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_126">
<field name="name">d) Autres charges sociales</field>
<field name="sequence">613</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_122"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_127">
<field name="name">4. Corrections de valeur</field>
<field name="sequence">615</field>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_128">
<field name="name">a) sur frais d'&#233;tablissement et sur immobilisations corporelles et incorporelles</field>
<field name="sequence">617</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_127"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_129">
<field name="name">b) sur &#233;l&#233;ments de l'actif circulant</field>
<field name="sequence">619</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_127"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_130">
<field name="name">5. Autres charges d&#8217;exploitation</field>
<field name="sequence">621</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_131">
<field name="name">6. Corrections de valeur sur immobilisations financi&#232;res et ajustement de juste valeur sur immobilisations financières</field>
<field name="sequence">623</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_132">
<field name="name">7. Corrections de valeur et ajustement de juste valeur sur &#233;l&#233;ments financiers de l'actif circulant. Moins-values de cessions des valeurs mobilières</field>
<field name="sequence">625</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_133">
<field name="name">8. Int&#233;r&#234;ts et autres charges financi&#232;res</field>
<field name="sequence">627</field>
<field name="sign" eval="1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_134">
<field name="name">a) concernant des entreprises li&#233;es</field>
<field name="sequence">629</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_133"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_135">
<field name="name">b) autres int&#233;r&#234;ts et charges</field>
<field name="sequence">631</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_133"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_136">
<field name="name">9. Charges exceptionnelles</field>
<field name="sequence">633</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_137">
<field name="name">10. Imp&#244;ts sur le r&#233;sultat</field>
<field name="sequence">635</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_138">
<field name="name">11. Autres imp&#244;ts ne figurant pas sous le poste ci-dessus</field>
<field name="sequence">637</field>
<field name="sign" eval="1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_119"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_140">
<field name="name">B. PRODUITS</field>
<field name="sequence">737</field>
<field name="sign" eval="-1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_14"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_141">
<field name="name">1. &#224; 4. Produits bruts (moins A.1 et A.2)</field>
<field name="sequence">701</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_140"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_147">
<field name="name">5. Autres produits d&#8217;exploitation</field>
<field name="sequence">713</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_140"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_148">
<field name="name">6. Produits des immobilisations financi&#232;res</field>
<field name="sequence">715</field>
<field name="sign" eval="-1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_140"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_149">
<field name="name">a) provenant d&#8217;entreprises li&#233;es</field>
<field name="sequence">717</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_148"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_150">
<field name="name">b) autres produits de participations</field>
<field name="sequence">719</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_148"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_151">
<field name="name">7. Produits des &#233;l&#233;ments financiers de l'actif circulant</field>
<field name="sequence">721</field>
<field name="sign" eval="-1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_140"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_152">
<field name="name">a) provenant d&#8217;entreprises li&#233;es</field>
<field name="sequence">723</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_151"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_153">
<field name="name">b) autres produits</field>
<field name="sequence">725</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_151"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_154">
<field name="name">8. Autres int&#233;r&#234;ts et autres produits financiers</field>
<field name="sequence">727</field>
<field name="sign" eval="-1"/>
<field name="display_detail">detail_flat</field>
<field name="type">sum</field>
<field name="parent_id" ref="account_financial_report_abr_140"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_155">
<field name="name">a) provenant d&#8217;entreprises li&#233;es</field>
<field name="sequence">729</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_154"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_156">
<field name="name">b) autres int&#233;r&#234;ts et produits financiers</field>
<field name="sequence">731</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_154"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_157">
<field name="name">9. Produits exceptionnels</field>
<field name="sequence">733</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_140"/>
</record>
<record model="account.financial.report" id="account_financial_report_abr_161">
<field name="name">RESULTAT DE L'EXERCICE</field>
<field name="sequence">800</field>
<field name="sign" eval="-1"/>
<field name="display_detail">no_detail</field>
<field name="type">accounts</field>
<field name="parent_id" ref="account_financial_report_abr_14"/>
</record>
</data>
</openerp>

2
addons/product/product_view.xml
View File

@ -149,7 +149,7 @@
attrs="{'readonly': [('is_only_child', '=', False)]}" attrs="{'readonly': [('is_only_child', '=', False)]}"
context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_manager']}"/> context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_sale_manager']}"/>
</group> </group>
<group name="Weights" groups="product.group_stock_packaging" string="Weights"> <group name="Weights" string="Weights">
<field digits="(14, 3)" name="volume" <field digits="(14, 3)" name="volume"
attrs="{'readonly': ['|', ('type','=','service'), ('is_only_child', '=', False)]}"/> attrs="{'readonly': ['|', ('type','=','service'), ('is_only_child', '=', False)]}"/>
<field name="weight" <field name="weight"

8
addons/stock/product_view.xml
View File

@ -106,10 +106,10 @@
<field name="outgoing_qty" class="oe_inline"/> <field name="outgoing_qty" class="oe_inline"/>
<field name="virtual_available" class="oe_inline"/> <field name="virtual_available" class="oe_inline"/>
</group> </group>
<group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots"> <group name="lot" groups="stock.group_production_lot" string="Lots">
<field name="track_production" groups="stock.group_production_lot"/> <field name="track_production"/>
<field name="track_incoming" groups="stock.group_tracking_lot"/> <field name="track_incoming"/>
<field name="track_outgoing" groups="stock.group_tracking_lot"/> <field name="track_outgoing"/>
</group> </group>
</group> </group>
<group name="status" position="after" version="7.0"> <group name="status" position="after" version="7.0">

26
addons/stock/stock_view.xml
View File

@ -233,13 +233,13 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Packs" version="7.0"> <form string="Packs" version="7.0">
<group> <group>
<group groups="product.group_stock_packaging" string="Pack Identification"> <group string="Pack Identification">
<field name="name"/> <field name="name"/>
<field name="serial"/> <field name="serial"/>
<field name="date"/> <field name="date"/>
<field name="active"/> <field name="active"/>
</group> </group>
<group groups="stock.group_tracking_lot" string="Traceability"> <group string="Traceability">
<button name="action_traceability" string="Upstream Traceability" type="object" <button name="action_traceability" string="Upstream Traceability" type="object"
colspan="2"/> colspan="2"/>
<button name="action_traceability" string="Downstream Traceability" type="object" <button name="action_traceability" string="Downstream Traceability" type="object"
@ -280,7 +280,7 @@
<menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root"
sequence="3"/> sequence="3"/>
<menuitem action="action_tracking_form" id="menu_action_tracking_form" <menuitem action="action_tracking_form" id="menu_action_tracking_form"
groups="product.group_stock_packaging" groups="stock.group_tracking_lot"
sequence="6" sequence="6"
parent="menu_traceability"/> parent="menu_traceability"/>
@ -1155,14 +1155,14 @@
<button name="%(track_line)d" string="Split in Serial Numbers" type="action" <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}" icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
states="draft,waiting,confirmed,assigned,done" states="draft,waiting,confirmed,assigned,done"
groups="stock.group_tracking_lot"/> groups="stock.group_production_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot"/> <field name="tracking_id" groups="stock.group_tracking_lot"/>
<button name="setlast_tracking" string="Put in current pack" type="object" <button name="setlast_tracking" string="Put in current pack" type="object"
groups="product.group_stock_packaging" groups="stock.group_tracking_lot"
icon="terp-accessories-archiver" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" icon="terp-accessories-archiver" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
states="draft,assigned,confirmed,done"/> states="draft,assigned,confirmed,done"/>
<button name="%(split_into)d" string="Put in a new pack" type="action" <button name="%(split_into)d" string="Put in a new pack" type="action"
groups="product.group_stock_packaging" groups="stock.group_tracking_lot"
icon="terp-accessories-archiver+" icon="terp-accessories-archiver+"
states="draft,assigned,confirmed,done"/> states="draft,assigned,confirmed,done"/>
<field name="location_id" groups="stock.group_locations"/> <field name="location_id" groups="stock.group_locations"/>
@ -1210,7 +1210,7 @@
groups="stock.group_tracking_lot" groups="stock.group_tracking_lot"
states="draft,assigned,confirmed"/> states="draft,assigned,confirmed"/>
<button name="%(split_into)d" string="Put in a new pack" type="action" <button name="%(split_into)d" string="Put in a new pack" type="action"
groups="product.group_stock_packaging" groups="stock.group_tracking_lot"
icon="terp-accessories-archiver+" icon="terp-accessories-archiver+"
states="draft,assigned,confirmed"/> states="draft,assigned,confirmed"/>
<field name="location_dest_id" groups="stock.group_locations"/> <field name="location_dest_id" groups="stock.group_locations"/>
@ -1278,7 +1278,6 @@
<div groups="stock.group_tracking_lot"> <div groups="stock.group_tracking_lot">
<field name="tracking_id" class="oe_inline"/> <field name="tracking_id" class="oe_inline"/>
<button name="%(split_into)d" string="New Pack" type="action" <button name="%(split_into)d" string="New Pack" type="action"
groups="product.group_stock_packaging"
icon="terp-accessories-archiver+" icon="terp-accessories-archiver+"
states="draft,assigned,confirmed"/> states="draft,assigned,confirmed"/>
</div> </div>
@ -1345,13 +1344,12 @@
<field name="location_dest_id" domain="[('usage','in', ['internal', 'supplier', 'customer'])]" groups="stock.group_locations"/> <field name="location_dest_id" domain="[('usage','in', ['internal', 'supplier', 'customer'])]" groups="stock.group_locations"/>
</group> </group>
<group groups="stock.group_tracking_lot" string="Traceability"> <group groups="stock.group_tracking_lot,stock.group_production_lot" string="Traceability">
<label for="tracking_id"/> <label for="tracking_id"/>
<div> <div>
<field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/> <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
<button name="%(split_into)d" <button name="%(split_into)d"
string="New Pack" type="action" string="New Pack" type="action"
groups="product.group_stock_packaging"
icon="terp-accessories-archiver+" icon="terp-accessories-archiver+"
states="draft,assigned,confirmed"/> states="draft,assigned,confirmed"/>
</div> </div>
@ -1363,7 +1361,7 @@
domain="[('product_id','=?',product_id)]" domain="[('product_id','=?',product_id)]"
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/> on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
<button name="%(track_line)d" <button name="%(track_line)d"
groups="stock.group_tracking_lot" groups="stock.group_production_lot"
states="draft,waiting,confirmed,assigned" states="draft,waiting,confirmed,assigned"
string="Split" type="action" icon="gtk-justify-fill"/> string="Split" type="action" icon="gtk-justify-fill"/>
</div> </div>
@ -1470,15 +1468,15 @@
<button name="%(track_line)d" string="Split in Serial Numbers" type="action" <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}" icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
states="draft,waiting,confirmed,assigned,done" states="draft,waiting,confirmed,assigned,done"
groups="stock.group_tracking_lot"/> groups="stock.group_production_lot"/>
<field name="tracking_id" groups="stock.group_tracking_lot"/> <field name="tracking_id" groups="stock.group_tracking_lot"/>
<button name="setlast_tracking" string="Put in current pack" type="object" <button name="setlast_tracking" string="Put in current pack" type="object"
attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
groups="product.group_stock_packaging" groups="stock.group_tracking_lot"
icon="terp-accessories-archiver" icon="terp-accessories-archiver"
states="draft,assigned,confirmed,done"/> states="draft,assigned,confirmed,done"/>
<button name="%(split_into)d" string="Put in a new pack" type="action" <button name="%(split_into)d" string="Put in a new pack" type="action"
groups="product.group_stock_packaging" groups="stock.group_tracking_lot"
icon="terp-accessories-archiver+" icon="terp-accessories-archiver+"
states="draft,assigned,confirmed,done"/> states="draft,assigned,confirmed,done"/>
<field name="state"/> <field name="state"/>

2
addons/stock/wizard/stock_change_product_qty_view.xml
View File

@ -10,7 +10,7 @@
<field name="new_quantity" /> <field name="new_quantity" />
<field name="product_id" invisible="1"/> <field name="product_id" invisible="1"/>
<field name="location_id" groups="stock.group_locations"/> <field name="location_id" groups="stock.group_locations"/>
<field name="prodlot_id" context="{'search_default_product_id':product_id,'default_product_id':product_id}" groups="stock.group_tracking_lot"/> <field name="prodlot_id" context="{'search_default_product_id':product_id,'default_product_id':product_id}" groups="stock.group_production_lot"/>
</group> </group>
<footer> <footer>
<button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/> <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>