Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/7.0-changes-openerp-alan into lp:openerp-venezuela-localization

  1. 7.0-changes-openerp-alan
  2. Merge into trunk
Proposed by Jesus Alan Guzman Escalante
Status: Needs review
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/7.0-changes-openerp-alan
Merge into: lp:openerp-venezuela-localization
Diff against target: 1406 lines (+682/-413) (has conflicts)
14 files modified
l10n_ve_fiscal_book/__openerp__.py (+26/-20)
l10n_ve_fiscal_requirements/__openerp__.py (+64/-9)
l10n_ve_generic/__openerp__.py (+28/-14)
l10n_ve_imex/__openerp__.py (+25/-20)
l10n_ve_sale_purchase/__openerp__.py (+29/-21)
l10n_ve_split_invoice/__openerp__.py (+23/-20)
l10n_ve_vat_write_off/__openerp__.py (+24/-6)
l10n_ve_withholding/__openerp__.py (+29/-7)
l10n_ve_withholding_islr/__openerp__.py (+48/-45)
l10n_ve_withholding_iva/__openerp__.py (+44/-10)
l10n_ve_withholding_muni/__openerp__.py (+31/-28)
l10n_ve_withholding_src/__openerp__.py (+43/-7)
ovl/__openerp__.py (+46/-11)
ovl_all/__openerp__.py (+222/-195)
Text conflict in l10n_ve_fiscal_requirements/__openerp__.py
Text conflict in l10n_ve_vat_write_off/__openerp__.py
Text conflict in l10n_ve_withholding/__openerp__.py
Text conflict in l10n_ve_withholding_iva/__openerp__.py
Text conflict in l10n_ve_withholding_src/__openerp__.py
Text conflict in ovl/__openerp__.py
Text conflict in ovl_all/__openerp__.py
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/7.0-changes-openerp-alan
Reviewer Review Type Date Requested Status
Jesus Alan Guzman Escalante Pending
Moisés López - http://www.vauxoo.com Pending
Review via email: mp+233814@code.launchpad.net

Description of the change

changes generated __openerp__.py

To post a comment you must log in.
lp:~vauxoo/openerp-venezuela-localization/7.0-changes-openerp-alan updated
1014. By hbto [Vauxoo] http://www.vauxoo.com

[FIX] Unlinking Journal Entry Prior to Unlinking it

1015. By hbto [Vauxoo] http://www.vauxoo.com

[ADD] How to compute ISLR

1016. By hbto [Vauxoo] http://www.vauxoo.com

[IMP] Wizard to Change Income Withholding Concepts from approved invoices

1017. By Launchpad Translations on behalf of openerp-venezuela

Launchpad automatic translations update.

1018. By Yanina Aular (Vauxoo)

[ADD] multicurrency in ISLR

1019. By hbto [Vauxoo] http://www.vauxoo.com

[FIX] A more readable error when no rates are available for a Income Wh Concept

1020. By Katherine Zaoral (Vauxoo)

[FIX] at ISLR module, field 'account_invoice_line_id'.

1021. By Yanina Aular (Vauxoo)

[FIX] date_due for date_invoice

1022. By Katherine Zaoral (Vauxoo)

[MERGE] add new field 'fortnight' to fiscal book model. This new field is used
to filter the invoices, wh iva lines and taxes of the book, Also the new field
is used into the unique constraint for fiscal book.

1023. By Katherine Zaoral (Vauxoo)

[MERGE] add the 'propagate_invoice_date_to_vat_withholding' boolean field to
the vat withholding document and some fixes in the l10n_ve_withholding_iva
module.

1024. By Katherine Zaoral (Vauxoo)

[MERGE] new validations for supplier invoice were added to
l10n_ve_withholding_iva and l10n_ve_fiscal_requiriments module. The document
date field must be: 1) set when the invoice is in open state, 2) need to be
less or equal to the invoice date field, 3) need to be readonly when the
invoice is in open state.

1025. By Katherine Zaoral (Vauxoo)

[MERGE] add the 'propagate_invoice_date_to_income_withholding' boolean field to
the income withholding document and some fixes in the l10n_ve_withholding_iva
were made module. The new 'propagate_invoice_date_to_income_withholding' field
is used to check if or if not set the voucher date of the wh document.

1026. By Katherine Zaoral (Vauxoo)

[MERGE] add totalization row to the fiscal book lines in the sale/purchase
fiscal book form views.

1027. By Launchpad Translations on behalf of openerp-venezuela

Launchpad automatic translations update.

1028. By Katherine Zaoral (Vauxoo)

[MERGE] add new wizard that let to change the inoice tax exempt field. Fiscal
book and IVA module was also change to take into account the sin_cred field.
And the field itself suffer some cosmetic changes.

1029. By hbto [Vauxoo] http://www.vauxoo.com

[IMP] Monthly Income Withholding Report Added

1030. By hbto [Vauxoo] http://www.vauxoo.com

[IMP] Changing amount to funcional field in islr.wh.doc.line
So now is possible to apply ISLR RATE 2 Manually

1031. By hbto [Vauxoo] http://www.vauxoo.com

[FIX] Domain for invoices from partner in income withholding

1032. By hbto [Vauxoo] http://www.vauxoo.com

[IMP] Adding a menu for islr_rates

1033. By hbto [Vauxoo] http://www.vauxoo.com

[FIX] Wrong Concept in rate 054

1034. By hbto [Vauxoo] http://www.vauxoo.com

[IMP] Rate2 for ISLR Wh has landed on OVEL.
Missing fixes: YAML tests for ISLR should use date_uid instead of date_ret

1035. By hbto [Vauxoo] http://www.vauxoo.com

[FIX] Indefined variable prior to assigment

1036. By hbto [Vauxoo] http://www.vauxoo.com

[MERGE] Fixing YAML Tests for ISLR

1037. By hbto [Vauxoo] http://www.vauxoo.com

[MERGE]
[IMP] Wh Base Amount & Wh Amount now are multicurrency.
[IMP] Monthly Report for partner is now multicurrency.
[GLITCH] Sorting the nodes to avoid complains from SENIAT Portal

1038. By hbto [Vauxoo] http://www.vauxoo.com

[IMP] Status bar is added to islr xml wh doc View Form

1039. By hbto [Vauxoo] http://www.vauxoo.com

[FIX] For Supplier invoice being withheld
invoice number only numbers maximum 10 chars otherwise '0'
control number only numbers maximum 8 chars otherwise 'NA'

1040. By Jesus Alan Guzman Escalante

[IMP] changes in file __openerp__.py on modules

1041. By Jesus Alan Guzman Escalante

[IMP] changes in files __openerp__.py on comment #vim

1042. By Jesus Alan Guzman Escalante

[IMP] space at the end of each line was removed and changed tabs by spaces

1043. By Jesus Alan Guzman Escalante

[IMP]eliminated the last newline

1044. By Jesus Alan Guzman Escalante

[IMP]4 spaces at the end of the item description and splitting the line in the name

Unmerged revisions

1044. By Jesus Alan Guzman Escalante

[IMP]4 spaces at the end of the item description and splitting the line in the name

