Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-fb-minor-changes-kty into lp:openerp-venezuela-localization

Proposed by Katherine Zaoral (Vauxoo)
Status: Merged
Merged at revision: 881
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/ovl70-fb-minor-changes-kty
Merge into: lp:openerp-venezuela-localization
Diff against target: 1271 lines (+291/-251)
3 files modified
l10n_ve_fiscal_book/i18n/l10n_ve_fiscal_book.pot (+234/-194)
l10n_ve_fiscal_book/model/fiscal_book.py (+53/-53)
l10n_ve_fiscal_book/view/fiscal_book.xml (+4/-4)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/ovl70-fb-minor-changes-kty
Reviewer Review Type Date Requested Status
hbto [Vauxoo] http://www.vauxoo.com Approve
Review via email: mp+169509@code.launchpad.net

This proposal supersedes a proposal from 2013-06-14.

Commit message

[MERGE] Cosmetic and misspelling changes:
----------------------------------------------------------------------------
[IMP] new pot file for the cosmetic and misspelling changes.
[CC] missing view changes for ('no tax payer', 'non-tax payer').
[CC] change misspellings: [('importation', 'imports'), ('exportation',
'exports')].
[FIX] 86 format (customs form) tag in the fiscal book lines change from the
working 'F86' string to the correct string 'F/IMP'.
[CC] misspelling 'No Tax Payer' and needs to be 'Non-Tax Payer'

To post a comment you must log in.
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_fiscal_book/i18n/l10n_ve_fiscal_book.pot'
2--- l10n_ve_fiscal_book/i18n/l10n_ve_fiscal_book.pot 2013-06-05 19:53:07 +0000
3+++ l10n_ve_fiscal_book/i18n/l10n_ve_fiscal_book.pot 2013-06-14 17:26:33 +0000
4@@ -6,8 +6,8 @@
5 msgstr ""
6 "Project-Id-Version: OpenERP Server 7.0\n"
7 "Report-Msgid-Bugs-To: \n"
8-"POT-Creation-Date: 2013-06-05 19:27+0000\n"
9-"PO-Revision-Date: 2013-06-05 19:27+0000\n"
10+"POT-Creation-Date: 2013-06-14 17:20+0000\n"
11+"PO-Revision-Date: 2013-06-14 17:20+0000\n"
12 "Last-Translator: <>\n"
13 "Language-Team: \n"
14 "MIME-Version: 1.0\n"
15@@ -28,17 +28,12 @@
16
17 #. module: l10n_ve_fiscal_book
18 #: view:fiscal.book:0
19-msgid "Importations"
20-msgstr ""
21-
22-#. module: l10n_ve_fiscal_book
23-#: view:fiscal.book:0
24 msgid "Set to draft"
25 msgstr ""
26
27 #. module: l10n_ve_fiscal_book
28-#: help:fiscal.book,do_sdcf_and_exempt_sum:0
29-msgid "SDCF and Exempt sum for domestict transanctions. At Sale book represent the sum of Tax Payer and No Tax payer transactions."
30+#: model:ir.actions.report.xml,name:l10n_ve_fiscal_book.report_fiscal_book_sale
31+msgid "Sale Book Report"
32 msgstr ""
33
34 #. module: l10n_ve_fiscal_book
35@@ -47,7 +42,7 @@
36 msgstr ""
37
38 #. module: l10n_ve_fiscal_book
39-#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:1025
40+#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:1099
41 #, python-format
42 msgid "This is a no valid line. Be sure you have two or more invoices with the same invoice number"
43 msgstr ""
44@@ -85,13 +80,6 @@
45 msgstr ""
46
47 #. module: l10n_ve_fiscal_book
48-#: view:fiscal.book:0
49-#: selection:fiscal.book.line,type:0
50-#: selection:fiscal.book.taxes.summary,op_type:0
51-msgid "Exportation"
52-msgstr ""
53-
54-#. module: l10n_ve_fiscal_book
55 #: report:fiscal.book.sale:0
56 msgid "Datos Generales de Aduana"
57 msgstr ""
58@@ -134,8 +122,10 @@
59 msgstr ""
60
61 #. module: l10n_ve_fiscal_book
62-#: model:ir.model,name:l10n_ve_fiscal_book.model_account_wh_iva_line
63-msgid "Vat Withholding line"
64+#: view:fiscal.book:0
65+#: model:ir.actions.act_window,name:l10n_ve_fiscal_book.action_fiscal_sale_book
66+#: model:ir.ui.menu,name:l10n_ve_fiscal_book.menu_fiscal_sale_book
67+msgid "Fiscal Sale Book"
68 msgstr ""
69
70 #. module: l10n_ve_fiscal_book
71@@ -149,16 +139,21 @@
72 msgstr ""
73
74 #. module: l10n_ve_fiscal_book
75-#: field:fiscal.book,ntp_fbl_ids:0
76-msgid "No Tax Payer Detail Lines"
77-msgstr ""
78-
79-#. module: l10n_ve_fiscal_book
80 #: help:fiscal.book.line,invoice_id:0
81 msgid "Invoice related to this book line"
82 msgstr ""
83
84 #. module: l10n_ve_fiscal_book
85+#: help:fiscal.book,do_reduced_vat_base_sum:0
86+msgid "Reduced VAT Taxed Domestic Base Amount Totalization. For Purchase Book it sums Reduced VAT Base column for domestic transactions. For Sale Book it sums Tax Payer and Non-Tax Payer Reduced VAT Base columns"
87+msgstr ""
88+
89+#. module: l10n_ve_fiscal_book
90+#: help:fiscal.book,ntp_additional_vat_tax_sum:0
91+msgid "Additional VAT Taxed Non-Tax Payer Tax Amount Totalization. Sum of Additional VAT Tax column for Non-Tax Payer transactions"
92+msgstr ""
93+
94+#. module: l10n_ve_fiscal_book
95 #: selection:fiscal.book.taxes.summary,tax_type:0
96 msgid "General Aliquot"
97 msgstr ""
98@@ -208,6 +203,11 @@
99 msgstr ""
100
101 #. module: l10n_ve_fiscal_book
102+#: help:fiscal.book.line,imex_date:0
103+msgid "Invoice Imports/Exports Date"
104+msgstr ""
105+
106+#. module: l10n_ve_fiscal_book
107 #: report:fiscal.book.sale:0
108 msgid "VENTAS INTERNAS GRAVADAS POR ALÍCUOTA GENERAL MAS ALÍCUOTA ADICIONAL"
109 msgstr ""
110@@ -234,19 +234,13 @@
111 msgstr ""
112
113 #. module: l10n_ve_fiscal_book
114-#: selection:fiscal.book.line,type:0
115-#: selection:fiscal.book.taxes.summary,op_type:0
116-msgid "Import"
117-msgstr ""
118-
119-#. module: l10n_ve_fiscal_book
120 #: field:fiscal.book,state:0
121 msgid "Status"
122 msgstr ""
123
124 #. module: l10n_ve_fiscal_book
125-#: help:fiscal.book,ntp_general_vat_base_sum:0
126-msgid "General VAT Taxed No Tax Payer Base Amount Totalization. Sum of General VAT Base column for taxy payer transactions"
127+#: help:fiscal.book,do_sdcf_vat_sum:0
128+msgid "Domestic SDCF Tax Totalization. For Purchase Book it sums SDCF column for domestic transactions. For Sale Book it sums Tax Payer and Non-Tax Payer SDCF columns"
129 msgstr ""
130
131 #. module: l10n_ve_fiscal_book
132@@ -285,8 +279,10 @@
133 msgstr ""
134
135 #. module: l10n_ve_fiscal_book
136-#: help:fiscal.book,ntp_general_vat_tax_sum:0
137-msgid "General VAT Taxed No Tax Payer Tax Amount Totalization. Sum of General VAT Tax column for no tax payer transactions"
138+#: view:fiscal.book:0
139+#: selection:fiscal.book.line,type:0
140+#: selection:fiscal.book.taxes.summary,op_type:0
141+msgid "Imports"
142 msgstr ""
143
144 #. module: l10n_ve_fiscal_book
145@@ -325,6 +321,13 @@
146 msgstr ""
147
148 #. module: l10n_ve_fiscal_book
149+#: view:fiscal.book:0
150+#: selection:fiscal.book.line,type:0
151+#: selection:fiscal.book.taxes.summary,op_type:0
152+msgid "Non-Tax Payer"
153+msgstr ""
154+
155+#. module: l10n_ve_fiscal_book
156 #: help:fiscal.book.line,total_with_iva:0
157 msgid "Sub Total of the invoice (untaxed amount) plus all tax amount of the related taxes"
158 msgstr ""
159@@ -335,21 +338,22 @@
160 msgstr ""
161
162 #. module: l10n_ve_fiscal_book
163+#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:1211
164+#, python-format
165+msgid "Programing Error!"
166+msgstr ""
167+
168+#. module: l10n_ve_fiscal_book
169+#: view:fiscal.book:0
170+msgid "Customs Forms"
171+msgstr ""
172+
173+#. module: l10n_ve_fiscal_book
174 #: report:fiscal.book.sale:0
175 msgid "VENTAS INTERNAS GRAVADAS SÓLO POR ALÍCUOTA GENERAL"
176 msgstr ""
177
178 #. module: l10n_ve_fiscal_book
179-#: model:ir.actions.report.xml,name:l10n_ve_fiscal_book.report_fiscal_book_sale
180-msgid "Sale Book Report"
181-msgstr ""
182-
183-#. module: l10n_ve_fiscal_book
184-#: report:fiscal.book.purchase:0
185-msgid "COMPRAS INTERNAS GRAVADAS POR ALÍCUOTA GENERAL MAS ALÍCUOTA ADICIONAL"
186-msgstr ""
187-
188-#. module: l10n_ve_fiscal_book
189 #: field:adjustment.book.line,voucher:0
190 #: help:adjustment.book.line,voucher:0
191 msgid "Voucher Withholding VAT"
192@@ -371,6 +375,11 @@
193 msgstr ""
194
195 #. module: l10n_ve_fiscal_book
196+#: field:fiscal.book,ntp_fbl_ids:0
197+msgid "Non-Tax Payer Detail Lines"
198+msgstr ""
199+
200+#. module: l10n_ve_fiscal_book
201 #: code:addons/l10n_ve_fiscal_book/wizard/fiscal_book_wizard.py:185
202 #: selection:fiscal.book.wizard,type:0
203 #, python-format
204@@ -378,29 +387,6 @@
205 msgstr ""
206
207 #. module: l10n_ve_fiscal_book
208-#: help:fiscal.book,ntp_vat_base_sum:0
209-msgid "No Tax Payer Grand Base Totalization. Sum of all no tax payer tax bases (reduced, general and additional)"
210-msgstr ""
211-
212-#. module: l10n_ve_fiscal_book
213-#: field:fiscal.book,do_reduced_vat_tax_sum:0
214-#: field:fiscal.book,imex_reduced_vat_tax_sum:0
215-#: field:fiscal.book,ntp_reduced_vat_tax_sum:0
216-#: field:fiscal.book,tp_reduced_vat_tax_sum:0
217-msgid "Reduced VAT Taxed Amount"
218-msgstr ""
219-
220-#. module: l10n_ve_fiscal_book
221-#: help:fiscal.book,do_general_vat_base_sum:0
222-msgid "General VAT Taxed Domestic Base Amount Totalization. For Purchase Book it sums General VAT Base column for domestic transactions. For Sale Book it sums Tax Payer and No Tax Payer General VAT Base columns"
223-msgstr ""
224-
225-#. module: l10n_ve_fiscal_book
226-#: help:fiscal.book,imex_vat_base_sum:0
227-msgid "Sum of International Tax Base Amounts (reduced, general and additional). Used at 2nd row in thw Sale book's summary with Exportation Sales title"
228-msgstr ""
229-
230-#. module: l10n_ve_fiscal_book
231 #: field:fiscal.book.line,partner_vat:0
232 msgid "Partner TIN"
233 msgstr ""
234@@ -442,11 +428,6 @@
235 msgstr ""
236
237 #. module: l10n_ve_fiscal_book
238-#: help:fiscal.book,ntp_fbl_ids:0
239-msgid "No Tax Payer Lines that are grouped by the statement law that represent the data of are consolidate book lines"
240-msgstr ""
241-
242-#. module: l10n_ve_fiscal_book
243 #: field:fiscal.book,do_general_vat_base_sum:0
244 #: field:fiscal.book,imex_general_vat_base_sum:0
245 #: field:fiscal.book,ntp_general_vat_base_sum:0
246@@ -474,6 +455,11 @@
247 msgstr ""
248
249 #. module: l10n_ve_fiscal_book
250+#: model:ir.model,name:l10n_ve_fiscal_book.model_account_wh_iva_line
251+msgid "Vat Withholding line"
252+msgstr ""
253+
254+#. module: l10n_ve_fiscal_book
255 #: field:adjustment.book.line,uncredit_fiscal:0
256 msgid "Sin derecho a Credito Fiscal"
257 msgstr ""
258@@ -484,11 +470,6 @@
259 msgstr ""
260
261 #. module: l10n_ve_fiscal_book
262-#: help:fiscal.book,article_number:0
263-msgid "Article number describing the fiscal book special features according to the Venezuelan RLIVA statement for fiscal accounting books. Options: - Art. 75: Pruchase Book. - Art. 76: Sale Book. Reflects every individual operation datail. - Art. 77: Sale Book. Groups no tax payer operations in one consolidated line. Only fiscal billing. - Art. 78: Sale Book. Hybrid for 76 and 77 article. Show automatic and mechanized operations in individual way, and groups fiscal billing operationss in one consolidated line."
264-msgstr ""
265-
266-#. module: l10n_ve_fiscal_book
267 #: field:fiscal.book,get_wh_sum:0
268 msgid "Current Period Withholding"
269 msgstr ""
270@@ -504,19 +485,6 @@
271 msgstr ""
272
273 #. module: l10n_ve_fiscal_book
274-#: view:fiscal.book:0
275-#: field:fiscal.book.line,ntp_fb_id:0
276-msgid "No Tax Payer Detail"
277-msgstr ""
278-
279-#. module: l10n_ve_fiscal_book
280-#: view:fiscal.book:0
281-#: selection:fiscal.book.line,type:0
282-#: selection:fiscal.book.taxes.summary,op_type:0
283-msgid "No Tax Payer"
284-msgstr ""
285-
286-#. module: l10n_ve_fiscal_book
287 #: code:addons/l10n_ve_fiscal_book/wizard/fiscal_book_wizard.py:186
288 #: selection:fiscal.book.wizard,type:0
289 #, python-format
290@@ -531,11 +499,6 @@
291 msgstr ""
292
293 #. module: l10n_ve_fiscal_book
294-#: help:fiscal.book,do_sdcf_vat_sum:0
295-msgid "Domestic SDCF Tax Totalization. For Purchase Book it sums SDCF column for domestic transactions. For Sale Book it sums Tax Payer and No Tax Payer SDCF columns"
296-msgstr ""
297-
298-#. module: l10n_ve_fiscal_book
299 #: help:adjustment.book.line,invoice_number:0
300 msgid "Invoice number for adjustment book"
301 msgstr ""
302@@ -623,6 +586,11 @@
303 msgstr ""
304
305 #. module: l10n_ve_fiscal_book
306+#: help:fiscal.book.line,rank:0
307+msgid "Line Position"
308+msgstr ""
309+
310+#. module: l10n_ve_fiscal_book
311 #: field:fiscal.book.line,vat_general_tax:0
312 msgid "GRAL TAX"
313 msgstr ""
314@@ -696,15 +664,16 @@
315 msgstr ""
316
317 #. module: l10n_ve_fiscal_book
318-#: view:fiscal.book:0
319-#: model:ir.actions.act_window,name:l10n_ve_fiscal_book.action_fiscal_sale_book
320-#: model:ir.ui.menu,name:l10n_ve_fiscal_book.menu_fiscal_sale_book
321-msgid "Fiscal Sale Book"
322+#: report:fiscal.book.purchase:0
323+msgid "COMPRAS INTERNAS GRAVADAS POR ALÍCUOTA GENERAL MAS ALÍCUOTA ADICIONAL"
324 msgstr ""
325
326 #. module: l10n_ve_fiscal_book
327-#: help:fiscal.book,invoice_ids:0
328-msgid "Invoices being recorded in a Fiscal Book"
329+#: field:fiscal.book,do_reduced_vat_tax_sum:0
330+#: field:fiscal.book,imex_reduced_vat_tax_sum:0
331+#: field:fiscal.book,ntp_reduced_vat_tax_sum:0
332+#: field:fiscal.book,tp_reduced_vat_tax_sum:0
333+msgid "Reduced VAT Taxed Amount"
334 msgstr ""
335
336 #. module: l10n_ve_fiscal_book
337@@ -714,11 +683,6 @@
338 msgstr ""
339
340 #. module: l10n_ve_fiscal_book
341-#: help:fiscal.book,get_total_with_iva_sum:0
342-msgid "Total with VAT Sum (Import/Export, Domestic, Tax Payer and No Tax Payer"
343-msgstr ""
344-
345-#. module: l10n_ve_fiscal_book
346 #: help:fiscal.book,period_id:0
347 msgid "Book's Fiscal Period"
348 msgstr ""
349@@ -750,8 +714,8 @@
350 msgstr ""
351
352 #. module: l10n_ve_fiscal_book
353-#: help:fiscal.book.line,rank:0
354-msgid "Line Position"
355+#: help:fiscal.book,do_general_vat_base_sum:0
356+msgid "General VAT Taxed Domestic Base Amount Totalization. For Purchase Book it sums General VAT Base column for domestic transactions. For Sale Book it sums Tax Payer and Non-Tax Payer General VAT Base columns"
357 msgstr ""
358
359 #. module: l10n_ve_fiscal_book
360@@ -771,11 +735,6 @@
361 msgstr ""
362
363 #. module: l10n_ve_fiscal_book
364-#: help:fiscal.book,do_reduced_vat_tax_sum:0
365-msgid "Reduced VAT Taxed Domestic Tax Amount Totalization. For Purchase Book it sums Reduced VAT Tax column for domestic transactions. For Sale Book it sums Tax Payer and No Tax Payer Reduced VAT Tax columns"
366-msgstr ""
367-
368-#. module: l10n_ve_fiscal_book
369 #: report:fiscal.book.purchase:0
370 #: report:fiscal.book.sale:0
371 msgid "DATOS DE LA FACTURA O/Y DOCUMENTO"
372@@ -787,6 +746,11 @@
373 msgstr ""
374
375 #. module: l10n_ve_fiscal_book
376+#: help:fiscal.book,do_exempt_vat_sum:0
377+msgid "Domestic Exempt Tax Totalization. For Purchase Book it sums Exempt column for domestic transactions. For Sale Book it sums Tax Payer and Non-Tax Payer Exempt columns"
378+msgstr ""
379+
380+#. module: l10n_ve_fiscal_book
381 #: help:fiscal.book,issue_invoice_ids:0
382 msgid "Invoices that are in pending state cancel or draft"
383 msgstr ""
384@@ -819,6 +783,11 @@
385 msgstr ""
386
387 #. module: l10n_ve_fiscal_book
388+#: help:fiscal.book,cf_ids:0
389+msgid "Customs Form being recorded in the Fiscal Book"
390+msgstr ""
391+
392+#. module: l10n_ve_fiscal_book
393 #: field:adjustment.book.line,amount_untaxed_i:0
394 #: field:adjustment.book.line,amount_untaxed_n:0
395 msgid "Amount Untaxed"
396@@ -890,8 +859,14 @@
397 msgstr ""
398
399 #. module: l10n_ve_fiscal_book
400-#: help:fiscal.book,do_additional_vat_tax_sum:0
401-msgid "Additional VAT Taxed Domestic Tax Amount Totalization. For Purchase Book it sums Additional VAT Tax column for domestic transactions. For Sale Book it sums Tax Payer and No Tax Payer Additional VAT Tax columns"
402+#: help:fiscal.book,ntp_exempt_vat_sum:0
403+msgid "Non-Tax Payer Exempt Tax Totalization. Sum of Exempt column for Non-Tax Payer transactions"
404+msgstr ""
405+
406+#. module: l10n_ve_fiscal_book
407+#: help:fiscal.book.line,void_form:0
408+#: field:fiscal.book.taxes.summary,op_type:0
409+msgid "Operation Type"
410 msgstr ""
411
412 #. module: l10n_ve_fiscal_book
413@@ -901,6 +876,11 @@
414 msgstr ""
415
416 #. module: l10n_ve_fiscal_book
417+#: help:fiscal.book,get_total_with_iva_ntp_sum:0
418+msgid "Non-Tax Payer Total with VAT Totalization"
419+msgstr ""
420+
421+#. module: l10n_ve_fiscal_book
422 #: field:fiscal.book,get_total_tax_credit_debit_tax_sum:0
423 msgid "Tax Credit Total Tax Amount"
424 msgstr ""
425@@ -911,6 +891,11 @@
426 msgstr ""
427
428 #. module: l10n_ve_fiscal_book
429+#: help:fiscal.book,ntp_sdcf_vat_sum:0
430+msgid "Non-Tax Payer SDCF Tax Totalization. Sum of SDCF column for Non-Tax Payer transactions"
431+msgstr ""
432+
433+#. module: l10n_ve_fiscal_book
434 #: model:ir.ui.menu,name:l10n_ve_fiscal_book.menu_fr_main
435 msgid "Fiscal Reporting"
436 msgstr ""
437@@ -932,8 +917,8 @@
438 msgstr ""
439
440 #. module: l10n_ve_fiscal_book
441-#: help:fiscal.book,get_total_with_iva_ntp_sum:0
442-msgid "No Tax Payer Total with VAT Totalization"
443+#: field:fiscal.book.line,affected_invoice:0
444+msgid "Affected Invoice"
445 msgstr ""
446
447 #. module: l10n_ve_fiscal_book
448@@ -972,8 +957,8 @@
449 msgstr ""
450
451 #. module: l10n_ve_fiscal_book
452-#: help:fiscal.book,ntp_reduced_vat_base_sum:0
453-msgid "Reduced VAT Taxed No Tax Payer Base Amount Totalization. Sum of Reduced VAT Base column for no tax payer transactions"
454+#: help:fiscal.book,ntp_reduced_vat_tax_sum:0
455+msgid "Reduced VAT Taxed Non-Tax Payer Tax Amount Totalization. Sum of Reduced VAT Tax column for Non-Tax Payer transactions"
456 msgstr ""
457
458 #. module: l10n_ve_fiscal_book
459@@ -982,6 +967,13 @@
460 msgstr ""
461
462 #. module: l10n_ve_fiscal_book
463+#: view:fiscal.book:0
464+#: selection:fiscal.book.line,type:0
465+#: selection:fiscal.book.taxes.summary,op_type:0
466+msgid "Exports"
467+msgstr ""
468+
469+#. module: l10n_ve_fiscal_book
470 #: view:fiscal.book.wizard:0
471 #: model:ir.actions.act_window,name:l10n_ve_fiscal_book.fiscal_book_wizard_act
472 msgid "Fiscal Book Report"
473@@ -998,11 +990,6 @@
474 msgstr ""
475
476 #. module: l10n_ve_fiscal_book
477-#: help:fiscal.book,do_reduced_vat_base_sum:0
478-msgid "Reduced VAT Taxed Domestic Base Amount Totalization. For Purchase Book it sums Reduced VAT Base column for domestic transactions. For Sale Book it sums Tax Payer and No Tax Payer Reduced VAT Base columns"
479-msgstr ""
480-
481-#. module: l10n_ve_fiscal_book
482 #: report:fiscal.book.purchase:0
483 #: report:fiscal.book.sale:0
484 msgid "RIF"
485@@ -1031,6 +1018,11 @@
486 msgstr ""
487
488 #. module: l10n_ve_fiscal_book
489+#: help:fiscal.book,ntp_fbl_ids:0
490+msgid "Non-Tax Payer Lines that are grouped by the statement law that represent the data of are consolidate book lines"
491+msgstr ""
492+
493+#. module: l10n_ve_fiscal_book
494 #: selection:adjustment.book.line,type_doc:0
495 msgid "Debit Note"
496 msgstr ""
497@@ -1108,6 +1100,17 @@
498 msgstr ""
499
500 #. module: l10n_ve_fiscal_book
501+#: view:fiscal.book:0
502+#: field:fiscal.book.line,ntp_fb_id:0
503+msgid "Non-Tax Payer Detail"
504+msgstr ""
505+
506+#. module: l10n_ve_fiscal_book
507+#: field:fiscal.book,ntp_vat_base_sum:0
508+msgid "Non-Tax Payer Taxable Amount"
509+msgstr ""
510+
511+#. module: l10n_ve_fiscal_book
512 #: selection:fiscal.book,state:0
513 msgid "Getting Ready"
514 msgstr ""
515@@ -1118,9 +1121,8 @@
516 msgstr ""
517
518 #. module: l10n_ve_fiscal_book
519-#: help:fiscal.book.line,void_form:0
520-#: field:fiscal.book.taxes.summary,op_type:0
521-msgid "Operation Type"
522+#: help:fiscal.book.line,type:0
523+msgid "Book line transtaction type: - Purchase: Import or Domestic. - Sales: Expertation, Tax Payer, Non-Tax Payer."
524 msgstr ""
525
526 #. module: l10n_ve_fiscal_book
527@@ -1147,8 +1149,8 @@
528 msgstr ""
529
530 #. module: l10n_ve_fiscal_book
531-#: help:fiscal.book.line,child_ids:0
532-msgid "No Tax Payer Group of book lines that this line represent"
533+#: help:fiscal.book,get_total_with_iva_sum:0
534+msgid "Total with VAT Sum (Import/Export, Domestic, Tax Payer and Non-Tax Payer"
535 msgstr ""
536
537 #. module: l10n_ve_fiscal_book
538@@ -1157,11 +1159,6 @@
539 msgstr ""
540
541 #. module: l10n_ve_fiscal_book
542-#: help:fiscal.book,do_general_vat_tax_sum:0
543-msgid "General VAT Taxed Domestic Tax Amount Totalization. For Purchase Book it sums General VAT Tax column for domestic transactions. For Sale Book it sums Tax Payer and No Tax Payer General VAT Tax columns"
544-msgstr ""
545-
546-#. module: l10n_ve_fiscal_book
547 #: field:fiscal.book.line,credit_affected:0
548 msgid "Affected Credit Notes"
549 msgstr ""
550@@ -1189,11 +1186,6 @@
551 msgstr ""
552
553 #. module: l10n_ve_fiscal_book
554-#: help:fiscal.book,ntp_sdcf_vat_sum:0
555-msgid "No Tax Payer SDCF Tax Totalization. Sum of SDCF column for no tax payer transactions"
556-msgstr ""
557-
558-#. module: l10n_ve_fiscal_book
559 #: selection:adjustment.book.line,type_doc:0
560 msgid "Credit Note"
561 msgstr ""
562@@ -1209,6 +1201,7 @@
563 #: field:account.invoice,issue_fb_id:0
564 #: field:account.wh.iva.line,fb_id:0
565 #: field:adjustment.book.line,fb_id:0
566+#: field:customs.form,fb_id:0
567 #: view:fiscal.book:0
568 #: field:fiscal.book.line,fb_id:0
569 #: field:fiscal.book.taxes,fb_id:0
570@@ -1242,6 +1235,12 @@
571 msgstr ""
572
573 #. module: l10n_ve_fiscal_book
574+#: field:fiscal.book,cf_ids:0
575+#: field:fiscal.book.line,cf_id:0
576+msgid "Customs Form"
577+msgstr ""
578+
579+#. module: l10n_ve_fiscal_book
580 #: report:fiscal.book.purchase:0
581 msgid "COMPRAS NO GRAVADAS Y/O SIN DERECHO A CREDITO FISCAL"
582 msgstr ""
583@@ -1252,11 +1251,6 @@
584 msgstr ""
585
586 #. module: l10n_ve_fiscal_book
587-#: help:fiscal.book.line,imex_date:0
588-msgid "Invoice Importation/Exportation Date"
589-msgstr ""
590-
591-#. module: l10n_ve_fiscal_book
592 #: field:fiscal.book,do_sdcf_and_exempt_sum:0
593 msgid "Domestic Untaxed VAT Sum"
594 msgstr ""
595@@ -1267,11 +1261,6 @@
596 msgstr ""
597
598 #. module: l10n_ve_fiscal_book
599-#: field:fiscal.book.line,child_ids:0
600-msgid "No Tax Payer Detail Line"
601-msgstr ""
602-
603-#. module: l10n_ve_fiscal_book
604 #: field:fiscal.book,fbt_ids:0
605 #: field:fiscal.book.line,fbt_ids:0
606 msgid "Tax Lines"
607@@ -1298,11 +1287,6 @@
608 msgstr ""
609
610 #. module: l10n_ve_fiscal_book
611-#: help:fiscal.book,ntp_additional_vat_base_sum:0
612-msgid "Additional VAT Taxed No Tax Payer Base Amount Totalization. Sum of Additional VAT Base column for no tax payer transactions"
613-msgstr ""
614-
615-#. module: l10n_ve_fiscal_book
616 #: help:adjustment.book.line,amount_with_vat:0
617 msgid "Amount withheld VAT total"
618 msgstr ""
619@@ -1358,11 +1342,6 @@
620 msgstr ""
621
622 #. module: l10n_ve_fiscal_book
623-#: help:fiscal.book,ntp_reduced_vat_tax_sum:0
624-msgid "Reduced VAT Taxed No Tax Payer Tax Amount Totalization. Sum of Reduced VAT Tax column for no tax payer transactions"
625-msgstr ""
626-
627-#. module: l10n_ve_fiscal_book
628 #: field:fiscal.book,get_total_tax_credit_debit_base_sum:0
629 msgid "Tax Credit Total Base Amount"
630 msgstr ""
631@@ -1378,6 +1357,16 @@
632 msgstr ""
633
634 #. module: l10n_ve_fiscal_book
635+#: help:fiscal.book,ntp_vat_base_sum:0
636+msgid "Non-Tax Payer Grand Base Totalization. Sum of all no tax payer tax bases (reduced, general and additional)"
637+msgstr ""
638+
639+#. module: l10n_ve_fiscal_book
640+#: help:fiscal.book,ntp_general_vat_tax_sum:0
641+msgid "General VAT Taxed Non-Tax Payer Tax Amount Totalization. Sum of General VAT Tax column for Non-Tax Payer transactions"
642+msgstr ""
643+
644+#. module: l10n_ve_fiscal_book
645 #: field:fiscal.book.line,accounting_date:0
646 msgid "Accounting Date"
647 msgstr ""
648@@ -1388,6 +1377,16 @@
649 msgstr ""
650
651 #. module: l10n_ve_fiscal_book
652+#: help:fiscal.book,do_general_vat_tax_sum:0
653+msgid "General VAT Taxed Domestic Tax Amount Totalization. For Purchase Book it sums General VAT Tax column for domestic transactions. For Sale Book it sums Tax Payer and Non-Tax Payer General VAT Tax columns"
654+msgstr ""
655+
656+#. module: l10n_ve_fiscal_book
657+#: field:fiscal.book.line,child_ids:0
658+msgid "Non-Tax Payer Detail Line"
659+msgstr ""
660+
661+#. module: l10n_ve_fiscal_book
662 #: field:fiscal.book.wizard,date_end:0
663 msgid "End Date"
664 msgstr ""
665@@ -1398,6 +1397,11 @@
666 msgstr ""
667
668 #. module: l10n_ve_fiscal_book
669+#: help:fiscal.book.line,child_ids:0
670+msgid "Non-Tax Payer Group of book lines that this line represent"
671+msgstr ""
672+
673+#. module: l10n_ve_fiscal_book
674 #: report:fiscal.book.sale:0
675 msgid "OPERACIONES DE EXPORTACION"
676 msgstr ""
677@@ -1419,6 +1423,11 @@
678 msgstr ""
679
680 #. module: l10n_ve_fiscal_book
681+#: help:customs.form,fb_id:0
682+msgid "Fiscal Book where this customs form is srelated to"
683+msgstr ""
684+
685+#. module: l10n_ve_fiscal_book
686 #: report:fiscal.book.purchase:0
687 #: report:fiscal.book.sale:0
688 msgid "LEYENDA. F:Factura, ND:Nota de Débito, NC:Nota de Crédito, E:Expediente, A:Documento Anulado."
689@@ -1436,6 +1445,11 @@
690 msgstr ""
691
692 #. module: l10n_ve_fiscal_book
693+#: help:fiscal.book.taxes.summary,op_type:0
694+msgid "Operation Type: - Purchase: Import or Domestic. - Sales: Expertation, Tax Payer, Non-Tax Payer."
695+msgstr ""
696+
697+#. module: l10n_ve_fiscal_book
698 #: field:fiscal.book,get_total_wh_sum:0
699 msgid "VAT Withholding Sum"
700 msgstr ""
701@@ -1447,7 +1461,7 @@
702
703 #. module: l10n_ve_fiscal_book
704 #: help:fiscal.book.line,ntp_fb_id:0
705-msgid "Fiscal Book that owns this book line This Book is only for no tax payer lines"
706+msgid "Fiscal Book that owns this book line This Book is only for Non-Tax Payer lines"
707 msgstr ""
708
709 #. module: l10n_ve_fiscal_book
710@@ -1480,6 +1494,11 @@
711 msgstr ""
712
713 #. module: l10n_ve_fiscal_book
714+#: help:fiscal.book,invoice_ids:0
715+msgid "Invoices being recorded in a Fiscal Book"
716+msgstr ""
717+
718+#. module: l10n_ve_fiscal_book
719 #: report:fiscal.book.purchase:0
720 #: report:fiscal.book.sale:0
721 msgid "Declaración"
722@@ -1515,6 +1534,11 @@
723 msgstr ""
724
725 #. module: l10n_ve_fiscal_book
726+#: help:fiscal.book,ntp_general_vat_base_sum:0
727+msgid "General VAT Taxed Non-Tax Payer Base Amount Totalization. Sum of General VAT Base column for taxy payer transactions"
728+msgstr ""
729+
730+#. module: l10n_ve_fiscal_book
731 #: field:fiscal.book,get_total_with_iva_do_sum:0
732 #: field:fiscal.book,get_total_with_iva_imex_sum:0
733 #: field:fiscal.book,get_total_with_iva_ntp_sum:0
734@@ -1524,6 +1548,16 @@
735 msgstr ""
736
737 #. module: l10n_ve_fiscal_book
738+#: help:fiscal.book,do_reduced_vat_tax_sum:0
739+msgid "Reduced VAT Taxed Domestic Tax Amount Totalization. For Purchase Book it sums Reduced VAT Tax column for domestic transactions. For Sale Book it sums Tax Payer and Non-Tax Payer Reduced VAT Tax columns"
740+msgstr ""
741+
742+#. module: l10n_ve_fiscal_book
743+#: help:fiscal.book.line,cf_id:0
744+msgid "Customs Form being recorded to this book line"
745+msgstr ""
746+
747+#. module: l10n_ve_fiscal_book
748 #: report:fiscal.book.sale:0
749 msgid "TOTAL VENTAS Y DEBITOS FISCALES PARA EFECTOS DE DETERMINACION"
750 msgstr ""
751@@ -1557,14 +1591,19 @@
752 msgstr ""
753
754 #. module: l10n_ve_fiscal_book
755-#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:703
756-#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:1025
757+#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:707
758+#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:1099
759 #: code:addons/l10n_ve_fiscal_book/model/invoice.py:51
760 #, python-format
761 msgid "Error!"
762 msgstr ""
763
764 #. module: l10n_ve_fiscal_book
765+#: help:fiscal.book,do_additional_vat_tax_sum:0
766+msgid "Additional VAT Taxed Domestic Tax Amount Totalization. For Purchase Book it sums Additional VAT Tax column for domestic transactions. For Sale Book it sums Tax Payer and No Tax Payer Additional VAT Tax columns"
767+msgstr ""
768+
769+#. module: l10n_ve_fiscal_book
770 #: report:fiscal.book.purchase:0
771 #: report:fiscal.book.sale:0
772 msgid "Razon Social"
773@@ -1587,13 +1626,18 @@
774 msgstr ""
775
776 #. module: l10n_ve_fiscal_book
777+#: help:fiscal.book,ntp_reduced_vat_base_sum:0
778+msgid "Reduced VAT Taxed Non-Tax Payer Base Amount Totalization. Sum of Reduced VAT Base column for Non-Tax Payer transactions"
779+msgstr ""
780+
781+#. module: l10n_ve_fiscal_book
782 #: help:fiscal.book,get_total_with_iva_tp_sum:0
783 msgid "Tax Payer Total with VAT Totalization"
784 msgstr ""
785
786 #. module: l10n_ve_fiscal_book
787-#: help:fiscal.book,ntp_exempt_vat_sum:0
788-msgid "No Tax Payer Exempt Tax Totalization. Sum of Exempt column for no tax payer transactions"
789+#: help:fiscal.book,article_number:0
790+msgid "Article number describing the fiscal book special features according to the Venezuelan RLIVA statement for fiscal accounting books. Options: - Art. 75: Pruchase Book. - Art. 76: Sale Book. Reflects every individual operation datail. - Art. 77: Sale Book. Groups Non-Tax Payer operations in one consolidated line. Only fiscal billing. - Art. 78: Sale Book. Hybrid for 76 and 77 article. Show automatic and mechanized operations in individual way, and groups fiscal billing operationss in one consolidated line."
791 msgstr ""
792
793 #. module: l10n_ve_fiscal_book
794@@ -1669,11 +1713,6 @@
795 msgstr ""
796
797 #. module: l10n_ve_fiscal_book
798-#: help:fiscal.book.taxes.summary,op_type:0
799-msgid "Operation Type: - Purchase: Import or Domestic. - Sales: Expertation, Tax Payer, No Tax Payer."
800-msgstr ""
801-
802-#. module: l10n_ve_fiscal_book
803 #: help:adjustment.book.line,amount_untaxed_i:0
804 msgid "Amount untaxed for international operations"
805 msgstr ""
806@@ -1724,6 +1763,11 @@
807 msgstr ""
808
809 #. module: l10n_ve_fiscal_book
810+#: help:fiscal.book,imex_vat_base_sum:0
811+msgid "Sum of International Tax Base Amounts (reduced, general and additional). Used at 2nd row in thw Sale book's summary with Exports Sales title"
812+msgstr ""
813+
814+#. module: l10n_ve_fiscal_book
815 #: help:fiscal.book.line,vat_general_tax:0
816 msgid "Vat General Tax Amount"
817 msgstr ""
818@@ -1744,8 +1788,8 @@
819 msgstr ""
820
821 #. module: l10n_ve_fiscal_book
822-#: help:fiscal.book,ntp_additional_vat_tax_sum:0
823-msgid "Additional VAT Taxed No Tax Payer Tax Amount Totalization. Sum of Additional VAT Tax column for no tax payer transactions"
824+#: help:fiscal.book.line,parent_id:0
825+msgid "Non-Tax Payer Consolidated Line. Indicate the id of the consolidated line where this Non-Tax Payer line belongs"
826 msgstr ""
827
828 #. module: l10n_ve_fiscal_book
829@@ -1754,6 +1798,11 @@
830 msgstr ""
831
832 #. module: l10n_ve_fiscal_book
833+#: help:fiscal.book,do_sdcf_and_exempt_sum:0
834+msgid "SDCF and Exempt sum for domestict transanctions. At Sale book represent the sum of Tax Payer and Non-Tax Payer transactions."
835+msgstr ""
836+
837+#. module: l10n_ve_fiscal_book
838 #: model:ir.model,name:l10n_ve_fiscal_book.model_adjustment_book_line
839 msgid "adjustment.book.line"
840 msgstr ""
841@@ -1786,11 +1835,6 @@
842 msgstr ""
843
844 #. module: l10n_ve_fiscal_book
845-#: field:fiscal.book,ntp_vat_base_sum:0
846-msgid "No Tax Payer Taxable Amount"
847-msgstr ""
848-
849-#. module: l10n_ve_fiscal_book
850 #: help:fiscal.book,tp_vat_base_sum:0
851 msgid "Sum of all Tax Payer Grand Base Sum (reduced, general and additional taxes)"
852 msgstr ""
853@@ -1818,6 +1862,11 @@
854 msgstr ""
855
856 #. module: l10n_ve_fiscal_book
857+#: model:ir.model,name:l10n_ve_fiscal_book.model_customs_form
858+msgid "customs.form"
859+msgstr ""
860+
861+#. module: l10n_ve_fiscal_book
862 #: view:fiscal.book:0
863 msgid "Update Book"
864 msgstr ""
865@@ -1833,11 +1882,6 @@
866 msgstr ""
867
868 #. module: l10n_ve_fiscal_book
869-#: field:fiscal.book.line,affected_invoice:0
870-msgid "Affected Invoice"
871-msgstr ""
872-
873-#. module: l10n_ve_fiscal_book
874 #: field:fiscal.book,name:0
875 #: field:fiscal.book.taxes,name:0
876 msgid "Description"
877@@ -1854,13 +1898,19 @@
878 msgstr ""
879
880 #. module: l10n_ve_fiscal_book
881+#: help:fiscal.book,ntp_additional_vat_base_sum:0
882+msgid "Additional VAT Taxed Non-Tax Payer Base Amount Totalization. Sum of Additional VAT Base column for Non-Tax Payer transactions"
883+msgstr ""
884+
885+#. module: l10n_ve_fiscal_book
886 #: report:fiscal.book.purchase:0
887 msgid "OPERACIONES DE IMPORTACIONES"
888 msgstr ""
889
890 #. module: l10n_ve_fiscal_book
891-#: help:fiscal.book.line,type:0
892-msgid "Book line transtaction type: - Purchase: Import or Domestic. - Sales: Expertation, Tax Payer, No Tax Payer."
893+#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:1212
894+#, python-format
895+msgid "Customs form lines are domestic transacctions"
896 msgstr ""
897
898 #. module: l10n_ve_fiscal_book
899@@ -1875,12 +1925,7 @@
900 msgstr ""
901
902 #. module: l10n_ve_fiscal_book
903-#: help:fiscal.book.line,parent_id:0
904-msgid "No Tax Payer Consolidated Line. Indicate the id of the consolidated line where this no tax payer line belongs"
905-msgstr ""
906-
907-#. module: l10n_ve_fiscal_book
908-#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:704
909+#: code:addons/l10n_ve_fiscal_book/model/fiscal_book.py:708
910 #, python-format
911 msgid "You have withholdings registred but you are not a withholding agent"
912 msgstr ""
913@@ -1891,11 +1936,6 @@
914 msgstr ""
915
916 #. module: l10n_ve_fiscal_book
917-#: help:fiscal.book,do_exempt_vat_sum:0
918-msgid "Domestic Exempt Tax Totalization. For Purchase Book it sums Exempt column for domestic transactions. For Sale Book it sums Tax Payer and No Tax Payer Exempt columns"
919-msgstr ""
920-
921-#. module: l10n_ve_fiscal_book
922 #: field:fiscal.book.line,wh_number:0
923 msgid "Withholding number"
924 msgstr ""
925
926=== modified file 'l10n_ve_fiscal_book/model/fiscal_book.py'
927--- l10n_ve_fiscal_book/model/fiscal_book.py 2013-06-11 16:57:10 +0000
928+++ l10n_ve_fiscal_book/model/fiscal_book.py 2013-06-14 17:26:33 +0000
929@@ -119,7 +119,7 @@
930
931 def _get_vat_sdcf_sum(self, cr, uid, ids, field_name, arg, context=None):
932 """ It returns the SDCF sumation of purchase (imported, domestic) or
933- sale (exportation, tax payer, no tax payer) operations types.
934+ sale (Exports, tax payer, Non-Tax Payer) operations types.
935 @param field_name: field ['get_vat_sdcf_sum'] """
936 context = context or {}
937 res = {}.fromkeys(ids, 0.0)
938@@ -241,7 +241,7 @@
939 " accounting books. Options:" \
940 " - Art. 75: Pruchase Book." \
941 " - Art. 76: Sale Book. Reflects every individual operation datail." \
942- " - Art. 77: Sale Book. Groups no tax payer operations in one " \
943+ " - Art. 77: Sale Book. Groups Non-Tax Payer operations in one " \
944 " consolidated line. Only fiscal billing." \
945 " - Art. 78: Sale Book. Hybrid for 76 and 77 article. Show" \
946 " automatic and mechanized operations in individual way, and " \
947@@ -290,7 +290,7 @@
948 multi="get_total_with_iva",
949 string='Total amount with VAT',
950 help="Total with VAT Sum (Import/Export, Domestic, Tax Payer and" \
951- " No Tax Payer"),
952+ " Non-Tax Payer"),
953 'get_vat_sdcf_sum': fields.function(
954 _get_vat_sdcf_sum,
955 type="float", method=True, store=True,
956@@ -314,7 +314,7 @@
957 digits_compute=dp.get_precision('Account'),
958 string="Domestic Untaxed VAT Sum",
959 help="SDCF and Exempt sum for domestict transanctions." \
960- " At Sale book represent the sum of Tax Payer and No Tax payer" \
961+ " At Sale book represent the sum of Tax Payer and Non-Tax Payer" \
962 " transactions."),
963
964 #~ Totalization fields for international transactions
965@@ -329,7 +329,7 @@
966 string="International Taxable Amount",
967 help="Sum of International Tax Base Amounts (reduced, general" \
968 " and additional). Used at 2nd row in thw Sale book's summary" \
969- " with Exportation Sales title"),
970+ " with Exports Sales title"),
971 'imex_exempt_vat_sum': fields.float(
972 digits_compute=dp.get_precision('Account'),
973 string="Exempt Tax",
974@@ -388,26 +388,26 @@
975 string="Exempt Tax",
976 help="Domestic Exempt Tax Totalization. For Purchase Book it" \
977 " sums Exempt column for domestic transactions. For Sale Book it" \
978- " sums Tax Payer and No Tax Payer Exempt columns"),
979+ " sums Tax Payer and Non-Tax Payer Exempt columns"),
980 'do_sdcf_vat_sum': fields.float(
981 digits_compute=dp.get_precision('Account'),
982 string="SDCF Tax",
983 help="Domestic SDCF Tax Totalization. For Purchase Book it sums" \
984 " SDCF column for domestic transactions. For Sale Book it sums" \
985- " Tax Payer and No Tax Payer SDCF columns"),
986+ " Tax Payer and Non-Tax Payer SDCF columns"),
987 'do_general_vat_base_sum': fields.float(
988 digits_compute=dp.get_precision('Account'),
989 string="General VAT Taxable Amount",
990 help="General VAT Taxed Domestic Base Amount Totalization." \
991 " For Purchase Book it sums General VAT Base column for domestic" \
992- " transactions. For Sale Book it sums Tax Payer and No Tax Payer" \
993+ " transactions. For Sale Book it sums Tax Payer and Non-Tax Payer" \
994 " General VAT Base columns"),
995 'do_general_vat_tax_sum': fields.float(
996 digits_compute=dp.get_precision('Account'),
997 string="General VAT Taxed Amount",
998 help="General VAT Taxed Domestic Tax Amount Totalization." \
999 " For Purchase Book it sums General VAT Tax column for domestic" \
1000- " transactions. For Sale Book it sums Tax Payer and No Tax Payer" \
1001+ " transactions. For Sale Book it sums Tax Payer and Non-Tax Payer" \
1002 " General VAT Tax columns"),
1003 'do_additional_vat_base_sum': fields.float(
1004 digits_compute=dp.get_precision('Account'),
1005@@ -428,21 +428,21 @@
1006 string="Reduced VAT Taxable Amount",
1007 help="Reduced VAT Taxed Domestic Base Amount Totalization." \
1008 " For Purchase Book it sums Reduced VAT Base column for domestic" \
1009- " transactions. For Sale Book it sums Tax Payer and No Tax Payer" \
1010+ " transactions. For Sale Book it sums Tax Payer and Non-Tax Payer" \
1011 " Reduced VAT Base columns"),
1012 'do_reduced_vat_tax_sum': fields.float(
1013 digits_compute=dp.get_precision('Account'),
1014 string="Reduced VAT Taxed Amount",
1015 help="Reduced VAT Taxed Domestic Tax Amount Totalization." \
1016 " For Purchase Book it sums Reduced VAT Tax column for domestic" \
1017- " transactions. For Sale Book it sums Tax Payer and No Tax Payer" \
1018+ " transactions. For Sale Book it sums Tax Payer and Non-Tax Payer" \
1019 " Reduced VAT Tax columns"),
1020
1021 #~ Apply only for sale book
1022- #~ Totalization fields for tax payer and no tax payer transactions
1023+ #~ Totalization fields for tax payer and Non-Tax Payer transactions
1024 'ntp_fbl_ids': fields.one2many("fiscal.book.line", "ntp_fb_id",
1025- string = "No Tax Payer Detail Lines",
1026- help="No Tax Payer Lines that are" \
1027+ string = "Non-Tax Payer Detail Lines",
1028+ help="Non-Tax Payer Lines that are" \
1029 " grouped by the statement law that" \
1030 " represent the data of are" \
1031 " consolidate book lines"),
1032@@ -503,52 +503,52 @@
1033 type="float", method=True, store=True,
1034 multi="get_total_with_iva",
1035 string="Total amount with VAT",
1036- help="No Tax Payer Total with VAT Totalization"),
1037+ help="Non-Tax Payer Total with VAT Totalization"),
1038 'ntp_vat_base_sum': fields.float(
1039 digits_compute=dp.get_precision('Account'),
1040- string="No Tax Payer Taxable Amount",
1041- help="No Tax Payer Grand Base Totalization. Sum of all no tax" \
1042+ string="Non-Tax Payer Taxable Amount",
1043+ help="Non-Tax Payer Grand Base Totalization. Sum of all no tax" \
1044 " payer tax bases (reduced, general and additional)"),
1045 'ntp_exempt_vat_sum': fields.float(
1046 digits_compute=dp.get_precision('Account'),
1047 string="Exempt Tax",
1048- help="No Tax Payer Exempt Tax Totalization. Sum of Exempt" \
1049- " column for no tax payer transactions"),
1050+ help="Non-Tax Payer Exempt Tax Totalization. Sum of Exempt" \
1051+ " column for Non-Tax Payer transactions"),
1052 'ntp_sdcf_vat_sum': fields.float(
1053 digits_compute=dp.get_precision('Account'),
1054 string="SDCF Tax",
1055- help="No Tax Payer SDCF Tax Totalization. Sum of SDCF column" \
1056- " for no tax payer transactions"),
1057+ help="Non-Tax Payer SDCF Tax Totalization. Sum of SDCF column" \
1058+ " for Non-Tax Payer transactions"),
1059 'ntp_general_vat_base_sum': fields.float(
1060 digits_compute=dp.get_precision('Account'),
1061 string="General VAT Taxable Amount",
1062- help="General VAT Taxed No Tax Payer Base Amount Totalization." \
1063+ help="General VAT Taxed Non-Tax Payer Base Amount Totalization." \
1064 " Sum of General VAT Base column for taxy payer transactions"),
1065 'ntp_general_vat_tax_sum': fields.float(
1066 digits_compute=dp.get_precision('Account'),
1067 string="General VAT Taxed Amount",
1068- help="General VAT Taxed No Tax Payer Tax Amount Totalization." \
1069- " Sum of General VAT Tax column for no tax payer transactions"),
1070+ help="General VAT Taxed Non-Tax Payer Tax Amount Totalization." \
1071+ " Sum of General VAT Tax column for Non-Tax Payer transactions"),
1072 'ntp_additional_vat_base_sum': fields.float(
1073 digits_compute=dp.get_precision('Account'),
1074 string="Additional VAT Taxable Amount",
1075- help="Additional VAT Taxed No Tax Payer Base Amount Totalization." \
1076- " Sum of Additional VAT Base column for no tax payer transactions"),
1077+ help="Additional VAT Taxed Non-Tax Payer Base Amount Totalization." \
1078+ " Sum of Additional VAT Base column for Non-Tax Payer transactions"),
1079 'ntp_additional_vat_tax_sum': fields.float(
1080 digits_compute=dp.get_precision('Account'),
1081 string="Additional VAT Taxed Amount",
1082- help="Additional VAT Taxed No Tax Payer Tax Amount Totalization." \
1083- " Sum of Additional VAT Tax column for no tax payer transactions"),
1084+ help="Additional VAT Taxed Non-Tax Payer Tax Amount Totalization." \
1085+ " Sum of Additional VAT Tax column for Non-Tax Payer transactions"),
1086 'ntp_reduced_vat_base_sum': fields.float(
1087 digits_compute=dp.get_precision('Account'),
1088 string="Reduced VAT Taxable Amount",
1089- help="Reduced VAT Taxed No Tax Payer Base Amount Totalization." \
1090- " Sum of Reduced VAT Base column for no tax payer transactions"),
1091+ help="Reduced VAT Taxed Non-Tax Payer Base Amount Totalization." \
1092+ " Sum of Reduced VAT Base column for Non-Tax Payer transactions"),
1093 'ntp_reduced_vat_tax_sum': fields.float(
1094 digits_compute=dp.get_precision('Account'),
1095 string="Reduced VAT Taxed Amount",
1096- help="Reduced VAT Taxed No Tax Payer Tax Amount Totalization." \
1097- " Sum of Reduced VAT Tax column for no tax payer transactions"),
1098+ help="Reduced VAT Taxed Non-Tax Payer Tax Amount Totalization." \
1099+ " Sum of Reduced VAT Tax column for Non-Tax Payer transactions"),
1100 }
1101
1102 _defaults = {
1103@@ -983,7 +983,7 @@
1104
1105 def get_grouped_consecutive_lines_ids(self, cr, uid, lines_ids, context=None):
1106 """ Return a list of tuples that represent every line in the book.
1107- If there is a group of consecutive no tax payer with fiscal printer
1108+ If there is a group of consecutive Non-Tax Payer with fiscal printer
1109 billing lines, it will return a unique tuple that holds the information
1110 of the lines. The return tutple has this format
1111 ('invoice_number'[0], 'invoice_number'[-1], [line_brw])
1112@@ -1021,9 +1021,9 @@
1113 return res
1114
1115 def update_book_ntp_lines(self, cr, uid, fb_id, context=None):
1116- """ It consolidate no tax payer book lines into one line considering
1117+ """ It consolidate Non-Tax Payer book lines into one line considering
1118 the consecutiveness and next criteria: fiscal printer and z report.
1119- This consolidated groups are move to another field: No Tax Payer Detail
1120+ This consolidated groups are move to another field: Non-Tax Payer Detail
1121 operations. (This only applys when is a sale book)
1122 @param fb_id: fiscal book id
1123 """
1124@@ -1124,7 +1124,7 @@
1125 context=context)
1126
1127 #~ create consolidate line using ntp_groups_list list, move group lines
1128- #~ to no tax payer lines detail.
1129+ #~ to Non-Tax Payer lines detail.
1130 for line_tuple in ntp_groups_list:
1131 consolidate_line_id = \
1132 self.create_consolidate_line(cr, uid, fb_id, line_tuple,
1133@@ -1141,7 +1141,7 @@
1134 return True
1135
1136 def create_consolidate_line(self, cr, uid, fb_id, line_tuple, context=None):
1137- """ Create a new consolidate no tax payer line for a group of no tax
1138+ """ Create a new consolidate Non-Tax Payer line for a group of no tax
1139 payer operations.
1140 @param fb_id: fiscal book line id.
1141 @param line_tuple: tuple with the information for construct the
1142@@ -1628,7 +1628,7 @@
1143 elif iwdl_id:
1144 res = 'RET'
1145 elif cf_id:
1146- res = 'F86'
1147+ res = 'F/IMP'
1148
1149 return res
1150
1151@@ -1718,9 +1718,9 @@
1152 _columns = {
1153 'fb_id': fields.many2one('fiscal.book', 'Fiscal Book',
1154 help='Fiscal Book that owns this book line'),
1155- 'ntp_fb_id': fields.many2one("fiscal.book", "No Tax Payer Detail",
1156+ 'ntp_fb_id': fields.many2one("fiscal.book", "Non-Tax Payer Detail",
1157 help="Fiscal Book that owns this book line" \
1158- " This Book is only for no tax payer lines"),
1159+ " This Book is only for Non-Tax Payer lines"),
1160 'fbt_ids': fields.one2many('fiscal.book.taxes', 'fbl_id',
1161 string='Tax Lines', help="Tax Lines being" \
1162 " recorded in a Fiscal Book"),
1163@@ -1737,15 +1737,15 @@
1164 "fiscal.book.line",
1165 string="Consolidated Line",
1166 ondelete='cascade',
1167- help="No Tax Payer Consolidated Line. Indicate the id of the" \
1168- " consolidated line where this no tax payer line belongs"),
1169+ help="Non-Tax Payer Consolidated Line. Indicate the id of the" \
1170+ " consolidated line where this Non-Tax Payer line belongs"),
1171 'parent_left': fields.integer('Left Parent', select=1),
1172 'parent_right': fields.integer('Right Parent', select=1),
1173 'child_ids': fields.one2many(
1174 "fiscal.book.line",
1175 "parent_id",
1176- string="No Tax Payer Detail Line",
1177- help="No Tax Payer Group of book lines that this line represent"),
1178+ string="Non-Tax Payer Detail Line",
1179+ help="Non-Tax Payer Group of book lines that this line represent"),
1180
1181 #~ Invoice and/or Document Data
1182 'rank': fields.integer("Line", required=True, help="Line Position"),
1183@@ -1792,7 +1792,7 @@
1184 " store the invoice number generate" \
1185 " by the fiscal printer machine"),
1186 'imex_date': fields.date(string='Imex Date',
1187- help='Invoice Importation/Exportation Date'),
1188+ help='Invoice Imports/Exports Date'),
1189 'debit_affected': fields.char(string='Affected Debit Notes',
1190 size=256,
1191 help='Debit notes affected'),
1192@@ -1800,15 +1800,15 @@
1193 size=256,
1194 help='Credit notes affected'),
1195 'type': fields.selection(
1196- [('im', 'Import'),
1197+ [('im', 'Imports'),
1198 ('do', 'Domestic'),
1199- ('ex', 'Exportation'),
1200+ ('ex', 'Exports'),
1201 ('tp', 'Tax Payer'),
1202- ('ntp', 'No Tax Payer')],
1203+ ('ntp', 'Non-Tax Payer')],
1204 string = 'Transaction Type', required=True,
1205 help="Book line transtaction type:" \
1206 " - Purchase: Import or Domestic." \
1207- " - Sales: Expertation, Tax Payer, No Tax Payer."),
1208+ " - Sales: Expertation, Tax Payer, Non-Tax Payer."),
1209 'void_form': fields.char(string='Transaction type', size=192,
1210 help="Operation Type"),
1211 'fiscal_printer': fields.char(string='Fiscal machine number',
1212@@ -1886,15 +1886,15 @@
1213 ('adicional', 'General Aliquot + Additional')],
1214 'Tax Type'),
1215 'op_type': fields.selection(
1216- [('im', 'Import'),
1217+ [('im', 'Imports'),
1218 ('do', 'Domestic'),
1219- ('ex', 'Exportation'),
1220+ ('ex', 'Exports'),
1221 ('tp', 'Tax Payer'),
1222- ('ntp', 'No Tax Payer')],
1223+ ('ntp', 'Non-Tax Payer')],
1224 string = 'Operation Type',
1225 help="Operation Type:" \
1226 " - Purchase: Import or Domestic." \
1227- " - Sales: Expertation, Tax Payer, No Tax Payer."),
1228+ " - Sales: Expertation, Tax Payer, Non-Tax Payer."),
1229 'base_amount_sum': fields.float('Taxable Amount Sum'),
1230 'tax_amount_sum': fields.float('Taxed Amount Sum'),
1231 }
1232
1233=== modified file 'l10n_ve_fiscal_book/view/fiscal_book.xml'
1234--- l10n_ve_fiscal_book/view/fiscal_book.xml 2013-06-10 21:25:04 +0000
1235+++ l10n_ve_fiscal_book/view/fiscal_book.xml 2013-06-14 17:26:33 +0000
1236@@ -170,7 +170,7 @@
1237
1238 <group colspan="4" col="3" string="Taxes Totalization">
1239 <group colspan="3" col="3">
1240- <group colspan="1" col="2" string="Exportation">
1241+ <group colspan="1" col="2" string="Exports">
1242 <field name="get_total_with_iva_imex_sum" readonly="True"/>
1243 <field name="imex_vat_base_sum" readonly="True"/>
1244 <field name="imex_exempt_vat_sum" readonly="True"/>
1245@@ -194,7 +194,7 @@
1246 <field name="tp_reduced_vat_base_sum" readonly="True"/>
1247 <field name="tp_reduced_vat_tax_sum" readonly="True"/>
1248 </group>
1249- <group colspan="1" col="2" string="No Tax Payer">
1250+ <group colspan="1" col="2" string="Non-Tax Payer">
1251 <field name="get_total_with_iva_ntp_sum" readonly="True"/>
1252 <field name="ntp_vat_base_sum" readonly="True"/>
1253 <field name="ntp_exempt_vat_sum" readonly="True"/>
1254@@ -214,7 +214,7 @@
1255 </group>
1256
1257 </page>
1258- <page string="No Tax Payer Detail" attrs="{'invisible': [('article_number', 'not in', ['77','78'])]}">
1259+ <page string="Non-Tax Payer Detail" attrs="{'invisible': [('article_number', 'not in', ['77','78'])]}">
1260 <field name="ntp_fbl_ids" nolabel="1" colspan="4" readonly="True">
1261 <tree string="Fiscal Book Lines">
1262 <field name="parent_id"/>
1263@@ -371,7 +371,7 @@
1264 <field name="get_vat_sdcf_sum" readonly="True"/>
1265 <field name="get_total_with_iva_sum" readonly="True"/>
1266 </group>
1267- <group colspan="1" col="2" string="Importations">
1268+ <group colspan="1" col="2" string="Imports">
1269 <field name="get_total_with_iva_imex_sum" readonly="True"/>
1270 <field name="imex_vat_base_sum" readonly="True"/>
1271 <field name="imex_exempt_vat_sum" readonly="True"/>