Openerp Venezuela

Merge lp:~vauxoo/openerp-venezuela-localization/jose-wf-municipality into lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk

  1. jose-wf-municipality
  2. Merge into 6.0-trunk
Status: Merged
Merged at revision: 441
Proposed branch: lp:~vauxoo/openerp-venezuela-localization/jose-wf-municipality
Merge into: lp:~openerp-venezuela/openerp-venezuela-localization/6.0-trunk
Diff against target: 223 lines (+61/-14)
13 files modified
bank_management/__openerp__.py (+1/-1)
l10n_ve/__openerp__.py (+1/-1)
l10n_ve_fiscal_requirements/__openerp__.py (+1/-1)
l10n_ve_islr_withholding/__openerp__.py (+1/-1)
l10n_ve_sale_purchase/__openerp__.py (+1/-1)
l10n_ve_withholding/__openerp__.py (+1/-1)
l10n_ve_withholding_iva/__openerp__.py (+1/-1)
l10n_ve_withholding_muni/__init__.py (+1/-1)
l10n_ve_withholding_muni/__openerp__.py (+2/-1)
l10n_ve_withholding_muni/wh_muni.py (+0/-2)
l10n_ve_withholding_muni/wh_muni_view.xml (+2/-2)
l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml (+48/-0)
topology/__openerp__.py (+1/-1)
To merge this branch: bzr merge lp:~vauxoo/openerp-venezuela-localization/jose-wf-municipality
Reviewer Review Type Date Requested Status
Israel Fermin Montilla Pending
Review via email: mp+79959@code.launchpad.net

Description of the change

Added workflow in withholding municipality and changed to 2.0 version all modules

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'bank_management/__openerp__.py'
--- bank_management/__openerp__.py 2011-10-06 17:35:45 +0000
+++ bank_management/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -33,7 +33,7 @@
3333
34{34{
35 "name" : "Bank Management",35 "name" : "Bank Management",
36 "version" : "0.1",36 "version" : "0.2",
37 "author" : "Vauxoo",37 "author" : "Vauxoo",
38 "website" : "http://vauxoo.com",38 "website" : "http://vauxoo.com",
39 "category": 'Generic Modules/Accounting',39 "category": 'Generic Modules/Accounting',
4040
=== modified file 'l10n_ve/__openerp__.py'
--- l10n_ve/__openerp__.py 2011-10-11 04:59:00 +0000
+++ l10n_ve/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -24,7 +24,7 @@
24##############################################################################24##############################################################################
25{25{
26 "name" : "Venezuelan Account Chart (Aimed at Commercial Trades)",26 "name" : "Venezuelan Account Chart (Aimed at Commercial Trades)",
27 "version" : "1.0",27 "version" : "0.2",
28 "author" : "Tiny & Vauxoo",28 "author" : "Tiny & Vauxoo",
29 "category" : "Localisation/Account Charts",29 "category" : "Localisation/Account Charts",
30 "description": 30 "description":
3131
=== modified file 'l10n_ve_fiscal_requirements/__openerp__.py'
--- l10n_ve_fiscal_requirements/__openerp__.py 2011-10-11 19:04:54 +0000
+++ l10n_ve_fiscal_requirements/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -22,7 +22,7 @@
22##############################################################################22##############################################################################
23{23{
24 "name" : "Fiscal requirements Venezuelan laws",24 "name" : "Fiscal requirements Venezuelan laws",
25 "version" : "0.5",25 "version" : "0.2",
26 "author" : "Vauxoo",26 "author" : "Vauxoo",
27 "website" : "http://vauxoo.com",27 "website" : "http://vauxoo.com",
28 "category": 'Generic Modules/Accounting',28 "category": 'Generic Modules/Accounting',
2929
=== modified file 'l10n_ve_islr_withholding/__openerp__.py'
--- l10n_ve_islr_withholding/__openerp__.py 2011-10-05 02:12:07 +0000
+++ l10n_ve_islr_withholding/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -28,7 +28,7 @@
2828
29{29{
30 "name" : "Automatically Calculated Withholding Income",30 "name" : "Automatically Calculated Withholding Income",
31 "version" : "0.6",31 "version" : "0.2",
32 "author" : "Vauxoo",32 "author" : "Vauxoo",
33 "category" : "General",33 "category" : "General",
34 "website": "http://wiki.openerp.org.ve/",34 "website": "http://wiki.openerp.org.ve/",
3535
=== modified file 'l10n_ve_sale_purchase/__openerp__.py'
--- l10n_ve_sale_purchase/__openerp__.py 2011-10-04 23:39:47 +0000
+++ l10n_ve_sale_purchase/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -27,7 +27,7 @@
27###############################################################################27###############################################################################
28{28{
29 'name' : 'ISLR Sale and Purchase Functionalities',29 'name' : 'ISLR Sale and Purchase Functionalities',
30 'version' : '0.1',30 'version' : '0.2',
31 'author' : 'Vauxoo',31 'author' : 'Vauxoo',
32 'description' : '''32 'description' : '''
33 Due to the Dependendy reduction on the l10n_ve_islr_withholding module, it was necesary to incorporate33 Due to the Dependendy reduction on the l10n_ve_islr_withholding module, it was necesary to incorporate
3434
=== modified file 'l10n_ve_withholding/__openerp__.py'
--- l10n_ve_withholding/__openerp__.py 2011-10-06 01:32:14 +0000
+++ l10n_ve_withholding/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -23,7 +23,7 @@
23##############################################################################23##############################################################################
24{24{
25 "name" : "Management withholdings Venezuelan laws",25 "name" : "Management withholdings Venezuelan laws",
26 "version" : "0.5",26 "version" : "0.2",
27 "author" : "Vauxoo",27 "author" : "Vauxoo",
28 "website" : "http://vauxoo.com",28 "website" : "http://vauxoo.com",
29 "category": 'Generic Modules/Accounting',29 "category": 'Generic Modules/Accounting',
3030
=== modified file 'l10n_ve_withholding_iva/__openerp__.py'
--- l10n_ve_withholding_iva/__openerp__.py 2011-10-11 19:04:54 +0000
+++ l10n_ve_withholding_iva/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -23,7 +23,7 @@
23##############################################################################23##############################################################################
24{24{
25 "name" : "Withholding vat Venezuelan laws",25 "name" : "Withholding vat Venezuelan laws",
26 "version" : "0.6",26 "version" : "0.2",
27 "author" : "Vauxoo",27 "author" : "Vauxoo",
28 "website" : "http://vauxoo.com",28 "website" : "http://vauxoo.com",
29 "category": 'Generic Modules/Accounting',29 "category": 'Generic Modules/Accounting',
3030
=== modified file 'l10n_ve_withholding_muni/__init__.py'
--- l10n_ve_withholding_muni/__init__.py 2011-09-25 23:55:38 +0000
+++ l10n_ve_withholding_muni/__init__.py 2011-10-20 13:23:24 +0000
@@ -34,4 +34,4 @@
34import partner34import partner
35import report35import report
36#import wizard36#import wizard
3737import workflow
3838
=== modified file 'l10n_ve_withholding_muni/__openerp__.py'
--- l10n_ve_withholding_muni/__openerp__.py 2011-09-12 16:34:55 +0000
+++ l10n_ve_withholding_muni/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -23,7 +23,7 @@
23##############################################################################23##############################################################################
24{24{
25 "name" : "Local Withholding Venezuelan laws",25 "name" : "Local Withholding Venezuelan laws",
26 "version" : "0.5",26 "version" : "0.2",
27 "author" : "Vauxoo",27 "author" : "Vauxoo",
28 "website" : "http://vauxoo.com",28 "website" : "http://vauxoo.com",
29 "category": 'Generic Modules/Accounting',29 "category": 'Generic Modules/Accounting',
@@ -39,6 +39,7 @@
39 'wh_muni_view.xml',39 'wh_muni_view.xml',
40 "wh_muni_sequence.xml",40 "wh_muni_sequence.xml",
41 "wh_muni_report.xml",41 "wh_muni_report.xml",
42 "workflow/l10n_ve_wh_muni_wf.xml"
42# "account_workflow.xml",43# "account_workflow.xml",
43 ],44 ],
44 'demo_xml': [],45 'demo_xml': [],
4546
=== modified file 'l10n_ve_withholding_muni/wh_muni.py'
--- l10n_ve_withholding_muni/wh_muni.py 2011-09-25 23:55:38 +0000
+++ l10n_ve_withholding_muni/wh_muni.py 2011-10-20 13:23:24 +0000
@@ -117,7 +117,6 @@
117 raise osv.except_osv(_('Invalid action !'), _("The line containing the document '%s' looks as if the amount withheld was wrong please check.!") % (i.invoice_id.reference))117 raise osv.except_osv(_('Invalid action !'), _("The line containing the document '%s' looks as if the amount withheld was wrong please check.!") % (i.invoice_id.reference))
118 total+=i.amount118 total+=i.amount
119 self.write(cr,uid,ids,{'amount':total})119 self.write(cr,uid,ids,{'amount':total})
120 self.write(cr, uid, ids, {'state':'confirmed'})
121 return True120 return True
122121
123122
@@ -141,7 +140,6 @@
141 def action_done(self, cr, uid, ids, context={}):140 def action_done(self, cr, uid, ids, context={}):
142 self.action_number(cr, uid, ids)141 self.action_number(cr, uid, ids)
143 self.action_move_create(cr, uid, ids)142 self.action_move_create(cr, uid, ids)
144 self.write(cr, uid, ids, {'state':'done'})
145 return True143 return True
146144
147145
148146
=== modified file 'l10n_ve_withholding_muni/wh_muni_view.xml'
--- l10n_ve_withholding_muni/wh_muni_view.xml 2011-10-05 15:30:11 +0000
+++ l10n_ve_withholding_muni/wh_muni_view.xml 2011-10-20 13:23:24 +0000
@@ -128,8 +128,8 @@
128 <field name="munici_line_ids" default_get="{'lines': munici_line_ids }" colspan="4" nolabel="1" height="275"/>128 <field name="munici_line_ids" default_get="{'lines': munici_line_ids }" colspan="4" nolabel="1" height="275"/>
129 <group col="4" colspan="2">129 <group col="4" colspan="2">
130 <field name="state"/>130 <field name="state"/>
131 <button name="action_confirm" string="Confirmed" states="draft" type="object" icon="gtk-open"/>131 <button name="wh_muni_confirmed" states="draft" string="Confirm" icon="gtk-execute"/>
132 <button name="action_done" string="Done" states="confirmed" type="object" icon="gtk-go-forward"/>132 <button name="wh_muni_done" states="confirmed" string="Done" icon="gtk-execute"/>
133 </group>133 </group>
134 </page>134 </page>
135 <page string="Other Information">135 <page string="Other Information">
136136
=== added directory 'l10n_ve_withholding_muni/workflow'
=== added file 'l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml'
--- l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml 1970-01-01 00:00:00 +0000
+++ l10n_ve_withholding_muni/workflow/l10n_ve_wh_muni_wf.xml 2011-10-20 13:23:24 +0000
@@ -0,0 +1,48 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4
5 <record id="wh_muni_order" model="workflow">
6 <field name="name">Withholding municipality Order Basic Workflow</field>
7 <field name="osv">account.wh.munici</field>
8 <field name="on_create">True</field>
9 </record>
10
11 <record id="act_draft" model="workflow.activity">
12 <field name="wkf_id" ref="wh_muni_order"/>
13 <field name="flow_start">True</field>
14 <field name="name">draft</field>
15 </record>
16
17 <record id="act_confirmed" model="workflow.activity">
18 <field name="wkf_id" ref="wh_muni_order"/>
19 <field name="action">action_confirm()
20 write({'state':'confirmed'})</field>
21 <field name="kind">function</field>
22 <field name="name">confirmed</field>
23 </record>
24
25 <record id="act_done" model="workflow.activity">
26 <field name="wkf_id" ref="wh_muni_order"/>
27 <field name="action">action_done()
28 write({'state':'done'})</field>
29 <field name="kind">function</field>
30 <field name="name">done</field>
31 </record>
32
33
34 <record id="trans_draft_done" model="workflow.transition">
35 <field name="act_from" ref="act_draft"/>
36 <field name="act_to" ref="act_confirmed"/>
37 <field name="signal">wh_muni_confirmed</field>
38 </record>
39
40 <record id="trans_confirmed_done" model="workflow.transition">
41 <field name="act_from" ref="act_confirmed"/>
42 <field name="act_to" ref="act_done"/>
43 <field name="signal">wh_muni_done</field>
44 </record>
45
46
47 </data>
48</openerp>
049
=== modified file 'topology/__openerp__.py'
--- topology/__openerp__.py 2011-09-22 17:30:32 +0000
+++ topology/__openerp__.py 2011-10-20 13:23:24 +0000
@@ -1,7 +1,7 @@
1# -*- encoding: utf-8 -*-1# -*- encoding: utf-8 -*-
2{2{
3 "name" : "Opening balance Update",3 "name" : "Opening balance Update",
4 "version" : "0.1",4 "version" : "0.2",
5 "depends" : ["base"],5 "depends" : ["base"],
6 "author" : "Vauxoo",6 "author" : "Vauxoo",
7 "description" : """7 "description" : """