1043. By Jesus Alan Guzman Escalante

[IMP]eliminated the last newline

1042. By Jesus Alan Guzman Escalante

[IMP] space at the end of each line was removed and changed tabs by spaces

1041. By Jesus Alan Guzman Escalante

[IMP] changes in files __openerp__.py on comment #vim

1040. By Jesus Alan Guzman Escalante

[IMP] changes in file __openerp__.py on modules

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'l10n_ve_fiscal_book/__openerp__.py'
2--- l10n_ve_fiscal_book/__openerp__.py 2014-10-10 23:30:31 +0000
3+++ l10n_ve_fiscal_book/__openerp__.py 2014-11-19 02:46:59 +0000
4@@ -28,13 +28,12 @@
5 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
6 #
7 ##############################################################################
8-
9 {
10- "name" : "Fiscal Report For Venezuela",
11- "version" : "0.5",
12- "depends" : ["account","l10n_ve_withholding_iva","l10n_ve_fiscal_requirements","l10n_ve_imex"],
13- "author" : "Vauxoo",
14- "description" : """
15+ "name": "Fiscal Report For Venezuela",
16+ "version": "0.5",
17+ "author": "Vauxoo",
18+ "category": "Generic Modules/Accounting",
19+ "description": """
20 Fiscal Book
21 ===============================================================================
22 Build all Fiscal Reports for Law in Venezuela.
23@@ -45,17 +44,23 @@
24
25 .. note::
26 * *El libro de ventas no contempla la sección de Ventas por cuenta de Terceros.*
27-""",
28- "website" : "http://openerp.com.ve",
29- "category" : "Generic Modules/Accounting",
30- "init_xml" : [
31+ # 'test/purchase.yml',
32+ # 'test/sale.yml',
33+ """,
34+ "website": "http://openerp.com.ve",
35+ "license": "",
36+ "depends": [
37+ "account",
38+ "l10n_ve_withholding_iva",
39+ "l10n_ve_fiscal_requirements",
40+ "l10n_ve_imex"
41 ],
42- "demo_xml" : [
43+ "demo": [
44 "demo/book_base_demo.xml",
45 "demo/sale_book_demo.xml",
46- "demo/purchase_book_demo.xml",
47+ "demo/purchase_book_demo.xml"
48 ],
49- "update_xml" : [
50+ "data": [
51 "wizard/fiscal_book_wizard_view.xml",
52 "view/adjustment_book.xml",
53 "view/fiscal_book.xml",
54@@ -64,12 +69,13 @@
55 "security/fiscal_book_security.xml",
56 "security/ir.model.access.csv",
57 "wizard/change_invoice_sin_cred_view.xml",
58- "view/account_invoice_view.xml",
59- ],
60- "test": [
61- # 'test/purchase.yml',
62- # 'test/sale.yml',
63- ],
64- "active": False,
65+ "view/account_invoice_view.xml"
66+ ],
67+ "test": [],
68+ "js": [],
69+ "css": [],
70+ "qweb": [],
71 "installable": True,
72+ "auto_install": False
73 }
74+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
75
76=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
77--- l10n_ve_fiscal_requirements/__openerp__.py 2014-10-10 23:30:31 +0000
78+++ l10n_ve_fiscal_requirements/__openerp__.py 2014-11-19 02:46:59 +0000
79@@ -23,11 +23,10 @@
80 # along with this program. If not, see <http://www.gnu.org/licenses/>.
81 ################################################################################
82 {
83- "name" : "Venezuelan Fiscal Requirements",
84- "version" : "1.0",
85- "author" : "Vauxoo",
86- "website" : "http://vauxoo.com",
87- "category": 'Localization',
88+ "name": "Venezuelan Fiscal Requirements",
89+ "version": "1.0",
90+ "author": "Vauxoo",
91+ "category": "Localization",
92 "description": """
93 - Invoice Control Number.
94 - Tax*except concept, necesary rule by Venezuelan Laws.
95@@ -63,6 +62,7 @@
96
97 Custom modules can be found in the following branch:
98 * Addons-vauxoo: lp:addons-vauxoo/7.0
99+<<<<<<< TREE
100 """,
101 "depends" : [
102 "account",
103@@ -111,10 +111,65 @@
104 'test/fr_purchase_test.yml',
105 'test/fr_control_number.yml',
106 'test/fr_damaged.yml',
107+=======
108+>>>>>>> MERGE-SOURCE
109 # 'test/fr_debit_note.yml',
110 # 'test/fr_refund_note.yml',
111- ],
112- 'installable': True,
113- 'active': False,
114+ """,
115+ "website": "http://vauxoo.com",
116+ "license": "",
117+ "depends": [
118+ "account",
119+ "base_vat",
120+ "account_accountant",
121+ "account_voucher",
122+ "account_cancel",
123+ "debit_credit_note"
124+ ],
125+ "demo": [
126+ "demo/demo_partners.xml",
127+ "demo/demo_journal.xml",
128+ "demo/demo_invoice.xml",
129+ "demo/demo_taxes.xml"
130+ ],
131+ "data": [
132+ "data/l10n_ut_data.xml",
133+ "data/seniat_url_data.xml",
134+ "data/ir_sequence.xml",
135+ "security/security_view.xml",
136+ "security/ir.model.access.csv",
137+ "view/fr_view.xml",
138+ "wizard/wizard_invoice_nro_ctrl_view.xml",
139+ "wizard/wizard_url_seniat_view.xml",
140+ "wizard/update_info_partner.xml",
141+ "wizard/account_invoice_debit_view.xml",
142+ "wizard/search_info_partner_seniat.xml",
143+ "wizard/wizard_nro_ctrl_view.xml",
144+ "view/res_company_view.xml",
145+ "view/l10n_ut_view.xml",
146+ "wizard/wizard_update_name_view.xml",
147+ "view/partner_view.xml",
148+ "view/account_inv_refund_nctrl_view.xml",
149+ "view/account_tax_view.xml",
150+ "view/account_invoice_view.xml"
151+ ],
152+ "test": [
153+ "test/account_customer_invoice.yml",
154+ "test/account_supplier_invoice.yml",
155+ "test/fr_vat_search_test.yml",
156+ "test/fr_ut_test.yml",
157+ "test/fr_vat_test.yml",
158+ "test/fr_tax_test.yml",
159+ "test/fr_address.yml",
160+ "test/fr_sale_test.yml",
161+ "test/fr_purchase_test.yml",
162+ "test/fr_control_number.yml",
163+ "test/fr_damaged.yml"
164+ ],
165+ "js": [],
166+ "css": [],
167+ "qweb": [],
168+ "installable": True,
169+ "auto_install": False
170 }
171-
172+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
173
174=== modified file 'l10n_ve_generic/__openerp__.py'
175--- l10n_ve_generic/__openerp__.py 2013-11-18 20:11:05 +0000
176+++ l10n_ve_generic/__openerp__.py 2014-11-19 02:46:59 +0000
177@@ -23,24 +23,38 @@
178 #
179 ##############################################################################
180 {
181- "name" : "Venezuela - Generic Test",
182- "version" : "1.0",
183- "author" : ['OpenERP SA', "Vauxoo"],
184- "category" : "Localization/Account Charts",
185- "description":
186-'''
187+ "name": "Venezuela - Generic Test",
188+ "version": "1.0",
189+ "author": [
190+ "OpenERP SA",
191+ "Vauxoo"
192+ ],
193+ "category": "Localization/Account Charts",
194+ "description": """
195 This is the module to manage the accounting chart for Venezuela in OpenERP.
196 ===========================================================================
197
198 Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela.
199-''',
200- "depends" : ["account", "base_vat", "account_chart"],
201- "demo_xml" : [],
202- "update_xml" : ['account_tax_code.xml',"account_chart.xml",
203- 'account_tax.xml','l10n_chart_ve_wizard.xml'],
204- "auto_install": False,
205+ """,
206+ "website": "",
207+ "license": "",
208+ "depends": [
209+ "account",
210+ "base_vat",
211+ "account_chart"
212+ ],
213+ "demo": [],
214+ "data": [
215+ "account_tax_code.xml",
216+ "account_chart.xml",
217+ "account_tax.xml",
218+ "l10n_chart_ve_wizard.xml"
219+ ],
220+ "test": [],
221+ "js": [],
222+ "css": [],
223+ "qweb": [],
224 "installable": True,
225- 'images': ['images/config_chart_l10n_ve.jpeg','images/l10n_ve_chart.jpeg'],
226+ "auto_install": False
227 }
228 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
229-
230
231=== modified file 'l10n_ve_imex/__openerp__.py'
232--- l10n_ve_imex/__openerp__.py 2014-01-08 15:29:52 +0000
233+++ l10n_ve_imex/__openerp__.py 2014-11-19 02:46:59 +0000
234@@ -24,36 +24,41 @@
235 # You should have received a copy of the GNU Affero General Public License
236 # along with this program. If not, see <http://www.gnu.org/licenses/>.
237 ###############################################################################
238-
239 {
240 "name": "Imex",
241 "version": "0.2",
242- "depends": ["base",
243- "account",
244- "decimal_precision",
245- "l10n_ve_fiscal_requirements"
246- ],
247 "author": "Tecvemar/Vauxoo",
248+ "category": "Generic Modules/Accounting",
249 "description": """
250 Imex
251 ===============================================================
252 This modules handles the openerp venezuela localization import
253 and export transactions. It specify the customs form model for
254 import declaration SENIAT Official FORM (Forma 99086).
255-""",
256+ """,
257 "website": "http://vauxoo.com",
258- "category": "Generic Modules/Accounting",
259- "init_xml": [],
260- "demo_xml": [],
261- "update_xml": [
262- 'security/ir.model.access.csv',
263- 'security/ir_rule.xml',
264- 'view/customs_form_config.xml',
265- 'view/customs_form.xml',
266- 'view/customs_form_menus.xml',
267- 'view/invoice.xml',
268- 'workflow/customs_form.xml',
269- ],
270- "active": False,
271+ "license": "",
272+ "depends": [
273+ "base",
274+ "account",
275+ "decimal_precision",
276+ "l10n_ve_fiscal_requirements"
277+ ],
278+ "demo": [],
279+ "data": [
280+ "security/ir.model.access.csv",
281+ "security/ir_rule.xml",
282+ "view/customs_form_config.xml",
283+ "view/customs_form.xml",
284+ "view/customs_form_menus.xml",
285+ "view/invoice.xml",
286+ "workflow/customs_form.xml"
287+ ],
288+ "test": [],
289+ "js": [],
290+ "css": [],
291+ "qweb": [],
292 "installable": True,
293+ "auto_install": False
294 }
295+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
296
297=== modified file 'l10n_ve_sale_purchase/__openerp__.py'
298--- l10n_ve_sale_purchase/__openerp__.py 2014-10-10 23:30:31 +0000
299+++ l10n_ve_sale_purchase/__openerp__.py 2014-11-19 02:46:59 +0000
300@@ -23,31 +23,39 @@
301 # along with this program. If not, see <http://www.gnu.org/licenses/>.
302 ################################################################################
303 {
304- 'name' : 'ISLR Sale and Purchase Functionalities',
305- 'version' : '0.3',
306- 'author' : 'Vauxoo',
307- 'description' : '''Due to the Dependendy reduction on the l10n_ve_withholding_islr module, it was necessary to incorporate the functionalities regarding with the eliminated dependencies on another module.
308+ "name": "ISLR Sale and Purchase Functionalities",
309+ "version": "0.3",
310+ "author": "Vauxoo",
311+ "category": "",
312+ "description": """Due to the Dependendy reduction on the l10n_ve_withholding_islr module, it was necessary to incorporate the functionalities regarding with the eliminated dependencies on another module.
313
314 Because of that this module was created. This module adds the withholding income concept to the sale and purchase orders. It moves the withholding income concept defined in from the sale order to the stock, and, if the invoice was created from the stock, it moves the withholding income concept to the invoice. This also works the same way for purchase orders.
315- ''',
316- 'category' : '',
317- 'website' : 'http://openerp.com',
318- 'depends' : ['sale', 'purchase', 'stock', 'l10n_ve_withholding_islr'],
319- 'update_xml' : [
320- 'view/product_view.xml',
321- 'view/stock_view.xml',
322- 'view/purchase_view.xml',
323- 'view/sale_order_view.xml',
324- ],
325- 'demo' : [],
326- 'active' : False,
327- 'installable': True,
328- 'test': [
329-# 'test/purchase_order.yml',
330+ # 'test/purchase_order.yml',
331 # 'test/purchase_picking.yml',
332 # 'test/purchase_validation.yml',
333 # 'test/sale_order.yml',
334 # 'test/sale_validation.yml',
335- ],
336-
337+ """,
338+ "website": "http://openerp.com",
339+ "license": "",
340+ "depends": [
341+ "sale",
342+ "purchase",
343+ "stock",
344+ "l10n_ve_withholding_islr"
345+ ],
346+ "demo": [],
347+ "data": [
348+ "view/product_view.xml",
349+ "view/stock_view.xml",
350+ "view/purchase_view.xml",
351+ "view/sale_order_view.xml"
352+ ],
353+ "test": [],
354+ "js": [],
355+ "css": [],
356+ "qweb": [],
357+ "installable": True,
358+ "auto_install": False
359 }
360+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
361
362=== modified file 'l10n_ve_split_invoice/__openerp__.py'
363--- l10n_ve_split_invoice/__openerp__.py 2013-11-18 09:24:59 +0000
364+++ l10n_ve_split_invoice/__openerp__.py 2014-11-19 02:46:59 +0000
365@@ -22,13 +22,12 @@
366 # You should have received a copy of the GNU Affero General Public License
367 # along with this program. If not, see <http://www.gnu.org/licenses/>.
368 ##############################################################################
369-
370 {
371- "name" : "Split Invoices",
372- "version" : "0.2",
373- "depends" : ["account"],
374- "author" : "Vauxoo",
375- "description" : """For legal reasons in Venezuela we need just ONE invoice per page, with this module depending on your company configuration you will stablish the number of lines per invoice, with this you will be able of:
376+ "name": "Split Invoices",
377+ "version": "0.2",
378+ "author": "Vauxoo",
379+ "category": "Localization",
380+ "description": """For legal reasons in Venezuela we need just ONE invoice per page, with this module depending on your company configuration you will stablish the number of lines per invoice, with this you will be able of:
381
382 - Add module for establishing the number of lines per invoice
383 - Split Invoice according number of lines per invoice once you confirm it.
384@@ -43,20 +42,24 @@
385 4) Validate the invoice document
386
387 The document should be now splited on N invoices with the number of lines that you specified
388-""",
389- "website" : "http://vauxoo.com",
390- "category" : "Localization",
391- "init_xml" : [
392- ],
393- "demo_xml" : [
394- ],
395- "update_xml" : [
396 #~ "view/installer_view.xml",
397- "view/company_view.xml",
398- ],
399- 'test': [
400- 'test/spl_test.yml',
401- ],
402- "active": False,
403+ """,
404+ "website": "http://vauxoo.com",
405+ "license": "",
406+ "depends": [
407+ "account"
408+ ],
409+ "demo": [],
410+ "data": [
411+ "view/company_view.xml"
412+ ],
413+ "test": [
414+ "test/spl_test.yml"
415+ ],
416+ "js": [],
417+ "css": [],
418+ "qweb": [],
419 "installable": True,
420+ "auto_install": False
421 }
422+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
423
424=== modified file 'l10n_ve_vat_write_off/__openerp__.py'
425--- l10n_ve_vat_write_off/__openerp__.py 2014-10-10 23:30:31 +0000
426+++ l10n_ve_vat_write_off/__openerp__.py 2014-11-19 02:46:59 +0000
427@@ -1,3 +1,4 @@
428+<<<<<<< TREE
429 {
430 "name" : "VAT Write Off",
431 "version" : "0.5",
432@@ -5,14 +6,31 @@
433 "report_webkit"],
434 "author" : "Vauxoo",
435 "description" : """
436+=======
437+{
438+ "name": "VAT Write Off",
439+ "version": "0.5",
440+ "author": "Vauxoo",
441+ "category": "Generic Modules/Accounting",
442+ "description": """
443+>>>>>>> MERGE-SOURCE
444 """,
445- "website" : "http://openerp.com.ve",
446- "category" : "Generic Modules/Accounting",
447- "update_xml" : [
448+ "website": "http://openerp.com.ve",
449+ "license": "",
450+ "depends": [
451+ "l10n_ve_fiscal_book",
452+ "report_webkit"
453+ ],
454+ "demo": [],
455+ "data": [
456 "report/l10n_ve_vat_write_off_report.xml",
457- "view/l10n_ve_vat_write_off.xml",
458+ "view/l10n_ve_vat_write_off.xml"
459 ],
460- "active": False,
461+ "test": [],
462+ "js": [],
463+ "css": [],
464+ "qweb": [],
465 "installable": False,
466+ "auto_install": False
467 }
468-
469+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
470
471=== modified file 'l10n_ve_withholding/__openerp__.py'
472--- l10n_ve_withholding/__openerp__.py 2014-10-10 23:30:31 +0000
473+++ l10n_ve_withholding/__openerp__.py 2014-11-19 02:46:59 +0000
474@@ -23,11 +23,10 @@
475 # along with this program. If not, see <http://www.gnu.org/licenses/>.
476 ################################################################################
477 {
478- "name" : "Management withholdings Venezuelan laws",
479- "version" : "0.2",
480- "author" : "Vauxoo",
481- "website" : "http://vauxoo.com",
482- "category": 'Generic Modules/Accounting',
483+ "name": "Management withholdings Venezuelan laws",
484+ "version": "0.2",
485+ "author": "Vauxoo",
486+ "category": "Generic Modules/Accounting",
487 "description": """- General Method for account move for Venezuela withholding process.
488 - Add relation between account invoice tax and account tax, to avoid loss historical relation.
489 - Add account journals types or withholding VAT and Income.
490@@ -38,6 +37,7 @@
491 TODO:
492 -
493 """,
494+<<<<<<< TREE
495 'init_xml': [],
496 "depends" : ["l10n_ve_fiscal_requirements"],
497 'update_xml': [
498@@ -54,7 +54,29 @@
499 ],
500 'installable': True,
501 'active': False,
502+=======
503+ "website": "http://vauxoo.com",
504+ "license": "",
505+ "depends": [
506+ "l10n_ve_fiscal_requirements"
507+ ],
508+ "demo": [],
509+ "data": [
510+ "security/withholding_security.xml",
511+ "security/ir.model.access.csv",
512+ "data/l10n_ve_withholding_data.xml",
513+ "view/l10n_ve_withholding_view.xml",
514+ "workflow/wh_action_server.xml"
515+ ],
516+ "test": [
517+ "test/account_supplier_invoice.yml",
518+ "test/wh_pay_invoice.yml"
519+ ],
520+ "js": [],
521+ "css": [],
522+ "qweb": [],
523+ "installable": True,
524+ "auto_install": False
525+>>>>>>> MERGE-SOURCE
526 }
527-
528-
529 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
530
531=== modified file 'l10n_ve_withholding_islr/__openerp__.py'
532--- l10n_ve_withholding_islr/__openerp__.py 2014-09-24 01:30:05 +0000
533+++ l10n_ve_withholding_islr/__openerp__.py 2014-11-19 02:46:59 +0000
534@@ -25,14 +25,12 @@
535 # You should have received a copy of the GNU Affero General Public License
536 # along with this program. If not, see <http://www.gnu.org/licenses/>.
537 ##############################################################################
538-
539 {
540- "name" : "Automatically Calculation Income Withholding",
541- "version" : "0.1",
542- "author" : "Vauxoo",
543- "category" : "General",
544- "website": "http://wiki.openerp.org.ve/",
545- "description": ''' - Generate the voucher of income withholding to validate the invoice.
546+ "name": "Automatically Calculation Income Withholding",
547+ "version": "0.1",
548+ "author": "Vauxoo",
549+ "category": "General",
550+ "description": """ - Generate the voucher of income withholding to validate the invoice.
551 - Generate the report of voucher of income withholding.
552 - Generate the file .xml required by the Venezuelan laws, for agent of income withholding specials.
553 - Generate view for load the concepts of wittholding whith their rates.
554@@ -41,47 +39,52 @@
555 - Send an email to supplier with approved withholdings, if not opt_out in the partner
556 #If you want be able to propose withholding concepts from sales and purchases you must install extra module @section{l10n_ve_sale_purchase}.
557
558-''',
559- "depends" : [
560+ # ,"edi"],
561+ #"edi/islr_wh_doc_action_data.xml",
562+ """,
563+ "website": "http://wiki.openerp.org.ve/",
564+ "license": "",
565+ "depends": [
566 "account",
567 "l10n_ve_withholding",
568 "l10n_ve_fiscal_requirements",
569 "product",
570- "report_webkit",
571- # ,"edi"],
572- ],
573- "init_xml" : [],
574- "demo_xml":[
575- "demo/l10n_ve_islr_withholding_demo.xml",
576- ],
577- "update_xml" : [
578- "view/installer.xml",
579- "security/wh_islr_security.xml",
580- "security/ir.model.access.csv",
581- "data/l10n_ve_islr_withholding_data.xml",
582- "data/retencion_islr_sequence.xml",
583- "view/wh_islr_view.xml",
584- "wizard/income_wh_change_concept.xml",
585- "view/invoice_view.xml",
586- "view/partner_view.xml",
587- "view/res_company_view.xml",
588- "report/islr_wh_report.xml",
589- "view/islr_wh_doc_view.xml",
590- "view/islr_wh_concept_view.xml",
591- "view/product_view.xml",
592- "view/islr_xml_wh.xml",
593- "workflow/islr_wh_workflow.xml",
594- "workflow/wh_action_server.xml",
595- #"edi/islr_wh_doc_action_data.xml",
596- "wizard/partner_income_wh_print_view.xml",
597- "data/partner_income_wh_report_data.xml",
598- "report/partner_income_wh_report.xml",
599- ],
600- 'test': [
601- 'test/supplier_wh_islr_invoice.yml',
602- 'test/supplier_wh_islr_doc.yml',
603- 'test/customer_wh_islr_doc.yml',
604- ],
605- "active": False,
606+ "report_webkit"
607+ ],
608+ "demo": [
609+ "demo/l10n_ve_islr_withholding_demo.xml"
610+ ],
611+ "data": [
612+ "view/installer.xml",
613+ "security/wh_islr_security.xml",
614+ "security/ir.model.access.csv",
615+ "data/l10n_ve_islr_withholding_data.xml",
616+ "data/retencion_islr_sequence.xml",
617+ "view/wh_islr_view.xml",
618+ "wizard/income_wh_change_concept.xml",
619+ "view/invoice_view.xml",
620+ "view/partner_view.xml",
621+ "view/res_company_view.xml",
622+ "report/islr_wh_report.xml",
623+ "view/islr_wh_doc_view.xml",
624+ "view/islr_wh_concept_view.xml",
625+ "view/product_view.xml",
626+ "view/islr_xml_wh.xml",
627+ "workflow/islr_wh_workflow.xml",
628+ "workflow/wh_action_server.xml",
629+ "wizard/partner_income_wh_print_view.xml",
630+ "data/partner_income_wh_report_data.xml",
631+ "report/partner_income_wh_report.xml"
632+ ],
633+ "test": [
634+ "test/supplier_wh_islr_invoice.yml",
635+ "test/supplier_wh_islr_doc.yml",
636+ "test/customer_wh_islr_doc.yml"
637+ ],
638+ "js": [],
639+ "css": [],
640+ "qweb": [],
641 "installable": True,
642+ "auto_install": False
643 }
644+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
645
646=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
647--- l10n_ve_withholding_iva/__openerp__.py 2014-10-10 23:30:31 +0000
648+++ l10n_ve_withholding_iva/__openerp__.py 2014-11-19 02:46:59 +0000
649@@ -27,11 +27,11 @@
650 # along with this program. If not, see <http://www.gnu.org/licenses/>.
651 ##############################################################################
652 {
653- "name" : "Management withholding vat based in the Venezuelan tax laws",
654- "version" : "1.1",
655- "author" : "Vauxoo",
656- "website" : "http://vauxoo.com",
657- "category": 'Generic Modules/Accounting',
658+ "name": "Management withholding vat based in the Venezuelan tax la"
659+ "ws",
660+ "version": "1.1",
661+ "author": "Vauxoo",
662+ "category": "Generic Modules/Accounting",
663 "description": """Management withholding vat based in the Venezuelan tax laws.
664
665 - Create from invoice voucher withholding vat, to validate invoice.
666@@ -44,6 +44,7 @@
667
668 - If you want to be able to print the vat withholding report correctly, It is recomended to define
669 the size of the logo of the company in 886 x 236 pixeles.
670+<<<<<<< TREE
671 """,
672 "depends" : [
673 "l10n_ve_withholding"
674@@ -74,6 +75,8 @@
675 ],
676
677 'test': [
678+=======
679+>>>>>>> MERGE-SOURCE
680 #'test/purchase_invoice_wh_iva.yml',
681 #'test/sale_invoice_wh_iva.yml',
682 #'test/sale_wh_iva.yml',
683@@ -81,10 +84,41 @@
684 #'test/purchase_wh_iva_sequence.yml',
685 #'test/sale_wh_iva_sequence.yml',
686 #'test/purchase_wh_iva_txt.yml',
687- ],
688- 'installable': True,
689- 'active': False,
690+ """,
691+ "website": "http://vauxoo.com",
692+ "license": "",
693+ "depends": [
694+ "l10n_ve_withholding"
695+ ],
696+ "demo": [
697+ "demo/l10n_ve_withholding_iva_sequences_demo.xml",
698+ "demo/demo_partners.xml",
699+ "demo/l10n_ve_withholding_iva_demo.xml",
700+ "demo/demo_taxes.xml",
701+ "demo/demo_invoices.xml"
702+ ],
703+ "data": [
704+ "security/wh_iva_security.xml",
705+ "security/ir.model.access.csv",
706+ "report/withholding_vat_report.xml",
707+ "wizard/wizard_retention_view.xml",
708+ "wizard/wizard_wh_nro_view.xml",
709+ "view/generate_txt_view.xml",
710+ "view/account_invoice_view.xml",
711+ "view/account_view.xml",
712+ "view/partner_view.xml",
713+ "view/res_company_view.xml",
714+ "view/wh_iva_view.xml",
715+ "data/l10n_ve_withholding_data.xml",
716+ "report/txt_wh_report.xml",
717+ "workflow/wh_iva_workflow.xml",
718+ "workflow/wh_action_server.xml"
719+ ],
720+ "test": [],
721+ "js": [],
722+ "css": [],
723+ "qweb": [],
724+ "installable": True,
725+ "auto_install": False
726 }
727-
728-
729 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
730
731=== modified file 'l10n_ve_withholding_muni/__openerp__.py'
732--- l10n_ve_withholding_muni/__openerp__.py 2014-01-08 17:06:51 +0000
733+++ l10n_ve_withholding_muni/__openerp__.py 2014-11-19 02:46:59 +0000
734@@ -26,35 +26,38 @@
735 "name": "Local Withholding Venezuelan laws",
736 "version": "0.2",
737 "author": "Vauxoo",
738- "website": "http://vauxoo.com",
739- "category": 'Generic Modules/Accounting',
740+ "category": "Generic Modules/Accounting",
741 "description": """Management local withholding for Venezuelan tax laws
742 """,
743- 'init_xml': [],
744- "depends": ["l10n_ve_withholding"],
745- 'update_xml': [
746- 'security/wh_muni_security.xml',
747- 'security/ir.model.access.csv',
748- 'view/account_invoice_view.xml',
749- 'view/partner_view.xml',
750- 'view/wh_muni_view.xml',
751- 'data/wh_muni_sequence.xml',
752- 'report/wh_muni_report.xml',
753- 'workflow/l10n_ve_wh_muni_wf.xml',
754- ],
755- 'data': [
756- 'data/wh_muni_sequence.xml',
757- ],
758- 'demo_xml': [
759- 'demo/demo_accounts.xml',
760- 'demo/demo_partners.xml',
761- 'demo/demo_journal.xml',
762- ],
763- 'test': [
764- 'test/awm_supplier.yml',
765- 'test/awm_customer.yml'
766- ],
767- 'installable': True,
768- 'active': False,
769+ "website": "http://vauxoo.com",
770+ "license": "",
771+ "depends": [
772+ "l10n_ve_withholding"
773+ ],
774+ "demo": [
775+ "demo/demo_accounts.xml",
776+ "demo/demo_partners.xml",
777+ "demo/demo_journal.xml"
778+ ],
779+ "data": [
780+ "data/wh_muni_sequence.xml",
781+ "security/wh_muni_security.xml",
782+ "security/ir.model.access.csv",
783+ "view/account_invoice_view.xml",
784+ "view/partner_view.xml",
785+ "view/wh_muni_view.xml",
786+ "data/wh_muni_sequence.xml",
787+ "report/wh_muni_report.xml",
788+ "workflow/l10n_ve_wh_muni_wf.xml"
789+ ],
790+ "test": [
791+ "test/awm_supplier.yml",
792+ "test/awm_customer.yml"
793+ ],
794+ "js": [],
795+ "css": [],
796+ "qweb": [],
797+ "installable": True,
798+ "auto_install": False
799 }
800 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
801
802=== modified file 'l10n_ve_withholding_src/__openerp__.py'
803--- l10n_ve_withholding_src/__openerp__.py 2014-10-10 23:30:31 +0000
804+++ l10n_ve_withholding_src/__openerp__.py 2014-11-19 02:46:59 +0000
805@@ -22,14 +22,12 @@
806 # You should have received a copy of the GNU Affero General Public License
807 # along with this program. If not, see <http://www.gnu.org/licenses/>.
808 ################################################################################
809-
810 {
811- "name" : "Compromiso de Responsabilidad Social",
812- "version" : "0.2",
813- "author" : "Vauxoo",
814- "category" : "Generic Modules",
815- "website": "http://wiki.openerp.org.ve/",
816- "description": '''Administración de la Aplicacion del Compromiso de Responsabilidad Social
817+ "name": "Compromiso de Responsabilidad Social",
818+ "version": "0.2",
819+ "author": "Vauxoo",
820+ "category": "Generic Modules",
821+ "description": """Administración de la Aplicacion del Compromiso de Responsabilidad Social
822 que se establece en el Reglamento de Ley de Contrataciones Públicas, (Gaceta Oficial Nº 39.181 del 19 de mayo de 2009) Decreto Nº 6.708.
823
824 **Artículo 34**
825@@ -43,6 +41,7 @@
826 **Artículo 35**
827
828 Rango y normativa interna para el suministro de bienes, prestación de servicios o ejecución de obras, se establece para el Compromiso de Responsabilidad Social un valor mínimo del uno por ciento (1%) y un valor máximo del cinco por ciento (5%) del monto del contrato suscrito, el cual asumirán los Contratistas beneficiarios de la adjudicación del mismo. Los órganos o entes contratantes deberán fijar los porcentajes a ser aplicados a cada condición del Compromiso de Responsabilidad Social, así como, establecer categorías o escalas proporcionales con base en los montos de los contratos a ser suscritos.
829+<<<<<<< TREE
830 ''',
831 "depends" : [
832 "base",
833@@ -55,7 +54,34 @@
834 'demo/demo_accounts.xml',
835 'demo/demo_company.xml',
836 ],
837+=======
838+ """,
839+ "website": "http://wiki.openerp.org.ve/",
840+ "license": "",
841+ "depends": [
842+ "base",
843+ "account",
844+ "l10n_ve_withholding"
845+ ],
846+ "demo": [
847+ "demo/demo_journals.xml",
848+ "demo/demo_accounts.xml",
849+ "demo/demo_company.xml"
850+ ],
851+ "data": [
852+ "security/wh_src_security.xml",
853+ "security/ir.model.access.csv",
854+ "wizard/wizard_retention_view.xml",
855+ "view/wh_src_view.xml",
856+ "view/account_invoice_view.xml",
857+ "view/company_view.xml",
858+ "view/partner_view.xml",
859+ "workflow/l10n_ve_wh_src_wf.xml",
860+ "report/wh_src_report.xml"
861+ ],
862+>>>>>>> MERGE-SOURCE
863 "test": [
864+<<<<<<< TREE
865 'test/aws_customer.yml',
866 'test/aws_supplier.yml',
867 ],
868@@ -72,5 +98,15 @@
869
870 ],
871 "active": False,
872+=======
873+ "test/aws_customer.yml",
874+ "test/aws_supplier.yml"
875+ ],
876+ "js": [],
877+ "css": [],
878+ "qweb": [],
879+>>>>>>> MERGE-SOURCE
880 "installable": True,
881+ "auto_install": False
882 }
883+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
884
885=== modified file 'ovl/__openerp__.py'
886--- ovl/__openerp__.py 2014-10-10 23:30:31 +0000
887+++ ovl/__openerp__.py 2014-11-19 02:46:59 +0000
888@@ -19,6 +19,7 @@
889 # along with this program. If not, see <http://www.gnu.org/licenses/>.
890 #
891 ##############################################################################
892+<<<<<<< TREE
893 { "name" : "OpenERP Venezuelan Localization",
894 "version" : "4.0",
895 "depends" : [
896@@ -47,6 +48,14 @@
897 ],
898 "author" : "Vauxoo",
899 "description" : """
900+=======
901+{
902+ "name": "OpenERP Venezuelan Localization",
903+ "version": "4.0",
904+ "author": "Vauxoo",
905+ "category": "Localization/Application",
906+ "description": """
907+>>>>>>> MERGE-SOURCE
908 Install all apps needed to comply with Venezuelan laws
909 ======================================================
910
911@@ -81,17 +90,43 @@
912
913 Concepts from Sales and Purchase
914
915- """,
916- "website" : "http://www.vauxoo.com",
917- "category" : "Localization/Application",
918- "init_xml" : [],
919- "demo_xml" : [],
920+ # Level Zero of Modules
921+ # First Level of Modules
922+ # Second Level of Modules
923+ # Third Level of Modules
924+ # Fourth Level of Modules
925+ # Optionals, uncomment if you want to use them Install if you
926+ # want be able set islr
927+ #"l10n_ve_sale_purchase",
928+ # Fifth Level of Modules
929+ #"l10n_ve_vat_write_off",
930+ - "l10n_ve_sale_purchase", #Install if you want be able set islr
931+ """,
932+ "website": "http://www.vauxoo.com",
933+ "license": "",
934+ "depends": [
935+ "account",
936+ "document",
937+ "l10n_ve_fiscal_requirements",
938+ "l10n_ve_split_invoice",
939+ "l10n_ve_generic",
940+ "l10n_ve_imex",
941+ "l10n_ve_withholding",
942+ "l10n_ve_withholding_iva",
943+ "l10n_ve_withholding_islr",
944+ "l10n_ve_withholding_muni",
945+ "l10n_ve_withholding_src",
946+ "l10n_ve_fiscal_book"
947+ ],
948+ "demo": [],
949 "data": [
950- 'view/account_invoice_view.xml',
951- ],
952- "test" : [],
953- "images" : [],
954- "auto_install": False,
955- "application": True,
956+ "view/account_invoice_view.xml"
957+ ],
958+ "test": [],
959+ "js": [],
960+ "css": [],
961+ "qweb": [],
962 "installable": True,
963+ "auto_install": False
964 }
965+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
966
967=== modified file 'ovl_all/__openerp__.py'
968--- ovl_all/__openerp__.py 2014-10-10 23:30:31 +0000
969+++ ovl_all/__openerp__.py 2014-11-19 02:46:59 +0000
970@@ -19,208 +19,29 @@
971 # along with this program. If not, see <http://www.gnu.org/licenses/>.
972 #
973 ##############################################################################
974-{ "name" : "OpenERP Venezuelan Localization",
975- "version" : "4.0",
976- "depends" : [
977- "ovl",
978- #Start list of all oficial modules
979- "account",
980- "auth_openid",
981- "event",
982- "l10n_bo",
983- "l10n_pe",
984- "pad_project",
985- "project_mrp",
986- "account_accountant",
987- "auth_signup",
988- "event_moodle",
989- "l10n_br",
990- "l10n_pl",
991- "plugin",
992- "project_timesheet",
993- "account_analytic_analysis",
994- "base_action_rule",
995- "event_sale",
996- "l10n_ca",
997- "l10n_pt",
998- "plugin_outlook",
999- "purchase",
1000- "account_analytic_default",
1001- "base_calendar",
1002- "fetchmail",
1003- "l10n_ch",
1004- "l10n_ro",
1005- "plugin_thunderbird",
1006+{
1007+ "name": "OpenERP Venezuelan Localization",
1008+ "version": "4.0",
1009+ "author": "Vauxoo",
1010+ "category": "Localization/Application",
1011+ "description": """
1012+Install all apps needed to comply with Venezuelan laws plus all oficial modules
1013+======================================================
1014+
1015+This module will install for you:
1016+
1017+ - ovl
1018+
1019+ - And all oficial modules (account, stock, mrp...)
1020+ #Start list of all oficial modules
1021 #"purchase_analytic_plans",#Error to fix
1022 #"account_analytic_plans",#Error to fix
1023- "base_gengo",
1024- "fleet",
1025- "l10n_cl",
1026- "l10n_si",
1027- "point_of_sale",
1028- "purchase_double_validation",
1029- "account_anglo_saxon",
1030- "base_iban",
1031- "google_base_account",
1032- "l10n_cn",
1033- "l10n_syscohada",
1034- "portal",
1035- "purchase_requisition",
1036- "account_asset",
1037- "base_import",
1038- "google_docs",
1039- "l10n_co",
1040- "l10n_th",
1041- "portal_anonymous",
1042- "report_intrastat",
1043- "account_bank_statement_extensions",
1044- "base_report_designer",
1045- "hr",
1046- "l10n_cr",
1047- "l10n_tr",
1048- "portal_claim",
1049- "report_webkit",
1050- "account_budget",
1051- "base_setup",
1052- "hr_attendance",
1053- "l10n_de",
1054- "l10n_uk",
1055- "portal_crm",
1056- "resource",
1057- "account_cancel",
1058- "base_status",
1059- "hr_contract",
1060- "l10n_ec",
1061- "l10n_us",
1062- "portal_event",
1063- "sale",
1064- "account_chart",
1065- "base_vat",
1066- "hr_evaluation",
1067- "l10n_es",
1068- "l10n_uy",
1069- "portal_hr_employees",
1070 #"sale_analytic_plans",#Error to fix
1071- "account_check_writing",
1072- "board",
1073- "hr_expense",
1074- "l10n_et",
1075- "l10n_ve",
1076- "portal_project",
1077- "sale_crm",
1078- "account_followup",
1079- "claim_from_delivery",
1080- "hr_holidays",
1081- "l10n_fr",
1082- "l10n_vn",
1083- "portal_project_issue",
1084- "sale_journal",
1085- "account_payment",
1086- "contacts",
1087- "hr_payroll",
1088- "l10n_fr_hr_payroll",
1089- "lunch",
1090- "portal_project_long_term",
1091- "sale_margin",
1092- "account_report_company",
1093- "crm",
1094- "hr_payroll_account",
1095- "l10n_fr_rib",
1096- "mail",
1097- "portal_sale",
1098- "sale_mrp",
1099- "account_sequence",
1100- "crm_claim",
1101- "hr_recruitment",
1102- "l10n_gr",
1103- "marketing",
1104- "portal_stock",
1105- "sale_order_dates",
1106- "account_test",
1107- "crm_helpdesk",
1108- "hr_timesheet",
1109- "l10n_gt",
1110- "marketing_campaign",
1111- "process",
1112- "sale_stock",
1113- "account_voucher",
1114- "crm_partner_assign",
1115- "hr_timesheet_invoice",
1116- "l10n_hn",
1117- "marketing_campaign_crm_demo",
1118- "procurement",
1119- "share",
1120- "analytic",
1121- "crm_profiling",
1122- "hr_timesheet_sheet",
1123- "l10n_hr",
1124- "membership",
1125- "product",
1126- "stock",
1127- "analytic_contract_hr_expense",
1128- "crm_todo",
1129- "idea",
1130- "l10n_in",
1131- "mrp",
1132- "product_expiry",
1133- "stock_invoice_directly",
1134- "analytic_user_function",
1135- "decimal_precision",
1136- "knowledge",
1137- "l10n_in_hr_payroll",
1138- "mrp_byproduct",
1139- "product_manufacturer",
1140 #"stock_location", #Error to fix
1141- "anonymization",
1142- "delivery",
1143- "l10n_ar",
1144- "l10n_it",
1145- "mrp_jit",
1146- "product_margin",
1147- "stock_no_autopicking",
1148- "association",
1149- "document",
1150- "l10n_at",
1151- "l10n_lu",
1152- "mrp_operations",
1153- "product_visible_discount",
1154- "subscription",
1155- "audittrail",
1156 #"document_ftp", #No test
1157- "l10n_be",
1158- "l10n_ma",
1159- "mrp_repair",
1160- "project",
1161- "survey",
1162- "auth_crypt",
1163- "document_page",
1164- "l10n_be_coda",
1165- "l10n_multilang",
1166- "multi_company",
1167- "project_gtd",
1168- "warning",
1169 #"auth_ldap", #No test
1170- "document_webdav",
1171- "l10n_be_hr_payroll",
1172- "l10n_mx",
1173- "note",
1174- "project_issue",
1175- "web_analytics",
1176- "auth_oauth",
1177- "edi",
1178- "l10n_be_hr_payroll_account",
1179- "l10n_nl",
1180- "note_pad",
1181- "project_issue_sheet",
1182- "web_linkedin",
1183- "auth_oauth_signup",
1184- "email_template",
1185- "l10n_be_invoice_bba",
1186- "l10n_pa",
1187- "pad",
1188- "project_long_term",
1189- "web_shortcuts"
1190 #End list of all oficial modules
1191+<<<<<<< TREE
1192 ],
1193 "author" : "Vauxoo",
1194 "description" : """
1195@@ -242,5 +63,211 @@
1196 "images" : [],
1197 "auto_install": False,
1198 "application": True,
1199+=======
1200+ """,
1201+ "website": "http://www.vauxoo.com",
1202+ "license": "",
1203+ "depends": [
1204+ "ovl",
1205+ "account",
1206+ "auth_openid",
1207+ "event",
1208+ "l10n_bo",
1209+ "l10n_pe",
1210+ "pad_project",
1211+ "project_mrp",
1212+ "account_accountant",
1213+ "auth_signup",
1214+ "event_moodle",
1215+ "l10n_br",
1216+ "l10n_pl",
1217+ "plugin",
1218+ "project_timesheet",
1219+ "account_analytic_analysis",
1220+ "base_action_rule",
1221+ "event_sale",
1222+ "l10n_ca",
1223+ "l10n_pt",
1224+ "plugin_outlook",
1225+ "purchase",
1226+ "account_analytic_default",
1227+ "base_calendar",
1228+ "fetchmail",
1229+ "l10n_ch",
1230+ "l10n_ro",
1231+ "plugin_thunderbird",
1232+ "base_gengo",
1233+ "fleet",
1234+ "l10n_cl",
1235+ "l10n_si",
1236+ "point_of_sale",
1237+ "purchase_double_validation",
1238+ "account_anglo_saxon",
1239+ "base_iban",
1240+ "google_base_account",
1241+ "l10n_cn",
1242+ "l10n_syscohada",
1243+ "portal",
1244+ "purchase_requisition",
1245+ "account_asset",
1246+ "base_import",
1247+ "google_docs",
1248+ "l10n_co",
1249+ "l10n_th",
1250+ "portal_anonymous",
1251+ "report_intrastat",
1252+ "account_bank_statement_extensions",
1253+ "base_report_designer",
1254+ "hr",
1255+ "l10n_cr",
1256+ "l10n_tr",
1257+ "portal_claim",
1258+ "report_webkit",
1259+ "account_budget",
1260+ "base_setup",
1261+ "hr_attendance",
1262+ "l10n_de",
1263+ "l10n_uk",
1264+ "portal_crm",
1265+ "resource",
1266+ "account_cancel",
1267+ "base_status",
1268+ "hr_contract",
1269+ "l10n_ec",
1270+ "l10n_us",
1271+ "portal_event",
1272+ "sale",
1273+ "account_chart",
1274+ "base_vat",
1275+ "hr_evaluation",
1276+ "l10n_es",
1277+ "l10n_uy",
1278+ "portal_hr_employees",
1279+ "account_check_writing",
1280+ "board",
1281+ "hr_expense",
1282+ "l10n_et",
1283+ "l10n_ve",
1284+ "portal_project",
1285+ "sale_crm",
1286+ "account_followup",
1287+ "claim_from_delivery",
1288+ "hr_holidays",
1289+ "l10n_fr",
1290+ "l10n_vn",
1291+ "portal_project_issue",
1292+ "sale_journal",
1293+ "account_payment",
1294+ "contacts",
1295+ "hr_payroll",
1296+ "l10n_fr_hr_payroll",
1297+ "lunch",
1298+ "portal_project_long_term",
1299+ "sale_margin",
1300+ "account_report_company",
1301+ "crm",
1302+ "hr_payroll_account",
1303+ "l10n_fr_rib",
1304+ "mail",
1305+ "portal_sale",
1306+ "sale_mrp",
1307+ "account_sequence",
1308+ "crm_claim",
1309+ "hr_recruitment",
1310+ "l10n_gr",
1311+ "marketing",
1312+ "portal_stock",
1313+ "sale_order_dates",
1314+ "account_test",
1315+ "crm_helpdesk",
1316+ "hr_timesheet",
1317+ "l10n_gt",
1318+ "marketing_campaign",
1319+ "process",
1320+ "sale_stock",
1321+ "account_voucher",
1322+ "crm_partner_assign",
1323+ "hr_timesheet_invoice",
1324+ "l10n_hn",
1325+ "marketing_campaign_crm_demo",
1326+ "procurement",
1327+ "share",
1328+ "analytic",
1329+ "crm_profiling",
1330+ "hr_timesheet_sheet",
1331+ "l10n_hr",
1332+ "membership",
1333+ "product",
1334+ "stock",
1335+ "analytic_contract_hr_expense",
1336+ "crm_todo",
1337+ "idea",
1338+ "l10n_in",
1339+ "mrp",
1340+ "product_expiry",
1341+ "stock_invoice_directly",
1342+ "analytic_user_function",
1343+ "decimal_precision",
1344+ "knowledge",
1345+ "l10n_in_hr_payroll",
1346+ "mrp_byproduct",
1347+ "product_manufacturer",
1348+ "anonymization",
1349+ "delivery",
1350+ "l10n_ar",
1351+ "l10n_it",
1352+ "mrp_jit",
1353+ "product_margin",
1354+ "stock_no_autopicking",
1355+ "association",
1356+ "document",
1357+ "l10n_at",
1358+ "l10n_lu",
1359+ "mrp_operations",
1360+ "product_visible_discount",
1361+ "subscription",
1362+ "audittrail",
1363+ "l10n_be",
1364+ "l10n_ma",
1365+ "mrp_repair",
1366+ "project",
1367+ "survey",
1368+ "auth_crypt",
1369+ "document_page",
1370+ "l10n_be_coda",
1371+ "l10n_multilang",
1372+ "multi_company",
1373+ "project_gtd",
1374+ "warning",
1375+ "document_webdav",
1376+ "l10n_be_hr_payroll",
1377+ "l10n_mx",
1378+ "note",
1379+ "project_issue",
1380+ "web_analytics",
1381+ "auth_oauth",
1382+ "edi",
1383+ "l10n_be_hr_payroll_account",
1384+ "l10n_nl",
1385+ "note_pad",
1386+ "project_issue_sheet",
1387+ "web_linkedin",
1388+ "auth_oauth_signup",
1389+ "email_template",
1390+ "l10n_be_invoice_bba",
1391+ "l10n_pa",
1392+ "pad",
1393+ "project_long_term",
1394+ "web_shortcuts"
1395+ ],
1396+ "demo": [],
1397+ "data": [],
1398+ "test": [],
1399+ "js": [],
1400+ "css": [],
1401+ "qweb": [],
1402+>>>>>>> MERGE-SOURCE
1403 "installable": True,
1404+ "auto_install": False
1405 }
1406+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: