Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-fr-rev-kty into lp:~vauxoo/openerp-venezuela-localization/ovl70-fr-rev-hbto
- ovl70-fr-rev-kty
- Merge into ovl70-fr-rev-hbto
Status: | Merged |
---|---|
Merged at revision: | 811 |
Proposed branch: | lp:~vauxoo/openerp-venezuela-localization/ovl70-fr-rev-kty |
Merge into: | lp:~vauxoo/openerp-venezuela-localization/ovl70-fr-rev-hbto |
Diff against target: |
593 lines (+72/-128) 20 files modified
l10n_ve_fiscal_requirements/model/invoice.py (+9/-16) l10n_ve_fiscal_requirements/test/fr_damaged.yml (+1/-3) l10n_ve_fiscal_requirements/test/fr_purchase_test.yml (+2/-2) l10n_ve_fiscal_requirements/test/fr_refund_note.yml (+5/-11) l10n_ve_fiscal_requirements/test/fr_sale_test.yml (+1/-3) l10n_ve_fiscal_requirements/test/fr_vat_test.yml (+20/-13) l10n_ve_fiscal_requirements/view/account_inv_refund_nctrl_view.xml (+0/-1) l10n_ve_fiscal_requirements/view/account_invoice_view.xml (+0/-3) l10n_ve_fiscal_requirements/view/account_tax_view.xml (+0/-1) l10n_ve_fiscal_requirements/view/l10n_ut_view.xml (+0/-3) l10n_ve_fiscal_requirements/view/partner_view.xml (+0/-1) l10n_ve_fiscal_requirements/wizard/account_invoice_debit.py (+15/-38) l10n_ve_fiscal_requirements/wizard/account_invoice_debit_view.xml (+0/-1) l10n_ve_fiscal_requirements/wizard/account_invoice_parent_view.xml (+0/-1) l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py (+19/-26) l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml (+0/-1) l10n_ve_fiscal_requirements/wizard/update_info_partner.xml (+0/-1) l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml (+0/-1) l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml (+0/-1) l10n_ve_fiscal_requirements/wizard/wizard_url_seniat_view.xml (+0/-1) |
To merge this branch: | bzr merge lp:~vauxoo/openerp-venezuela-localization/ovl70-fr-rev-kty |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
hbto [Vauxoo] http://www.vauxoo.com | Pending | ||
Review via email: mp+139019@code.launchpad.net |
Commit message
Description of the change
[INFO] finalizada revision de los test de fiscal requirements
- 807. By Katherine Zaoral (Vauxoo)
-
[DEL] borrando mensajes de impresion de prueba
- 808. By Katherine Zaoral (Vauxoo)
-
[MERGE] ovl70-fr-rev-hbto
- 809. By Katherine Zaoral (Vauxoo)
-
[MERGE] localization 7.0 @ revision 766
- 810. By Katherine Zaoral (Vauxoo)
-
[INFO] revision de las pruebas con los test yml
- 811. By Katherine Zaoral (Vauxoo)
-
[FIX] 'res.partner.
address' : Removed the record for being an deprecated model. Test was adapted to integrate the info of the addresses in the 'res.partner' records.
---- ES_es
[FIX] 'res.partner.address' : eliminado record por ser un modelo obsoleto, y adaptacion de la prueba para integrar la info de las direcciones en los records 'res.partner'. - 812. By Katherine Zaoral (Vauxoo)
-
[FIX] adaptacion de las vistas con openerp 7 (deprecated type)
- 813. By Katherine Zaoral (Vauxoo)
-
[FIX] campo 'tax_id' referenciado en test/fr_damaged.yml no existe, se referia a 'tax_code_id'
- 814. By Katherine Zaoral (Vauxoo)
-
[FIX] Adaptation for compatibility with OpenERP 7.0 wizard. Erased the line import wizard.
---- ES_es
[FIX] Adaptación para compatibilidad de los wizard con Openerp 7.0. Se borro la linea import wizard. - 815. By Katherine Zaoral (Vauxoo)
-
[FIX] misuse of context in browse orm call that generate an error in mids.move_id.id (because this call overwrite the context with only ['move_id'] - OMG a list ).
- 816. By Katherine Zaoral (Vauxoo)
-
[IMP] se quito el metodo obsoleto _get_period y se uso period.find()
- 817. By Katherine Zaoral (Vauxoo)
-
[FIX] error in the _refund_
cleanup_ lines() function (impossible delet a browse record type) - 818. By Katherine Zaoral (Vauxoo)
-
[FIX] yml: quitado referencias a registros que ya no existen de 'product' y redirigidos a otros que si.
[FIX] yml: se quitaron campos que ya no existen 'address_contact_ id' y 'address_ invoice_ id' - 819. By Katherine Zaoral (Vauxoo)
-
[MERGE] localization revno 770
- 820. By Katherine Zaoral (Vauxoo)
-
[FIX] eliminado metodo _refund_
cleanup_ lines() . sin razon de existir. Resulta que funciona perfectamente pero en 'wizard/ account. invoice. refund. py:linea 255' se utiliza para limpiar tax_lines, entonces produce error ya que los campos en el metodo estan especificados para invoice_lines y no para tax_lines y producia keyErrror. Dejando el metood que viene en el core no hay problema porque el revisa todos los campos propios del modelo y apartir de ahi hace su accion - 821. By Katherine Zaoral (Vauxoo)
-
[FIX] error al correr las pruebas porque read() devolvia una tupla en lugar de un browseable
- 822. By Katherine Zaoral (Vauxoo)
-
[FIX] record roto a 'product', enlazado a un record que si existe
- 823. By Katherine Zaoral (Vauxoo)
-
[FIX] cambio del mal uso de campo 'description' (no existe) por el campo 'name' del modelo 'account.inovice'.
- 824. By Katherine Zaoral (Vauxoo)
-
[MERGE] localization revno 771
- 825. By Katherine Zaoral (Vauxoo)
-
[FIX] solucionado error de indexacion en el test case 8.12 (IndexError: list index out of range)
- 826. By Katherine Zaoral (Vauxoo)
-
[FIX] eliminadas lineas relativas al campo 'sale_ids', no esta definido. este campo fue borrado de 'account_invoice' en fiscal requirements en la revion 499 de la localizacion
Preview Diff
1 | === modified file 'l10n_ve_fiscal_requirements/model/invoice.py' | |||
2 | --- l10n_ve_fiscal_requirements/model/invoice.py 2012-12-04 21:56:01 +0000 | |||
3 | +++ l10n_ve_fiscal_requirements/model/invoice.py 2013-01-11 18:35:30 +0000 | |||
4 | @@ -79,22 +79,6 @@ | |||
5 | 79 | _constraints = [ | 79 | _constraints = [ |
6 | 80 | (_unique_invoice_per_partner, _('The Document you have been entering for this Partner has already been recorded'),['Control Number (nro_ctrl)','Reference (reference)']), | 80 | (_unique_invoice_per_partner, _('The Document you have been entering for this Partner has already been recorded'),['Control Number (nro_ctrl)','Reference (reference)']), |
7 | 81 | ] | 81 | ] |
8 | 82 | |||
9 | 83 | def _refund_cleanup_lines(self, cr, uid, lines): | ||
10 | 84 | """ | ||
11 | 85 | Method created to clean invoice lines | ||
12 | 86 | """ | ||
13 | 87 | for line in lines: | ||
14 | 88 | del line['id'] | ||
15 | 89 | del line['invoice_id'] | ||
16 | 90 | #TODO Verify one more elegant way to do this | ||
17 | 91 | for field in ('company_id', 'partner_id', 'account_id', 'product_id', | ||
18 | 92 | 'uos_id', 'account_analytic_id', 'tax_code_id', 'base_code_id', | ||
19 | 93 | "concept_id","tax_id"): | ||
20 | 94 | line[field] = line.get(field, False) and line[field][0] | ||
21 | 95 | if 'invoice_line_tax_id' in line: | ||
22 | 96 | line['invoice_line_tax_id'] = [(6,0, line.get('invoice_line_tax_id', [])) ] | ||
23 | 97 | return map(lambda x: (0,0,x), lines) | ||
24 | 98 | 82 | ||
25 | 99 | def copy(self, cr, uid, id, default={}, context=None): | 83 | def copy(self, cr, uid, id, default={}, context=None): |
26 | 100 | if context is None: | 84 | if context is None: |
27 | @@ -108,4 +92,13 @@ | |||
28 | 108 | account_invoice() | 92 | account_invoice() |
29 | 109 | 93 | ||
30 | 110 | 94 | ||
31 | 95 | class account_invoice_tax(osv.osv): | ||
32 | 96 | _inherit = 'account.invoice.tax' | ||
33 | 97 | _columns = { | ||
34 | 98 | 'tax_id': fields.many2one('account.tax', 'Tax', required=False, ondelete='set null', | ||
35 | 99 | help="Tax relation to original tax, to be able to take off all data from invoices."), | ||
36 | 100 | } | ||
37 | 101 | |||
38 | 102 | account_invoice_tax() | ||
39 | 103 | |||
40 | 111 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: | 104 | # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
41 | 112 | 105 | ||
42 | === modified file 'l10n_ve_fiscal_requirements/test/fr_damaged.yml' | |||
43 | --- l10n_ve_fiscal_requirements/test/fr_damaged.yml 2012-09-26 16:20:44 +0000 | |||
44 | +++ l10n_ve_fiscal_requirements/test/fr_damaged.yml 2013-01-11 18:35:30 +0000 | |||
45 | @@ -19,11 +19,9 @@ | |||
46 | 19 | company_id: base.main_company | 19 | company_id: base.main_company |
47 | 20 | currency_id: base.EUR | 20 | currency_id: base.EUR |
48 | 21 | date_invoice: !eval time.strftime('%Y-%m-%d') | 21 | date_invoice: !eval time.strftime('%Y-%m-%d') |
49 | 22 | address_contact_id: base.res_partner_address_3 | ||
50 | 23 | address_invoice_id: base.res_partner_address_3 | ||
51 | 24 | account_id: account.a_recv | 22 | account_id: account.a_recv |
52 | 25 | invoice_line: | 23 | invoice_line: |
54 | 26 | - product_id: product.product_product_pc2 | 24 | - product_id: product.product_product_3 |
55 | 27 | quantity: 5 | 25 | quantity: 5 |
56 | 28 | uos_id: product.product_uom_unit | 26 | uos_id: product.product_uom_unit |
57 | 29 | price_unit: 20 | 27 | price_unit: 20 |
58 | 30 | 28 | ||
59 | === modified file 'l10n_ve_fiscal_requirements/test/fr_purchase_test.yml' | |||
60 | --- l10n_ve_fiscal_requirements/test/fr_purchase_test.yml 2012-09-26 16:20:44 +0000 | |||
61 | +++ l10n_ve_fiscal_requirements/test/fr_purchase_test.yml 2013-01-11 18:35:30 +0000 | |||
62 | @@ -10,7 +10,7 @@ | |||
63 | 10 | date_invoice: !eval time.strftime('%Y-%m-%d') | 10 | date_invoice: !eval time.strftime('%Y-%m-%d') |
64 | 11 | account_id: account.a_recv | 11 | account_id: account.a_recv |
65 | 12 | invoice_line: | 12 | invoice_line: |
67 | 13 | - product_id: product.product_product_pc1 | 13 | - product_id: product.product_product_4 |
68 | 14 | quantity: 3 | 14 | quantity: 3 |
69 | 15 | uos_id: product.product_uom_unit | 15 | uos_id: product.product_uom_unit |
70 | 16 | price_unit: 3 | 16 | price_unit: 3 |
71 | @@ -18,7 +18,7 @@ | |||
72 | 18 | account_id: account.a_sale | 18 | account_id: account.a_sale |
73 | 19 | invoice_line_tax_id: | 19 | invoice_line_tax_id: |
74 | 20 | - iva_purchase1 | 20 | - iva_purchase1 |
76 | 21 | - product_id: product.product_product_pc2 | 21 | - product_id: product.product_product_3 |
77 | 22 | quantity: 5 | 22 | quantity: 5 |
78 | 23 | uos_id: product.product_uom_unit | 23 | uos_id: product.product_uom_unit |
79 | 24 | price_unit: 2 | 24 | price_unit: 2 |
80 | 25 | 25 | ||
81 | === modified file 'l10n_ve_fiscal_requirements/test/fr_refund_note.yml' | |||
82 | --- l10n_ve_fiscal_requirements/test/fr_refund_note.yml 2012-09-26 16:20:44 +0000 | |||
83 | +++ l10n_ve_fiscal_requirements/test/fr_refund_note.yml 2013-01-11 18:35:30 +0000 | |||
84 | @@ -8,11 +8,9 @@ | |||
85 | 8 | company_id: base.main_company | 8 | company_id: base.main_company |
86 | 9 | currency_id: base.EUR | 9 | currency_id: base.EUR |
87 | 10 | date_invoice: !eval time.strftime('%Y-%m-%d') | 10 | date_invoice: !eval time.strftime('%Y-%m-%d') |
88 | 11 | address_contact_id: base.res_partner_address_3 | ||
89 | 12 | address_invoice_id: base.res_partner_address_3 | ||
90 | 13 | account_id: account.a_recv | 11 | account_id: account.a_recv |
91 | 14 | invoice_line: | 12 | invoice_line: |
93 | 15 | - product_id: product.product_product_pc2 | 13 | - product_id: product.product_product_3 |
94 | 16 | quantity: 5 | 14 | quantity: 5 |
95 | 17 | uos_id: product.product_uom_unit | 15 | uos_id: product.product_uom_unit |
96 | 18 | price_unit: 20 | 16 | price_unit: 20 |
97 | @@ -105,10 +103,10 @@ | |||
98 | 105 | for line in rf_brw.invoice_line: | 103 | for line in rf_brw.invoice_line: |
99 | 106 | for tax in line.invoice_line_tax_id: | 104 | for tax in line.invoice_line_tax_id: |
100 | 107 | tax1.append(tax.id) | 105 | tax1.append(tax.id) |
102 | 108 | rf_brw = self.browse(cr, uid, ai_id[0]) | 106 | rf_brw = ai_id and self.browse(cr, uid, ai_id[0]) |
103 | 109 | tax2 = [] | 107 | tax2 = [] |
104 | 110 | whc2 = [] | 108 | whc2 = [] |
106 | 111 | for line in rf_brw.invoice_line: | 109 | for line in rf_brw and rf_brw.invoice_line: |
107 | 112 | for tax in line.invoice_line_tax_id: | 110 | for tax in line.invoice_line_tax_id: |
108 | 113 | tax2.append(tax.id) | 111 | tax2.append(tax.id) |
109 | 114 | tax1 = set(tax1) | 112 | tax1 = set(tax1) |
110 | @@ -126,11 +124,9 @@ | |||
111 | 126 | company_id: base.main_company | 124 | company_id: base.main_company |
112 | 127 | currency_id: base.EUR | 125 | currency_id: base.EUR |
113 | 128 | date_invoice: !eval time.strftime('%Y-%m-%d') | 126 | date_invoice: !eval time.strftime('%Y-%m-%d') |
114 | 129 | address_contact_id: base.res_partner_address_3 | ||
115 | 130 | address_invoice_id: base.res_partner_address_3 | ||
116 | 131 | account_id: account.a_recv | 127 | account_id: account.a_recv |
117 | 132 | invoice_line: | 128 | invoice_line: |
119 | 133 | - product_id: product.product_product_pc2 | 129 | - product_id: product.product_product_3 |
120 | 134 | quantity: 5 | 130 | quantity: 5 |
121 | 135 | uos_id: product.product_uom_unit | 131 | uos_id: product.product_uom_unit |
122 | 136 | price_unit: 20 | 132 | price_unit: 20 |
123 | @@ -232,11 +228,9 @@ | |||
124 | 232 | company_id: base.main_company | 228 | company_id: base.main_company |
125 | 233 | currency_id: base.EUR | 229 | currency_id: base.EUR |
126 | 234 | date_invoice: !eval time.strftime('%Y-%m-%d') | 230 | date_invoice: !eval time.strftime('%Y-%m-%d') |
127 | 235 | address_contact_id: base.res_partner_address_3 | ||
128 | 236 | address_invoice_id: base.res_partner_address_3 | ||
129 | 237 | account_id: account.a_recv | 231 | account_id: account.a_recv |
130 | 238 | invoice_line: | 232 | invoice_line: |
132 | 239 | - product_id: product.product_product_pc2 | 233 | - product_id: product.product_product_4 |
133 | 240 | quantity: 5 | 234 | quantity: 5 |
134 | 241 | uos_id: product.product_uom_unit | 235 | uos_id: product.product_uom_unit |
135 | 242 | price_unit: 20 | 236 | price_unit: 20 |
136 | 243 | 237 | ||
137 | === modified file 'l10n_ve_fiscal_requirements/test/fr_sale_test.yml' | |||
138 | --- l10n_ve_fiscal_requirements/test/fr_sale_test.yml 2012-09-26 16:20:44 +0000 | |||
139 | +++ l10n_ve_fiscal_requirements/test/fr_sale_test.yml 2013-01-11 18:35:30 +0000 | |||
140 | @@ -8,11 +8,9 @@ | |||
141 | 8 | company_id: base.main_company | 8 | company_id: base.main_company |
142 | 9 | currency_id: base.EUR | 9 | currency_id: base.EUR |
143 | 10 | date_invoice: !eval time.strftime('%Y-%m-%d') | 10 | date_invoice: !eval time.strftime('%Y-%m-%d') |
144 | 11 | address_contact_id: base.res_partner_address_3 | ||
145 | 12 | address_invoice_id: base.res_partner_address_3 | ||
146 | 13 | account_id: account.a_recv | 11 | account_id: account.a_recv |
147 | 14 | invoice_line: | 12 | invoice_line: |
149 | 15 | - product_id: product.product_product_pc2 | 13 | - product_id: product.product_product_3 |
150 | 16 | quantity: 5 | 14 | quantity: 5 |
151 | 17 | uos_id: product.product_uom_unit | 15 | uos_id: product.product_uom_unit |
152 | 18 | price_unit: 20 | 16 | price_unit: 20 |
153 | 19 | 17 | ||
154 | === modified file 'l10n_ve_fiscal_requirements/test/fr_vat_test.yml' | |||
155 | --- l10n_ve_fiscal_requirements/test/fr_vat_test.yml 2012-09-26 21:08:18 +0000 | |||
156 | +++ l10n_ve_fiscal_requirements/test/fr_vat_test.yml 2013-01-11 18:35:30 +0000 | |||
157 | @@ -1,15 +1,6 @@ | |||
158 | 1 | - | 1 | - |
159 | 2 | 5. Fiscal requirements Vat tests | 2 | 5. Fiscal requirements Vat tests |
160 | 3 | - | 3 | - |
161 | 4 | 5.1 Add address | ||
162 | 5 | - | ||
163 | 6 | !record {model: res.partner.address, id: test_fr_add01}: | ||
164 | 7 | type: invoice | ||
165 | 8 | street: Av Siempre Viva | ||
166 | 9 | phone: "(555) 5555555" | ||
167 | 10 | fax: "(555) 1111111" | ||
168 | 11 | email: fakemail@example.com | ||
169 | 12 | - | ||
170 | 13 | 5.2 I try to create a partner with wrong vat | 4 | 5.2 I try to create a partner with wrong vat |
171 | 14 | - | 5 | - |
172 | 15 | !python {model: res.partner}: | | 6 | !python {model: res.partner}: | |
173 | @@ -19,7 +10,11 @@ | |||
174 | 19 | 'supplier': True, | 10 | 'supplier': True, |
175 | 20 | 'customer': True, | 11 | 'customer': True, |
176 | 21 | 'vat': 'VEV333', | 12 | 'vat': 'VEV333', |
178 | 22 | 'address':[(6, 0, [ref("test_fr_add01")])] | 13 | 'type': 'invoice', |
179 | 14 | 'street': 'Av Siempre Viva', | ||
180 | 15 | 'phone': "(555) 5555555", | ||
181 | 16 | 'fax': "(555) 1111111", | ||
182 | 17 | 'email': 'fakemail@example.com', | ||
183 | 23 | } | 18 | } |
184 | 24 | part_id = False | 19 | part_id = False |
185 | 25 | try: | 20 | try: |
186 | @@ -46,7 +41,11 @@ | |||
187 | 46 | 'supplier': True, | 41 | 'supplier': True, |
188 | 47 | 'customer': True, | 42 | 'customer': True, |
189 | 48 | 'vat': 'VEJ112223330', | 43 | 'vat': 'VEJ112223330', |
191 | 49 | 'address': [(6, 0, [ref("test_fr_add01")])], | 44 | 'type': 'invoice', |
192 | 45 | 'street': 'Av Siempre Viva', | ||
193 | 46 | 'phone': "(555) 5555555", | ||
194 | 47 | 'fax': "(555) 1111111", | ||
195 | 48 | 'email': 'fakemail@example.com', | ||
196 | 50 | } | 49 | } |
197 | 51 | part_id = self.create(cr, uid, part) | 50 | part_id = self.create(cr, uid, part) |
198 | 52 | assert part_id, 'Partner should be created' | 51 | assert part_id, 'Partner should be created' |
199 | @@ -60,7 +59,11 @@ | |||
200 | 60 | 'supplier': True, | 59 | 'supplier': True, |
201 | 61 | 'customer': True, | 60 | 'customer': True, |
202 | 62 | 'vat': 'VEJ112223330', | 61 | 'vat': 'VEJ112223330', |
204 | 63 | 'address': [(6, 0, [ref("test_fr_add01")])], | 62 | 'type': 'invoice', |
205 | 63 | 'street': 'Av Siempre Viva', | ||
206 | 64 | 'phone': "(555) 5555555", | ||
207 | 65 | 'fax': "(555) 1111111", | ||
208 | 66 | 'email': 'fakemail@example.com', | ||
209 | 64 | } | 67 | } |
210 | 65 | try: | 68 | try: |
211 | 66 | rollback = cr.rollback | 69 | rollback = cr.rollback |
212 | @@ -86,7 +89,11 @@ | |||
213 | 86 | 'supplier': True, | 89 | 'supplier': True, |
214 | 87 | 'customer': True, | 90 | 'customer': True, |
215 | 88 | 'vat': 'VEJ223334445', | 91 | 'vat': 'VEJ223334445', |
217 | 89 | 'address': [(6, 0, [ref("test_fr_add01")])], | 92 | 'type': 'invoice', |
218 | 93 | 'street': 'Av Siempre Viva', | ||
219 | 94 | 'phone': "(555) 5555555", | ||
220 | 95 | 'fax': "(555) 1111111", | ||
221 | 96 | 'email': 'fakemail@example.com', | ||
222 | 90 | } | 97 | } |
223 | 91 | try: | 98 | try: |
224 | 92 | rollback = cr.rollback | 99 | rollback = cr.rollback |
225 | 93 | 100 | ||
226 | === modified file 'l10n_ve_fiscal_requirements/view/account_inv_refund_nctrl_view.xml' | |||
227 | --- l10n_ve_fiscal_requirements/view/account_inv_refund_nctrl_view.xml 2012-11-06 22:01:07 +0000 | |||
228 | +++ l10n_ve_fiscal_requirements/view/account_inv_refund_nctrl_view.xml 2013-01-11 18:35:30 +0000 | |||
229 | @@ -5,7 +5,6 @@ | |||
230 | 5 | <record id="view_account_inv_nctrl_refund" model="ir.ui.view"> | 5 | <record id="view_account_inv_nctrl_refund" model="ir.ui.view"> |
231 | 6 | <field name="name">account.inv.nctrl.refund.form</field> | 6 | <field name="name">account.inv.nctrl.refund.form</field> |
232 | 7 | <field name="model">account.invoice.refund</field> | 7 | <field name="model">account.invoice.refund</field> |
233 | 8 | <field name="type">form</field> | ||
234 | 9 | <field name="inherit_id" ref="account.view_account_invoice_refund"/> | 8 | <field name="inherit_id" ref="account.view_account_invoice_refund"/> |
235 | 10 | <field name="arch" type="xml"> | 9 | <field name="arch" type="xml"> |
236 | 11 | <xpath expr="//field[@name='period']" position="after"> | 10 | <xpath expr="//field[@name='period']" position="after"> |
237 | 12 | 11 | ||
238 | === modified file 'l10n_ve_fiscal_requirements/view/account_invoice_view.xml' | |||
239 | --- l10n_ve_fiscal_requirements/view/account_invoice_view.xml 2012-12-04 22:37:47 +0000 | |||
240 | +++ l10n_ve_fiscal_requirements/view/account_invoice_view.xml 2013-01-11 18:35:30 +0000 | |||
241 | @@ -10,7 +10,6 @@ | |||
242 | 10 | <record id="account_invoice_ext_view_form_loc_ve" model="ir.ui.view"> | 10 | <record id="account_invoice_ext_view_form_loc_ve" model="ir.ui.view"> |
243 | 11 | <field name="name">invoice_extended.account.invoice.form.loc_ve</field> | 11 | <field name="name">invoice_extended.account.invoice.form.loc_ve</field> |
244 | 12 | <field name="model">account.invoice</field> | 12 | <field name="model">account.invoice</field> |
245 | 13 | <field name="type">form</field> | ||
246 | 14 | <field name="inherit_id" ref="account.invoice_form"/> | 13 | <field name="inherit_id" ref="account.invoice_form"/> |
247 | 15 | <field name="arch" type="xml"> | 14 | <field name="arch" type="xml"> |
248 | 16 | <xpath expr="//field[@name='date_invoice']" position="replace"> | 15 | <xpath expr="//field[@name='date_invoice']" position="replace"> |
249 | @@ -91,7 +90,6 @@ | |||
250 | 91 | <record id="account_inv_ext_view_tree_crdr" model="ir.ui.view"> | 90 | <record id="account_inv_ext_view_tree_crdr" model="ir.ui.view"> |
251 | 92 | <field name="name">invoice_extended.tree.crdr</field> | 91 | <field name="name">invoice_extended.tree.crdr</field> |
252 | 93 | <field name="model">account.invoice</field> | 92 | <field name="model">account.invoice</field> |
253 | 94 | <field name="type">tree</field> | ||
254 | 95 | <field name="inherit_id" ref="account.invoice_tree"/> | 93 | <field name="inherit_id" ref="account.invoice_tree"/> |
255 | 96 | <field name="arch" type="xml"> | 94 | <field name="arch" type="xml"> |
256 | 97 | <xpath expr="//field[@name='origin']" position="after"> | 95 | <xpath expr="//field[@name='origin']" position="after"> |
257 | @@ -109,7 +107,6 @@ | |||
258 | 109 | <record id="account_invoice_ext_view_supp_form_loc_ve" model="ir.ui.view"> | 107 | <record id="account_invoice_ext_view_supp_form_loc_ve" model="ir.ui.view"> |
259 | 110 | <field name="name">invoice_extended.account.invoice.supplier.form.loc_ve</field> | 108 | <field name="name">invoice_extended.account.invoice.supplier.form.loc_ve</field> |
260 | 111 | <field name="model">account.invoice</field> | 109 | <field name="model">account.invoice</field> |
261 | 112 | <field name="type">form</field> | ||
262 | 113 | <field name="inherit_id" ref="account.invoice_supplier_form"/> | 110 | <field name="inherit_id" ref="account.invoice_supplier_form"/> |
263 | 114 | <field name="arch" type="xml"> | 111 | <field name="arch" type="xml"> |
264 | 115 | <xpath expr="//field[@name='date_invoice']" position="replace"> | 112 | <xpath expr="//field[@name='date_invoice']" position="replace"> |
265 | 116 | 113 | ||
266 | === modified file 'l10n_ve_fiscal_requirements/view/account_tax_view.xml' | |||
267 | --- l10n_ve_fiscal_requirements/view/account_tax_view.xml 2012-11-07 21:33:58 +0000 | |||
268 | +++ l10n_ve_fiscal_requirements/view/account_tax_view.xml 2013-01-11 18:35:30 +0000 | |||
269 | @@ -13,7 +13,6 @@ | |||
270 | 13 | <record id="account_tax_applicability_2" model="ir.ui.view"> | 13 | <record id="account_tax_applicability_2" model="ir.ui.view"> |
271 | 14 | <field name="name">account.tax.applicability</field> | 14 | <field name="name">account.tax.applicability</field> |
272 | 15 | <field name="model">account.tax</field> | 15 | <field name="model">account.tax</field> |
273 | 16 | <field name="type">form</field> | ||
274 | 17 | <field name="inherit_id" ref="account.view_tax_form"/> | 16 | <field name="inherit_id" ref="account.view_tax_form"/> |
275 | 18 | <field name="arch" type="xml"> | 17 | <field name="arch" type="xml"> |
276 | 19 | <xpath expr="//field[@name='active']" position="after"> | 18 | <xpath expr="//field[@name='active']" position="after"> |
277 | 20 | 19 | ||
278 | === modified file 'l10n_ve_fiscal_requirements/view/l10n_ut_view.xml' | |||
279 | --- l10n_ve_fiscal_requirements/view/l10n_ut_view.xml 2012-11-06 22:01:07 +0000 | |||
280 | +++ l10n_ve_fiscal_requirements/view/l10n_ut_view.xml 2013-01-11 18:35:30 +0000 | |||
281 | @@ -5,7 +5,6 @@ | |||
282 | 5 | <record id="view_l10n_ut_filter" model="ir.ui.view"> | 5 | <record id="view_l10n_ut_filter" model="ir.ui.view"> |
283 | 6 | <field name="name">l10n.ut.search</field> | 6 | <field name="name">l10n.ut.search</field> |
284 | 7 | <field name="model">l10n.ut</field> | 7 | <field name="model">l10n.ut</field> |
285 | 8 | <field name="type">search</field> | ||
286 | 9 | <field name="arch" type="xml"> | 8 | <field name="arch" type="xml"> |
287 | 10 | <search string="Search Tax Unit" version="7.0"> | 9 | <search string="Search Tax Unit" version="7.0"> |
288 | 11 | <group col="10" colspan="4"> | 10 | <group col="10" colspan="4"> |
289 | @@ -24,7 +23,6 @@ | |||
290 | 24 | <record model="ir.ui.view" id="view_l10n_ut_form"> | 23 | <record model="ir.ui.view" id="view_l10n_ut_form"> |
291 | 25 | <field name="name">l10n.ut.form</field> | 24 | <field name="name">l10n.ut.form</field> |
292 | 26 | <field name="model">l10n.ut</field> | 25 | <field name="model">l10n.ut</field> |
293 | 27 | <field name="type">form</field> | ||
294 | 28 | <field name="arch" type="xml"> | 26 | <field name="arch" type="xml"> |
295 | 29 | <form string="Tax Unit" version="7.0"> | 27 | <form string="Tax Unit" version="7.0"> |
296 | 30 | <group col="6" colspan="4"> | 28 | <group col="6" colspan="4"> |
297 | @@ -39,7 +37,6 @@ | |||
298 | 39 | <record model="ir.ui.view" id="view_l10n_ut_tree"> | 37 | <record model="ir.ui.view" id="view_l10n_ut_tree"> |
299 | 40 | <field name="name">l10n.ut.tree</field> | 38 | <field name="name">l10n.ut.tree</field> |
300 | 41 | <field name="model">l10n.ut</field> | 39 | <field name="model">l10n.ut</field> |
301 | 42 | <field name="type">tree</field> | ||
302 | 43 | <field name="arch" type="xml"> | 40 | <field name="arch" type="xml"> |
303 | 44 | <tree string="Tax Unit per date" editable="top"> | 41 | <tree string="Tax Unit per date" editable="top"> |
304 | 45 | <field name="name"/> | 42 | <field name="name"/> |
305 | 46 | 43 | ||
306 | === modified file 'l10n_ve_fiscal_requirements/view/partner_view.xml' | |||
307 | --- l10n_ve_fiscal_requirements/view/partner_view.xml 2012-12-09 23:00:04 +0000 | |||
308 | +++ l10n_ve_fiscal_requirements/view/partner_view.xml 2013-01-11 18:35:30 +0000 | |||
309 | @@ -5,7 +5,6 @@ | |||
310 | 5 | <record id="view_partner_form2" model="ir.ui.view"> | 5 | <record id="view_partner_form2" model="ir.ui.view"> |
311 | 6 | <field name="name">res.partner.vat.inherit2</field> | 6 | <field name="name">res.partner.vat.inherit2</field> |
312 | 7 | <field name="model">res.partner</field> | 7 | <field name="model">res.partner</field> |
313 | 8 | <field name="type">form</field> | ||
314 | 9 | <field name="inherit_id" ref="base.view_partner_form"/> | 8 | <field name="inherit_id" ref="base.view_partner_form"/> |
315 | 10 | <field name="arch" type="xml"> | 9 | <field name="arch" type="xml"> |
316 | 11 | 10 | ||
317 | 12 | 11 | ||
318 | === modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_debit.py' | |||
319 | --- l10n_ve_fiscal_requirements/wizard/account_invoice_debit.py 2012-12-04 19:17:53 +0000 | |||
320 | +++ l10n_ve_fiscal_requirements/wizard/account_invoice_debit.py 2013-01-11 18:35:30 +0000 | |||
321 | @@ -81,19 +81,6 @@ | |||
322 | 81 | res['fields'][field]['selection'] = journal_select | 81 | res['fields'][field]['selection'] = journal_select |
323 | 82 | return res | 82 | return res |
324 | 83 | 83 | ||
325 | 84 | def _get_period(self, cr, uid, context=None): | ||
326 | 85 | """ | ||
327 | 86 | Return default account period value | ||
328 | 87 | """ | ||
329 | 88 | if context is None: | ||
330 | 89 | context = {} | ||
331 | 90 | account_period_obj = self.pool.get('account.period') | ||
332 | 91 | ids = account_period_obj.find(cr, uid, context=context) | ||
333 | 92 | period_id = False | ||
334 | 93 | if ids: | ||
335 | 94 | period_id = ids[0] | ||
336 | 95 | return period_id | ||
337 | 96 | |||
338 | 97 | def _get_orig(self, cr, uid, inv, ref, context=None): | 84 | def _get_orig(self, cr, uid, inv, ref, context=None): |
339 | 98 | """ | 85 | """ |
340 | 99 | Return default origin value | 86 | Return default origin value |
341 | @@ -130,45 +117,39 @@ | |||
342 | 130 | date = False | 117 | date = False |
343 | 131 | period = False | 118 | period = False |
344 | 132 | description = False | 119 | description = False |
346 | 133 | company = res_users_obj.browse(cr, uid, uid, context=context).company_id | 120 | |
347 | 134 | journal_id = form.journal_id and form.journal_id.id or False | 121 | journal_id = form.journal_id and form.journal_id.id or False |
348 | 135 | inv = inv_obj.browse(cr, uid, context.get('active_ids')[0], context=context) | 122 | inv = inv_obj.browse(cr, uid, context.get('active_ids')[0], context=context) |
349 | 123 | #~ TODOK: no seria mejor ids=context.get(active_id) | ||
350 | 124 | |||
351 | 125 | company_id = inv.company_id.id | ||
352 | 126 | context.update({'company_id':company_id}) | ||
353 | 127 | |||
354 | 136 | if inv.state in ['draft', 'proforma2', 'cancel']: | 128 | if inv.state in ['draft', 'proforma2', 'cancel']: |
355 | 137 | raise osv.except_osv(_('Error !'), _('Can not create a debit note from draft/proforma/cancel invoice.')) | 129 | raise osv.except_osv(_('Error !'), _('Can not create a debit note from draft/proforma/cancel invoice.')) |
356 | 138 | if inv.reconciled in ('cancel', 'modify'): | 130 | if inv.reconciled in ('cancel', 'modify'): |
357 | 139 | raise osv.except_osv(_('Error !'), _('Can not create a debit note from invoice which is already reconciled, invoice should be unreconciled first. You can only Refund or Debit this invoice')) | 131 | raise osv.except_osv(_('Error !'), _('Can not create a debit note from invoice which is already reconciled, invoice should be unreconciled first. You can only Refund or Debit this invoice')) |
358 | 140 | if inv.type not in ['in_invoice', 'out_invoice']: | 132 | if inv.type not in ['in_invoice', 'out_invoice']: |
359 | 141 | raise osv.except_osv(_('Error !'), _('Can not make a debit note on a refund invoice.')) | 133 | raise osv.except_osv(_('Error !'), _('Can not make a debit note on a refund invoice.')) |
360 | 134 | |||
361 | 135 | #Check for the form fields | ||
362 | 136 | |||
363 | 142 | if form.period: | 137 | if form.period: |
364 | 143 | period = form.period.id | 138 | period = form.period.id |
365 | 144 | else: | 139 | else: |
366 | 145 | #Take period from the current date | 140 | #Take period from the current date |
369 | 146 | #period = inv.period_id and inv.period_id.id or False | 141 | period = self.pool.get('account.period').find(cr, uid, context=context) |
370 | 147 | period = self._get_period(cr, uid, context) | 142 | period = period and period[0] or False |
371 | 143 | if not period: | ||
372 | 144 | raise osv.except_osv(_('No Pediod Defined'), \ | ||
373 | 145 | _('You have been left empty the period field that automatically fill with the current period. However there is not period defined for the current company. Please check in Accounting/Configuration/Periods')) | ||
374 | 146 | self.write(cr, uid, ids, {'period': period }, context=context) | ||
375 | 148 | 147 | ||
376 | 149 | if not journal_id: | 148 | if not journal_id: |
377 | 150 | journal_id = inv.journal_id.id | 149 | journal_id = inv.journal_id.id |
378 | 151 | 150 | ||
379 | 152 | if form.date: | 151 | if form.date: |
380 | 153 | date = form.date | 152 | date = form.date |
381 | 154 | if not form.period.id: | ||
382 | 155 | cr.execute("select name from ir_model_fields \ | ||
383 | 156 | where model = 'account.period' \ | ||
384 | 157 | and name = 'company_id'") | ||
385 | 158 | result_query = cr.fetchone() | ||
386 | 159 | if result_query: | ||
387 | 160 | #in multi company mode | ||
388 | 161 | cr.execute("""select p.id from account_fiscalyear y, account_period p where y.id=p.fiscalyear_id \ | ||
389 | 162 | and date(%s) between p.date_start AND p.date_stop and y.company_id = %s limit 1""", (date, company.id,)) | ||
390 | 163 | else: | ||
391 | 164 | #in mono company mode | ||
392 | 165 | cr.execute("""SELECT id | ||
393 | 166 | from account_period where date(%s) | ||
394 | 167 | between date_start AND date_stop \ | ||
395 | 168 | limit 1 """, (date,)) | ||
396 | 169 | res = cr.fetchone() | ||
397 | 170 | if res: | ||
398 | 171 | period = res[0] | ||
399 | 172 | else: | 153 | else: |
400 | 173 | #Take current date | 154 | #Take current date |
401 | 174 | #date = inv.date_invoice | 155 | #date = inv.date_invoice |
402 | @@ -178,10 +159,6 @@ | |||
403 | 178 | else: | 159 | else: |
404 | 179 | description = inv.name | 160 | description = inv.name |
405 | 180 | 161 | ||
406 | 181 | if not period: | ||
407 | 182 | raise osv.except_osv(_('Data Insufficient !'), \ | ||
408 | 183 | _('No Period found on Invoice!')) | ||
409 | 184 | |||
410 | 185 | #we get original data of invoice to create a new invoice that is the copy of the original | 162 | #we get original data of invoice to create a new invoice that is the copy of the original |
411 | 186 | invoice = inv_obj.read(cr, uid, [inv.id], | 163 | invoice = inv_obj.read(cr, uid, [inv.id], |
412 | 187 | ['name', 'type', 'number', 'reference', | 164 | ['name', 'type', 'number', 'reference', |
413 | 188 | 165 | ||
414 | === modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_debit_view.xml' | |||
415 | --- l10n_ve_fiscal_requirements/wizard/account_invoice_debit_view.xml 2012-11-06 22:01:07 +0000 | |||
416 | +++ l10n_ve_fiscal_requirements/wizard/account_invoice_debit_view.xml 2013-01-11 18:35:30 +0000 | |||
417 | @@ -5,7 +5,6 @@ | |||
418 | 5 | <record id="view_account_invoice_debit" model="ir.ui.view"> | 5 | <record id="view_account_invoice_debit" model="ir.ui.view"> |
419 | 6 | <field name="name">account.invoice.debit.form</field> | 6 | <field name="name">account.invoice.debit.form</field> |
420 | 7 | <field name="model">account.invoice.debit</field> | 7 | <field name="model">account.invoice.debit</field> |
421 | 8 | <field name="type">form</field> | ||
422 | 9 | <field name="arch" type="xml"> | 8 | <field name="arch" type="xml"> |
423 | 10 | <form string="Debit Note" version="7.0"> | 9 | <form string="Debit Note" version="7.0"> |
424 | 11 | <separator string="Debit Note Options" colspan="4"/> | 10 | <separator string="Debit Note Options" colspan="4"/> |
425 | 12 | 11 | ||
426 | === modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_parent_view.xml' | |||
427 | --- l10n_ve_fiscal_requirements/wizard/account_invoice_parent_view.xml 2011-11-10 15:21:35 +0000 | |||
428 | +++ l10n_ve_fiscal_requirements/wizard/account_invoice_parent_view.xml 2013-01-11 18:35:30 +0000 | |||
429 | @@ -5,7 +5,6 @@ | |||
430 | 5 | <record id="view_account_invoice_parent" model="ir.ui.view"> | 5 | <record id="view_account_invoice_parent" model="ir.ui.view"> |
431 | 6 | <field name="name">account.invoice.parent.form</field> | 6 | <field name="name">account.invoice.parent.form</field> |
432 | 7 | <field name="model">account.invoice.parent</field> | 7 | <field name="model">account.invoice.parent</field> |
433 | 8 | <field name="type">form</field> | ||
434 | 9 | <field name="arch" type="xml"> | 8 | <field name="arch" type="xml"> |
435 | 10 | <form string="Debit Note"> | 9 | <form string="Debit Note"> |
436 | 11 | <separator string="Debit Note Options" colspan="4"/> | 10 | <separator string="Debit Note Options" colspan="4"/> |
437 | 12 | 11 | ||
438 | === modified file 'l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py' | |||
439 | --- l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py 2012-11-07 15:19:17 +0000 | |||
440 | +++ l10n_ve_fiscal_requirements/wizard/account_invoice_refund.py 2013-01-11 18:35:30 +0000 | |||
441 | @@ -79,21 +79,6 @@ | |||
442 | 79 | res['fields'][field]['selection'] = journal_select | 79 | res['fields'][field]['selection'] = journal_select |
443 | 80 | return res | 80 | return res |
444 | 81 | 81 | ||
445 | 82 | def _get_period(self, cr, uid, context={}): | ||
446 | 83 | """ | ||
447 | 84 | Return default account period value | ||
448 | 85 | """ | ||
449 | 86 | period_id= False | ||
450 | 87 | if context.get('active_id',False): | ||
451 | 88 | invo_obj = self.pool.get('account.invoice') | ||
452 | 89 | invo_brw = invo_obj.browse(cr,uid,context.get('active_id'),{}) | ||
453 | 90 | period_id = invo_brw and invo_brw.period_id and invo_brw.period_id.id | ||
454 | 91 | return period_id | ||
455 | 92 | |||
456 | 93 | |||
457 | 94 | |||
458 | 95 | return period_id | ||
459 | 96 | |||
460 | 97 | def _get_orig(self, cr, uid, inv, ref, context={}): | 82 | def _get_orig(self, cr, uid, inv, ref, context={}): |
461 | 98 | """ | 83 | """ |
462 | 99 | Return default origin value | 84 | Return default origin value |
463 | @@ -165,8 +150,15 @@ | |||
464 | 165 | raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode)) | 150 | raise osv.except_osv(_('Error !'), _('Can not %s draft/proforma/cancel invoice.') % (mode)) |
465 | 166 | if inv.reconciled and mode in ('cancel', 'modify'): | 151 | if inv.reconciled and mode in ('cancel', 'modify'): |
466 | 167 | raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode)) | 152 | raise osv.except_osv(_('Error !'), _('Can not %s invoice which is already reconciled, invoice should be unreconciled first. You can only Refund this invoice') % (mode)) |
469 | 168 | #Take period from the current date | 153 | period = form.get('period') and form.get('period')[0] or False |
470 | 169 | period = form.get('period') and form.get('period')[0] or self._get_period(cr, uid, context) | 154 | if not period: |
471 | 155 | #Take period from the current date | ||
472 | 156 | period = self.pool.get('account.period').find(cr, uid, context=context) | ||
473 | 157 | period = period and period[0] or False | ||
474 | 158 | if not period: | ||
475 | 159 | raise osv.except_osv(_('No Pediod Defined'), \ | ||
476 | 160 | _('You have been left empty the period field that automatically fill with the current period. However there is not period defined for the current company. Please check in Accounting/Configuration/Periods')) | ||
477 | 161 | self.write(cr, uid, ids, {'period': period }, context=context) | ||
478 | 170 | 162 | ||
479 | 171 | if not journal_brw: | 163 | if not journal_brw: |
480 | 172 | journal_id = inv.journal_id.id | 164 | journal_id = inv.journal_id.id |
481 | @@ -253,9 +245,10 @@ | |||
482 | 253 | 'journal_id', 'period_id'], context=context) | 245 | 'journal_id', 'period_id'], context=context) |
483 | 254 | invoice = invoice[0] | 246 | invoice = invoice[0] |
484 | 255 | del invoice['id'] | 247 | del invoice['id'] |
486 | 256 | invoice_lines = inv_line_obj.read(cr, uid, invoice['invoice_line'], context=context) | 248 | invoice_lines = inv_line_obj.browse(cr, uid, invoice['invoice_line'], context=context) |
487 | 249 | |||
488 | 257 | invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines) | 250 | invoice_lines = inv_obj._refund_cleanup_lines(cr, uid, invoice_lines) |
490 | 258 | tax_lines = inv_tax_obj.read(cr, uid, invoice['tax_line'], context=context) | 251 | tax_lines = inv_tax_obj.browse(cr, uid, invoice['tax_line'], context=context) |
491 | 259 | tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines) | 252 | tax_lines = inv_obj._refund_cleanup_lines(cr, uid, tax_lines) |
492 | 260 | #Add origin value | 253 | #Add origin value |
493 | 261 | orig = self._get_orig(cr, uid, inv, invoice['reference'], context) | 254 | orig = self._get_orig(cr, uid, inv, invoice['reference'], context) |
494 | @@ -283,12 +276,12 @@ | |||
495 | 283 | 276 | ||
496 | 284 | new_inv_brw = inv_obj.browse(cr,uid,created_inv[1],context=context) | 277 | new_inv_brw = inv_obj.browse(cr,uid,created_inv[1],context=context) |
497 | 285 | inv_obj.write(cr,uid,created_inv[0],{'name':wzd_brw.description,'origin':new_inv_brw.origin},context=context) | 278 | inv_obj.write(cr,uid,created_inv[0],{'name':wzd_brw.description,'origin':new_inv_brw.origin},context=context) |
499 | 286 | inv_obj.write(cr,uid,created_inv[1],{'origin':inv.origin,'description':''},context=context) | 279 | inv_obj.write(cr,uid,created_inv[1],{'origin':inv.origin,'name':wzd_brw.description},context=context) |
500 | 287 | if inv.type in ('out_invoice', 'out_refund'): | 280 | if inv.type in ('out_invoice', 'out_refund'): |
501 | 288 | xml_id = 'action_invoice_tree3' | 281 | xml_id = 'action_invoice_tree3' |
505 | 289 | if hasattr(inv, 'sale_ids'): | 282 | #~ if hasattr(inv, 'sale_ids'): |
506 | 290 | for i in inv.sale_ids: | 283 | #~ for i in inv.sale_ids: |
507 | 291 | cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (i.id, refund_id[0])) | 284 | #~ cr.execute('insert into sale_order_invoice_rel (order_id,invoice_id) values (%s,%s)', (i.id, refund_id[0])) |
508 | 292 | else: | 285 | else: |
509 | 293 | xml_id = 'action_invoice_tree4' | 286 | xml_id = 'action_invoice_tree4' |
510 | 294 | result = mod_obj.get_object_reference(cr, uid, 'account', xml_id) | 287 | result = mod_obj.get_object_reference(cr, uid, 'account', xml_id) |
511 | @@ -300,11 +293,11 @@ | |||
512 | 300 | 293 | ||
513 | 301 | if wzd_brw.filter_refund == 'cancel': | 294 | if wzd_brw.filter_refund == 'cancel': |
514 | 302 | orig = self._get_orig(cr, uid, inv, inv.reference, context) | 295 | orig = self._get_orig(cr, uid, inv, inv.reference, context) |
516 | 303 | inv_obj.write(cr,uid,created_inv[0],{'origin':orig,'description':wzd_brw.description},context=context) | 296 | inv_obj.write(cr,uid,created_inv[0],{'origin':orig,'name':wzd_brw.description},context=context) |
517 | 304 | 297 | ||
518 | 305 | if wzd_brw.filter_refund == 'refund': | 298 | if wzd_brw.filter_refund == 'refund': |
519 | 306 | orig = self._get_orig(cr, uid, inv, inv.reference, context) | 299 | orig = self._get_orig(cr, uid, inv, inv.reference, context) |
521 | 307 | inv_obj.write(cr,uid,created_inv[0],{'origin':inv.origin,'description':wzd_brw.description},context=context) | 300 | inv_obj.write(cr,uid,created_inv[0],{'origin':inv.origin,'name':wzd_brw.description},context=context) |
522 | 308 | return result | 301 | return result |
523 | 309 | 302 | ||
524 | 310 | def validate_total_payment_inv(self, cr, uid, ids, context=None): | 303 | def validate_total_payment_inv(self, cr, uid, ids, context=None): |
525 | @@ -354,7 +347,7 @@ | |||
526 | 354 | if moveline.reconcile_partial_id: | 347 | if moveline.reconcile_partial_id: |
527 | 355 | rec += [moveline.reconcile_partial_id.id] | 348 | rec += [moveline.reconcile_partial_id.id] |
528 | 356 | movelines = moveline_obj.search(cr, uid, [('|'),('reconcile_id','in',rec),('reconcile_partial_id','in',rec)],context=context) | 349 | movelines = moveline_obj.search(cr, uid, [('|'),('reconcile_id','in',rec),('reconcile_partial_id','in',rec)],context=context) |
530 | 357 | for mids in moveline_obj.browse(cr, uid, movelines, ['move_id']): | 350 | for mids in moveline_obj.browse(cr, uid, movelines, context=context): |
531 | 358 | mid +=[mids.move_id.id] | 351 | mid +=[mids.move_id.id] |
532 | 359 | voucherids = voucher_pool.search(cr, uid,[('move_id','in',mid)]) | 352 | voucherids = voucher_pool.search(cr, uid,[('move_id','in',mid)]) |
533 | 360 | if voucherids: | 353 | if voucherids: |
534 | 361 | 354 | ||
535 | === modified file 'l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml' | |||
536 | --- l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml 2012-09-26 21:07:02 +0000 | |||
537 | +++ l10n_ve_fiscal_requirements/wizard/search_info_partner_seniat.xml 2013-01-11 18:35:30 +0000 | |||
538 | @@ -4,7 +4,6 @@ | |||
539 | 4 | <record model="ir.ui.view" id="view_vat_search"> | 4 | <record model="ir.ui.view" id="view_vat_search"> |
540 | 5 | <field name="name">search.info.partner.seniat.form</field> | 5 | <field name="name">search.info.partner.seniat.form</field> |
541 | 6 | <field name="model">search.info.partner.seniat</field> | 6 | <field name="model">search.info.partner.seniat</field> |
542 | 7 | <field name="type">form</field> | ||
543 | 8 | <field name="arch" type="xml"> | 7 | <field name="arch" type="xml"> |
544 | 9 | <form string="Wizard to search partner on SENIAT"> | 8 | <form string="Wizard to search partner on SENIAT"> |
545 | 10 | <group colspan="4"> | 9 | <group colspan="4"> |
546 | 11 | 10 | ||
547 | === modified file 'l10n_ve_fiscal_requirements/wizard/update_info_partner.xml' | |||
548 | --- l10n_ve_fiscal_requirements/wizard/update_info_partner.xml 2011-10-25 20:33:16 +0000 | |||
549 | +++ l10n_ve_fiscal_requirements/wizard/update_info_partner.xml 2013-01-11 18:35:30 +0000 | |||
550 | @@ -7,7 +7,6 @@ | |||
551 | 7 | <record id="view_wizard_update_info_partner" model="ir.ui.view"> | 7 | <record id="view_wizard_update_info_partner" model="ir.ui.view"> |
552 | 8 | <field name="name">view.update.info.partner</field> | 8 | <field name="name">view.update.info.partner</field> |
553 | 9 | <field name="model">update.info.partner</field> | 9 | <field name="model">update.info.partner</field> |
554 | 10 | <field name="type">form</field> | ||
555 | 11 | <field name="arch" type="xml"> | 10 | <field name="arch" type="xml"> |
556 | 12 | <form string=""> | 11 | <form string=""> |
557 | 13 | <separator string="Are you sure you want to do this?" colspan="4"/> | 12 | <separator string="Are you sure you want to do this?" colspan="4"/> |
558 | 14 | 13 | ||
559 | === modified file 'l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml' | |||
560 | --- l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml 2012-04-11 21:48:15 +0000 | |||
561 | +++ l10n_ve_fiscal_requirements/wizard/wizard_invoice_nro_ctrl_view.xml 2013-01-11 18:35:30 +0000 | |||
562 | @@ -4,7 +4,6 @@ | |||
563 | 4 | <record id="view_wizard_invoice_nro_ctrl" model="ir.ui.view"> | 4 | <record id="view_wizard_invoice_nro_ctrl" model="ir.ui.view"> |
564 | 5 | <field name="name">view.wizard.invoice.nro.ctrl</field> | 5 | <field name="name">view.wizard.invoice.nro.ctrl</field> |
565 | 6 | <field name="model">wizard.invoice.nro.ctrl</field> | 6 | <field name="model">wizard.invoice.nro.ctrl</field> |
566 | 7 | <field name="type">form</field> | ||
567 | 8 | <field name="arch" type="xml"> | 7 | <field name="arch" type="xml"> |
568 | 9 | <form string="Create an invoice to justify the damaged one"> | 8 | <form string="Create an invoice to justify the damaged one"> |
569 | 10 | <group colspan="8" col="8"> | 9 | <group colspan="8" col="8"> |
570 | 11 | 10 | ||
571 | === modified file 'l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml' | |||
572 | --- l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml 2012-02-09 21:33:03 +0000 | |||
573 | +++ l10n_ve_fiscal_requirements/wizard/wizard_nro_ctrl_view.xml 2013-01-11 18:35:30 +0000 | |||
574 | @@ -4,7 +4,6 @@ | |||
575 | 4 | <record model="ir.ui.view" id="wizard_nro_ctrl_form"> | 4 | <record model="ir.ui.view" id="wizard_nro_ctrl_form"> |
576 | 5 | <field name="name">wizard.nro.ctrl.form</field> | 5 | <field name="name">wizard.nro.ctrl.form</field> |
577 | 6 | <field name="model">wiz.nroctrl</field> | 6 | <field name="model">wiz.nroctrl</field> |
578 | 7 | <field name="type">form</field> | ||
579 | 8 | <field name="arch" type="xml"> | 7 | <field name="arch" type="xml"> |
580 | 9 | <form string="Changing the Control Number"> | 8 | <form string="Changing the Control Number"> |
581 | 10 | <field name="name" /> | 9 | <field name="name" /> |
582 | 11 | 10 | ||
583 | === modified file 'l10n_ve_fiscal_requirements/wizard/wizard_url_seniat_view.xml' | |||
584 | --- l10n_ve_fiscal_requirements/wizard/wizard_url_seniat_view.xml 2012-07-16 18:55:40 +0000 | |||
585 | +++ l10n_ve_fiscal_requirements/wizard/wizard_url_seniat_view.xml 2013-01-11 18:35:30 +0000 | |||
586 | @@ -4,7 +4,6 @@ | |||
587 | 4 | <record id="view_wizard_url_seniat" model="ir.ui.view"> | 4 | <record id="view_wizard_url_seniat" model="ir.ui.view"> |
588 | 5 | <field name="name">view.wizard.seniat.url</field> | 5 | <field name="name">view.wizard.seniat.url</field> |
589 | 6 | <field name="model">wizard.seniat.url</field> | 6 | <field name="model">wizard.seniat.url</field> |
590 | 7 | <field name="type">form</field> | ||
591 | 8 | <field name="arch" type="xml"> | 7 | <field name="arch" type="xml"> |
592 | 9 | <form string="Update Url From Seniat"> | 8 | <form string="Update Url From Seniat"> |
593 | 10 | <separator string="URL Seniat for Partner Information" colspan="4"/> | 9 | <separator string="URL Seniat for Partner Information" colspan="4"/> |