openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #00481
[Merge] lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3
ARA(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
Requested reviews:
OpenERP R&D Team (openerp-dev)
Related bugs:
#615522 Report Of Invoice : Payment Term + Due date not printed
https://bugs.launchpad.net/bugs/615522
#649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
https://bugs.launchpad.net/bugs/649029
#672553 opening entries from chart of account doesn't use context
https://bugs.launchpad.net/bugs/672553
#674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
https://bugs.launchpad.net/bugs/674480
hello,
[FIX] account: incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
Thanks,
ara
--
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/40927
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.
=== modified file 'l10n_ch/demo/dta_demo.xml'
--- l10n_ch/demo/dta_demo.xml 2010-10-26 15:02:22 +0000
+++ l10n_ch/demo/dta_demo.xml 2010-11-16 06:11:59 +0000
@@ -46,20 +46,21 @@
<field name="invoice_id" ref="v11_invoice"/>
</record>
-
+<!--
<record model="account.journal" id="account.sales_journal">
<field name="default_debit_account_id" ref="account.a_recv"/>
</record>
-
+-->
<!-- Define a payment mode -->
+ <!--
<record model="payment.mode" id="payment_mode_dta">
<field name="name">DTA</field>
<field name="bank_id" ref="main_bank"/>
<field name="journal" model="account.journal" search="[('type','=','cash')]"/>
</record>
-
+ -->
</data>
</openerp>
=== modified file 'l10n_ch/vaudtax_data.xml'
--- l10n_ch/vaudtax_data.xml 2010-07-08 11:35:45 +0000
+++ l10n_ch/vaudtax_data.xml 2010-11-16 06:11:59 +0000
@@ -57,8 +57,9 @@
<field name="shortcut">Mme,m</field>
</record>
<!--
- Account Journal we define the swiss base journal
+ Account Journal we define the swiss base journal
-->
+ <!--
<record id="account.sales_journal" model="account.journal">
<field name="name">Journal de vente</field>
<field name="code">JV</field>
@@ -99,5 +100,6 @@
<field name="view_id" ref="account.account_journal_view"/>
<field name="sequence_id" ref="account.sequence_journal"/>
</record>
+ -->
</data>
</openerp>
=== modified file 'l10n_in/l10n_in_chart.xml'
--- l10n_in/l10n_in_chart.xml 2010-09-15 06:10:46 +0000
+++ l10n_in/l10n_in_chart.xml 2010-11-16 06:11:59 +0000
@@ -466,7 +466,7 @@
<field name="name">Base of Taxed Purchases</field>
<field name="parent_id" ref="vat_code_base_net"/>
</record>
-
+<!--
<record id="opening_journal" model="account.journal">
<field name="name">Opening Journal</field>
<field name="code">OPJ</field>
@@ -475,7 +475,7 @@
<field name="sequence_id" ref="account.sequence_journal"/>
<field name="user_id" ref="base.user_root"/>
</record>
-
+-->
<record id="cose_journal_opening" model="account.analytic.journal">
<field name="code">OPJ</field>
<field name="name">Opening Journal</field>
=== modified file 'l10n_it/journals.xml'
--- l10n_it/journals.xml 2010-10-28 08:42:58 +0000
+++ l10n_it/journals.xml 2010-11-16 06:11:59 +0000
@@ -3,25 +3,25 @@
<openerp>
<data noupdate="0">
-<!--
- Piano dei conti per una ditta di servizi, by Servabit.srl
+<!--
+ Piano dei conti per una ditta di servizi, by Servabit.srl
(http://www.servabit.it)
-
+
Qui vengono definiti i journals, sezioni del "libro giornale"
- cui sono associate le diverse scritture contabili
- ( from account/demo/account_minimal.xml, modified )
+ cui sono associate le diverse scritture contabili
+ ( from account/demo/account_minimal.xml, modified )
--->
+-->
<!--
Account Journal
-->
-
-
- <!-- inserisco giornali vendite, acquisti , banca, contanti -->
+
+
+ <!-- inserisco giornali vendite, acquisti , banca, contanti -->
<!-- i default dei conti sono presi dai prodotti -->
- <!-- vendite ed acquisti sono gia' creati da OpenERP -->
+ <!-- vendite ed acquisti sono gia' creati da OpenERP -->
<!-- <record id="sales_journal" model="account.journal">
<field name="name">Giornale vendite</field>
@@ -41,18 +41,19 @@
<field name="sequence_id" ref="account.sequence_purchase_journal"/>
<field name="user_id" ref="base.user_root"/>
</record>
--->
+-->
+<!--
<record id="bank_journal" model="account.journal">
<field name="name">Conto bancario</field>
<field name="code">BNK</field>
<field name="type">cash</field>
<field name="view_id" ref="account.account_journal_bank_view"/>
- <field name="sequence_id" ref="account.sequence_journal"/>
+ <field name="sequence_id" ref="account.sequence_journal"/>-->
<!-- non si possono definire i default fino a che non si sono fatti
- i conti dal template di piano dei conti -->
+ i conti dal template di piano dei conti -->
<!-- <field name="default_debit_account_id" ref="chartS_C09_001"/> -->
<!-- <field name="default_credit_account_id" ref="chartS_C09_001"/> -->
- <field name="user_id" ref="base.user_root"/>
+<!-- <field name="user_id" ref="base.user_root"/>
</record>
<record id="cash_journal" model="account.journal">
@@ -60,13 +61,13 @@
<field name="code">CHK</field>
<field name="type">cash</field>
<field name="view_id" ref="account.account_journal_bank_view"/>
- <field name="sequence_id" ref="account.sequence_journal"/>
+ <field name="sequence_id" ref="account.sequence_journal"/>-->
<!-- <field name="default_debit_account_id" ref="chartS_C09_031"/> -->
<!-- <field name="default_credit_account_id" ref="chartS_C09_031"/> -->
- <field name="user_id" ref="base.user_root"/>
+<!-- <field name="user_id" ref="base.user_root"/>
</record>
-
+-->
=== modified file 'l10n_ma/l10n_ma_journal.xml'
--- l10n_ma/l10n_ma_journal.xml 2010-11-05 13:34:43 +0000
+++ l10n_ma/l10n_ma_journal.xml 2010-11-16 06:11:59 +0000
@@ -5,22 +5,24 @@
<!--
journaux standards
-->
+<!--
<record id="journal_vente" model="account.journal">
<field name="name">Journal des Ventes</field>
<field name="code">JVT</field>
<field name="type">sale</field>
<field name="view_id" ref="account.account_journal_view"/>
<field name="sequence_id" ref="account.sequence_journal"/>
- <!--
- comptes par défaul
-
- <field name="default_debit_account_id" ref="pcg_34211" />
- <field name="default_credit_account_id" ref="pcg_7111" />
- -->
- </record>
-
-
-
+-->
+ <!--
+ comptes par défaul
+
+ <field name="default_debit_account_id" ref="pcg_34211" />
+ <field name="default_credit_account_id" ref="pcg_7111" />
+ -->
+<!-- </record>
+
+
+
<record id="journal_achat" model="account.journal">
<field name="name">Journal des Achats</field>
<field name="code">JAC</field>
@@ -53,7 +55,7 @@
<field name="view_id" ref="account.account_journal_view"/>
<field name="sequence_id" ref="account.sequence_journal"/>
</record>
-
+-->
</data>
</openerp>
Follow ups
