openerp-l10n-ar-localization team mailing list archive
-
openerp-l10n-ar-localization team
-
Mailing list archive
-
Message #00227
[Merge] lp:~dariokdg/openerp-l10n-ar-localization/7.0_prop into lp:openerp-l10n-ar-localization
Darío De Giacomo has proposed merging lp:~dariokdg/openerp-l10n-ar-localization/7.0_prop into lp:openerp-l10n-ar-localization.
Requested reviews:
OpenERP - Team de Localización Argentina (openerp-l10n-ar-localization)
For more details, see:
https://code.launchpad.net/~dariokdg/openerp-l10n-ar-localization/7.0_prop/+merge/193982
[MOD] Readonly agregado en la pestana Other Info de Invoice para todos los campos que son de informacion de la AFIP y no deben poder ser alterados por el usuario.
[FIX] Se agregaron los valores default del campo ref_tax_code_id en cada impuesto para poder emitir notas de credito en Customer Refund.
[MOD] Se modifico una query a la base de datos para el ordenamiento de Journals en la emision de comprobantes (el primero a mostrar sera el mas frecuentemente utilizado).
--
https://code.launchpad.net/~dariokdg/openerp-l10n-ar-localization/7.0_prop/+merge/193982
Your team OpenERP - Team de Localización Argentina is requested to review the proposed merge of lp:~dariokdg/openerp-l10n-ar-localization/7.0_prop into lp:openerp-l10n-ar-localization.
=== modified file 'l10n_ar_chart_generic/data/account_chart_coop.xml' (properties changed: +x to -x)
--- l10n_ar_chart_generic/data/account_chart_coop.xml 2013-09-19 21:20:14 +0000
+++ l10n_ar_chart_generic/data/account_chart_coop.xml 2013-11-05 18:30:36 +0000
@@ -1320,6 +1320,7 @@
<field eval="0.105" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iva_venta10"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iva_venta10"/>
<field name="account_collected_id" ref="coop_iva_a_pagar"/>
<field name="account_paid_id" ref="coop_iva_a_pagar"/>
<field name="type_tax_use">sale</field>
@@ -1331,7 +1332,8 @@
<field name="description">01003004:C</field>
<field eval="0.105" name="amount"/>
<field name="type">percent</field>
- <field name="tax_code_id" ref="coop_tax_code_iva_venta10"/>
+ <field name="tax_code_id" ref="coop_tax_code_iva_compras10"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iva_compras10"/>
<field name="account_collected_id" ref="coop_iva_credito_fiscal_10"/>
<field name="account_paid_id" ref="coop_iva_credito_fiscal_10"/>
<field name="type_tax_use">purchase</field>
@@ -1344,6 +1346,7 @@
<field eval="0.21" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iva_venta21"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iva_venta21"/>
<field name="account_collected_id" ref="coop_iva_a_pagar"/>
<field name="account_paid_id" ref="coop_iva_a_pagar"/>
<field name="type_tax_use">sale</field>
@@ -1355,7 +1358,8 @@
<field name="description">01003005:C</field>
<field eval="0.21" name="amount"/>
<field name="type">percent</field>
- <field name="tax_code_id" ref="coop_tax_code_iva_venta21"/>
+ <field name="tax_code_id" ref="coop_tax_code_iva_compras21"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iva_compras21"/>
<field name="account_collected_id" ref="coop_iva_credito_fiscal_21"/>
<field name="account_paid_id" ref="coop_iva_credito_fiscal_21"/>
<field name="type_tax_use">purchase</field>
@@ -1368,6 +1372,7 @@
<field eval="0.27" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iva_venta27"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iva_venta27"/>
<field name="account_collected_id" ref="coop_iva_a_pagar"/>
<field name="account_paid_id" ref="coop_iva_a_pagar"/>
<field name="type_tax_use">sale</field>
@@ -1379,7 +1384,8 @@
<field name="description">01003006:C</field>
<field eval="0.27" name="amount"/>
<field name="type">percent</field>
- <field name="tax_code_id" ref="coop_tax_code_iva_venta27"/>
+ <field name="tax_code_id" ref="coop_tax_code_iva_compras27"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iva_compras27"/>
<field name="account_collected_id" ref="coop_iva_credito_fiscal_27"/>
<field name="account_paid_id" ref="coop_iva_credito_fiscal_27"/>
<field name="type_tax_use">purchase</field>
@@ -1397,6 +1403,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iibb_cf_percepcion"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iibb_cf_percepcion"/>
<field name="account_collected_id" ref="coop_percepcion_iibb_cf"/>
<field name="account_paid_id" ref="coop_percepcion_iibb_cf"/>
<field name="type_tax_use">purchase</field>
@@ -1409,6 +1416,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iibb_cf_retencion"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iibb_cf_retencion"/>
<field name="account_collected_id" ref="coop_retencion_iibb_cf"/>
<field name="account_paid_id" ref="coop_retencion_iibb_cf"/>
<field name="type_tax_use">purchase</field>
@@ -1421,6 +1429,7 @@
<field eval="0.00" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="coop_tax_code_iibb_cf_facturado"/>
+ <field name="ref_base_code_id" ref="coop_tax_code_iibb_cf_facturado"/>
<field name="account_collected_id" ref="coop_impuestos_iibb_cf"/>
<field name="account_paid_id" ref="coop_impuestos_iibb_cf"/>
<field name="type_tax_use">sale</field>
@@ -1435,6 +1444,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iibb_ba_percepcion"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iibb_ba_percepcion"/>
<field name="account_collected_id" ref="coop_percepcion_iibb_ba"/>
<field name="account_paid_id" ref="coop_percepcion_iibb_ba"/>
<field name="type_tax_use">purchase</field>
@@ -1447,6 +1457,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iibb_ba_retencion"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iibb_ba_retencion"/>
<field name="account_collected_id" ref="coop_retencion_iibb_ba"/>
<field name="account_paid_id" ref="coop_retencion_iibb_ba"/>
<field name="type_tax_use">purchase</field>
@@ -1459,6 +1470,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="coop_tax_code_iibb_ba_facturado"/>
+ <field name="ref_base_code_id" ref="coop_tax_code_iibb_ba_facturado"/>
<field name="account_collected_id" ref="coop_impuestos_iibb_ba"/>
<field name="account_paid_id" ref="coop_impuestos_iibb_ba"/>
<field name="type_tax_use">sale</field>
@@ -1473,6 +1485,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iibb_co_percepcion"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iibb_co_percepcion"/>
<field name="account_collected_id" ref="coop_percepcion_iibb_co"/>
<field name="account_paid_id" ref="coop_percepcion_iibb_co"/>
<field name="type_tax_use">purchase</field>
@@ -1485,6 +1498,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iibb_co_retencion"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iibb_co_retencion"/>
<field name="account_collected_id" ref="coop_retencion_iibb_co"/>
<field name="account_paid_id" ref="coop_retencion_iibb_co"/>
<field name="type_tax_use">purchase</field>
@@ -1497,6 +1511,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="coop_tax_code_iibb_co_facturado"/>
+ <field name="ref_base_code_id" ref="coop_tax_code_iibb_co_facturado"/>
<field name="account_collected_id" ref="coop_impuestos_iibb_co"/>
<field name="account_paid_id" ref="coop_impuestos_iibb_co"/>
<field name="type_tax_use">sale</field>
@@ -1511,6 +1526,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iibb_sf_percepcion"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iibb_sf_percepcion"/>
<field name="account_collected_id" ref="coop_percepcion_iibb_sf"/>
<field name="account_paid_id" ref="coop_percepcion_iibb_sf"/>
<field name="type_tax_use">purchase</field>
@@ -1523,6 +1539,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="coop_tax_code_iibb_sf_retencion"/>
+ <field name="ref_tax_code_id" ref="coop_tax_code_iibb_sf_retencion"/>
<field name="account_collected_id" ref="coop_retencion_iibb_sf"/>
<field name="account_paid_id" ref="coop_retencion_iibb_sf"/>
<field name="type_tax_use">purchase</field>
@@ -1535,6 +1552,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="coop_tax_code_iibb_sf_facturado"/>
+ <field name="ref_base_code_id" ref="coop_tax_code_iibb_sf_facturado"/>
<field name="account_collected_id" ref="coop_impuestos_iibb_sf"/>
<field name="account_paid_id" ref="coop_impuestos_iibb_sf"/>
<field name="type_tax_use">sale</field>
@@ -1554,6 +1572,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="coop_tax_code_coop_facturado"/>
+ <field name="ref_base_code_id" ref="coop_tax_code_coop_facturado"/>
<field name="account_collected_id" ref="coop_impuestos_coop"/>
<field name="account_paid_id" ref="coop_impuestos_coop"/>
<field name="type_tax_use">sale</field>
=== modified file 'l10n_ar_chart_generic/data/account_chart_monotrib.xml' (properties changed: +x to -x)
--- l10n_ar_chart_generic/data/account_chart_monotrib.xml 2013-09-19 21:20:14 +0000
+++ l10n_ar_chart_generic/data/account_chart_monotrib.xml 2013-11-05 18:30:36 +0000
@@ -1193,6 +1193,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="mt_tax_code_iibb_cf_percepcion"/>
+ <field name="ref_tax_code_id" ref="mt_tax_code_iibb_cf_percepcion"/>
<field name="account_collected_id" ref="mt_percepcion_iibb_cf"/>
<field name="account_paid_id" ref="mt_percepcion_iibb_cf"/>
<field name="type_tax_use">purchase</field>
@@ -1205,6 +1206,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="mt_tax_code_iibb_cf_retencion"/>
+ <field name="ref_tax_code_id" ref="mt_tax_code_iibb_cf_retencion"/>
<field name="account_collected_id" ref="mt_retencion_iibb_cf"/>
<field name="account_paid_id" ref="mt_retencion_iibb_cf"/>
<field name="type_tax_use">purchase</field>
@@ -1217,6 +1219,7 @@
<field eval="0.00" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="mt_tax_code_iibb_cf_facturado"/>
+ <field name="ref_base_code_id" ref="mt_tax_code_iibb_cf_facturado"/>
<field name="account_collected_id" ref="mt_impuestos_iibb_cf"/>
<field name="account_paid_id" ref="mt_impuestos_iibb_cf"/>
<field name="type_tax_use">sale</field>
@@ -1231,6 +1234,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="mt_tax_code_iibb_ba_percepcion"/>
+ <field name="ref_tax_code_id" ref="mt_tax_code_iibb_ba_percepcion"/>
<field name="account_collected_id" ref="mt_percepcion_iibb_ba"/>
<field name="account_paid_id" ref="mt_percepcion_iibb_ba"/>
<field name="type_tax_use">purchase</field>
@@ -1243,6 +1247,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="mt_tax_code_iibb_ba_retencion"/>
+ <field name="ref_tax_code_id" ref="mt_tax_code_iibb_ba_retencion"/>
<field name="account_collected_id" ref="mt_retencion_iibb_ba"/>
<field name="account_paid_id" ref="mt_retencion_iibb_ba"/>
<field name="type_tax_use">purchase</field>
@@ -1255,6 +1260,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="mt_tax_code_iibb_ba_facturado"/>
+ <field name="ref_base_code_id" ref="mt_tax_code_iibb_ba_facturado"/>
<field name="account_collected_id" ref="mt_impuestos_iibb_ba"/>
<field name="account_paid_id" ref="mt_impuestos_iibb_ba"/>
<field name="type_tax_use">sale</field>
@@ -1269,6 +1275,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="mt_tax_code_iibb_co_percepcion"/>
+ <field name="ref_tax_code_id" ref="mt_tax_code_iibb_co_percepcion"/>
<field name="account_collected_id" ref="mt_percepcion_iibb_co"/>
<field name="account_paid_id" ref="mt_percepcion_iibb_co"/>
<field name="type_tax_use">purchase</field>
@@ -1281,6 +1288,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="mt_tax_code_iibb_co_retencion"/>
+ <field name="ref_tax_code_id" ref="mt_tax_code_iibb_co_retencion"/>
<field name="account_collected_id" ref="mt_retencion_iibb_co"/>
<field name="account_paid_id" ref="mt_retencion_iibb_co"/>
<field name="type_tax_use">purchase</field>
@@ -1293,6 +1301,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="mt_tax_code_iibb_co_facturado"/>
+ <field name="ref_base_code_id" ref="mt_tax_code_iibb_co_facturado"/>
<field name="account_collected_id" ref="mt_impuestos_iibb_co"/>
<field name="account_paid_id" ref="mt_impuestos_iibb_co"/>
<field name="type_tax_use">sale</field>
@@ -1307,6 +1316,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="mt_tax_code_iibb_sf_percepcion"/>
+ <field name="ref_tax_code_id" ref="mt_tax_code_iibb_sf_percepcion"/>
<field name="account_collected_id" ref="mt_percepcion_iibb_sf"/>
<field name="account_paid_id" ref="mt_percepcion_iibb_sf"/>
<field name="type_tax_use">purchase</field>
@@ -1319,6 +1329,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="mt_tax_code_iibb_sf_retencion"/>
+ <field name="ref_tax_code_id" ref="mt_tax_code_iibb_sf_retencion"/>
<field name="account_collected_id" ref="mt_retencion_iibb_sf"/>
<field name="account_paid_id" ref="mt_retencion_iibb_sf"/>
<field name="type_tax_use">purchase</field>
@@ -1331,6 +1342,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="mt_tax_code_iibb_sf_facturado"/>
+ <field name="ref_base_code_id" ref="mt_tax_code_iibb_sf_facturado"/>
<field name="account_collected_id" ref="mt_impuestos_iibb_sf"/>
<field name="account_paid_id" ref="mt_impuestos_iibb_sf"/>
<field name="type_tax_use">sale</field>
=== modified file 'l10n_ar_chart_generic/data/account_chart_respinsc.xml' (properties changed: +x to -x)
--- l10n_ar_chart_generic/data/account_chart_respinsc.xml 2013-11-03 18:05:52 +0000
+++ l10n_ar_chart_generic/data/account_chart_respinsc.xml 2013-11-05 18:30:36 +0000
@@ -1296,7 +1296,8 @@
<field name="sequence">2</field>
<field eval="0.0" name="amount"/>
<field name="type">percent</field>
- <field name="tax_code_id" ref="ri_tax_code_iva_venta10"/>
+ <field name="tax_code_id" ref="ri_tax_code_iva_venta0"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iva_venta0"/>
<field name="account_collected_id" ref="ri_iva_a_pagar"/>
<field name="account_paid_id" ref="ri_iva_a_pagar"/>
<field name="type_tax_use">sale</field>
@@ -1310,6 +1311,7 @@
<field eval="0.0" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iva_compras0"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iva_compras0"/>
<field name="account_collected_id" ref="ri_iva_credito_fiscal"/>
<field name="account_paid_id" ref="ri_iva_credito_fiscal"/>
<field name="type_tax_use">purchase</field>
@@ -1323,6 +1325,7 @@
<field eval="0.105" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iva_venta10"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iva_venta10"/>
<field name="account_collected_id" ref="ri_iva_a_pagar"/>
<field name="account_paid_id" ref="ri_iva_a_pagar"/>
<field name="type_tax_use">sale</field>
@@ -1336,6 +1339,7 @@
<field eval="0.105" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iva_compras10"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iva_compras10"/>
<field name="account_collected_id" ref="ri_iva_credito_fiscal"/>
<field name="account_paid_id" ref="ri_iva_credito_fiscal"/>
<field name="type_tax_use">purchase</field>
@@ -1349,6 +1353,7 @@
<field eval="0.21" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iva_venta21"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iva_venta21"/>
<field name="account_collected_id" ref="ri_iva_a_pagar"/>
<field name="account_paid_id" ref="ri_iva_a_pagar"/>
<field name="type_tax_use">sale</field>
@@ -1362,6 +1367,7 @@
<field eval="0.21" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iva_compras21"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iva_compras21"/>
<field name="account_collected_id" ref="ri_iva_credito_fiscal"/>
<field name="account_paid_id" ref="ri_iva_credito_fiscal"/>
<field name="type_tax_use">purchase</field>
@@ -1375,6 +1381,7 @@
<field eval="0.27" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iva_venta27"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iva_venta27"/>
<field name="account_collected_id" ref="ri_iva_a_pagar"/>
<field name="account_paid_id" ref="ri_iva_a_pagar"/>
<field name="type_tax_use">sale</field>
@@ -1388,6 +1395,7 @@
<field eval="0.27" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iva_compras27"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iva_compras27"/>
<field name="account_collected_id" ref="ri_iva_credito_fiscal"/>
<field name="account_paid_id" ref="ri_iva_credito_fiscal"/>
<field name="type_tax_use">purchase</field>
@@ -1406,6 +1414,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iibb_cf_percepcion"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iibb_cf_percepcion"/>
<field name="account_collected_id" ref="ri_percepcion_iibb_cf"/>
<field name="account_paid_id" ref="ri_percepcion_iibb_cf"/>
<field name="type_tax_use">purchase</field>
@@ -1419,6 +1428,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iibb_cf_retencion"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iibb_cf_retencion"/>
<field name="account_collected_id" ref="ri_retencion_iibb_cf"/>
<field name="account_paid_id" ref="ri_retencion_iibb_cf"/>
<field name="type_tax_use">purchase</field>
@@ -1432,6 +1442,7 @@
<field eval="0.00" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="ri_tax_code_iibb_cf_facturado"/>
+ <field name="ref_base_code_id" ref="ri_tax_code_iibb_cf_facturado"/>
<field name="account_collected_id" ref="ri_impuestos_iibb_cf"/>
<field name="account_paid_id" ref="ri_impuestos_iibb_cf"/>
<field name="type_tax_use">sale</field>
@@ -1447,6 +1458,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iibb_ba_percepcion"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iibb_ba_percepcion"/>
<field name="account_collected_id" ref="ri_percepcion_iibb_ba"/>
<field name="account_paid_id" ref="ri_percepcion_iibb_ba"/>
<field name="type_tax_use">purchase</field>
@@ -1460,6 +1472,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iibb_ba_retencion"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iibb_ba_retencion"/>
<field name="account_collected_id" ref="ri_retencion_iibb_ba"/>
<field name="account_paid_id" ref="ri_retencion_iibb_ba"/>
<field name="type_tax_use">purchase</field>
@@ -1473,6 +1486,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="ri_tax_code_iibb_ba_facturado"/>
+ <field name="ref_base_code_id" ref="ri_tax_code_iibb_ba_facturado"/>
<field name="account_collected_id" ref="ri_impuestos_iibb_ba"/>
<field name="account_paid_id" ref="ri_impuestos_iibb_ba"/>
<field name="type_tax_use">sale</field>
@@ -1488,6 +1502,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iibb_co_percepcion"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iibb_co_percepcion"/>
<field name="account_collected_id" ref="ri_percepcion_iibb_co"/>
<field name="account_paid_id" ref="ri_percepcion_iibb_co"/>
<field name="type_tax_use">purchase</field>
@@ -1501,6 +1516,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iibb_co_retencion"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iibb_co_retencion"/>
<field name="account_collected_id" ref="ri_retencion_iibb_co"/>
<field name="account_paid_id" ref="ri_retencion_iibb_co"/>
<field name="type_tax_use">purchase</field>
@@ -1514,6 +1530,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="ri_tax_code_iibb_co_facturado"/>
+ <field name="ref_base_code_id" ref="ri_tax_code_iibb_co_facturado"/>
<field name="account_collected_id" ref="ri_impuestos_iibb_co"/>
<field name="account_paid_id" ref="ri_impuestos_iibb_co"/>
<field name="type_tax_use">sale</field>
@@ -1529,6 +1546,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iibb_sf_percepcion"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iibb_sf_percepcion"/>
<field name="account_collected_id" ref="ri_percepcion_iibb_sf"/>
<field name="account_paid_id" ref="ri_percepcion_iibb_sf"/>
<field name="type_tax_use">purchase</field>
@@ -1542,6 +1560,7 @@
<field eval="0.02" name="amount"/>
<field name="type">percent</field>
<field name="tax_code_id" ref="ri_tax_code_iibb_sf_retencion"/>
+ <field name="ref_tax_code_id" ref="ri_tax_code_iibb_sf_retencion"/>
<field name="account_collected_id" ref="ri_retencion_iibb_sf"/>
<field name="account_paid_id" ref="ri_retencion_iibb_sf"/>
<field name="type_tax_use">purchase</field>
@@ -1555,6 +1574,7 @@
<field eval="0" name="amount"/>
<field name="type">fixed</field>
<field name="base_code_id" ref="ri_tax_code_iibb_sf_facturado"/>
+ <field name="ref_base_code_id" ref="ri_tax_code_iibb_sf_facturado"/>
<field name="account_collected_id" ref="ri_impuestos_iibb_sf"/>
<field name="account_paid_id" ref="ri_impuestos_iibb_sf"/>
<field name="type_tax_use">sale</field>
=== modified file 'l10n_ar_invoice/invoice.py' (properties changed: +x to -x)
--- l10n_ar_invoice/invoice.py 2013-11-03 18:09:14 +0000
+++ l10n_ar_invoice/invoice.py 2013-11-05 18:30:36 +0000
@@ -183,17 +183,20 @@
return result
cr.execute("""
- SELECT DISTINCT J.id, J.name
+ SELECT DISTINCT J.id, J.name, IRSEQ.number_next
FROM afip_responsability_relation RR
LEFT join afip_document_class DC on (DC.id = RR.document_class_id)
LEFT join afip_journal_class JC on (DC.id = JC.document_class_id)
LEFT join account_journal J on (J.journal_class_id = JC.id)
+ LEFT join ir_sequence IRSEQ on (J.sequence_id = IRSEQ.id)
WHERE
RR.issuer_id = %s AND
RR.receptor_id = %s AND
J.type in %s AND
- J.id is not NULL
- ORDER BY J.name DESC;
+ J.id is not NULL AND
+ J.sequence_id is not NULL
+ AND IRSEQ.number_next is not NULL
+ ORDER BY IRSEQ.number_next DESC;
""", (company.partner_id.responsability_id.id, partner.responsability_id.id, tuple(type_map[type])))
accepted_journal_ids = [ x[0] for x in cr.fetchall() ]
=== modified file 'l10n_ar_wsafip_fe/data/invoice_view.xml' (properties changed: +x to -x)
--- l10n_ar_wsafip_fe/data/invoice_view.xml 2013-11-05 01:05:21 +0000
+++ l10n_ar_wsafip_fe/data/invoice_view.xml 2013-11-05 18:30:36 +0000
@@ -55,10 +55,10 @@
</group>
</notebook>
<field name="move_id" position="after">
- <field name='afip_batch_number' invisible="1"/>
- <field name='afip_cae' attrs="{'readonly': [('state','!=','draft')]}"/>
- <field name='afip_cae_due' attrs="{'readonly': [('state','!=','draft')]}"/>
- <field name='afip_error_id'/>
+ <field name='afip_batch_number' invisible="1" readonly="1"/>
+ <field name='afip_cae' readonly="1"/>
+ <field name='afip_cae_due' readonly="1"/>
+ <field name='afip_error_id' readonly="1"/>
</field>
</field>
</record>
Follow ups
