Merge lp:~vauxoo/openerp-venezuela-localization/ovl70-whsrc-rev-yani into lp:openerp-venezuela-localization
- ovl70-whsrc-rev-yani
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~vauxoo/openerp-venezuela-localization/ovl70-whsrc-rev-yani |
Merge into: | lp:openerp-venezuela-localization |
Diff against target: |
377 lines (+67/-144) 11 files modified
l10n_ve_withholding_src/__openerp__.py (+1/-1) l10n_ve_withholding_src/data/data.xml (+27/-27) l10n_ve_withholding_src/model/invoice.py (+1/-1) l10n_ve_withholding_src/model/partner.py (+0/-44) l10n_ve_withholding_src/model/wh_src.py (+1/-1) l10n_ve_withholding_src/report/wh_src_report.xml (+17/-0) l10n_ve_withholding_src/view/account_invoice_view.xml (+2/-2) l10n_ve_withholding_src/view/company_view.xml (+3/-3) l10n_ve_withholding_src/view/partner_view.xml (+0/-33) l10n_ve_withholding_src/view/wh_src_view.xml (+15/-15) l10n_ve_withholding_src/wh_src_report.xml (+0/-17) |
To merge this branch: | bzr merge lp:~vauxoo/openerp-venezuela-localization/ovl70-whsrc-rev-yani |
Related bugs: | |
Related blueprints: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Nhomar - Vauxoo | Needs Fixing | ||
Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com | Pending | ||
Gabriela Quilarque | Pending | ||
Review via email: mp+139318@code.launchpad.net |
This proposal has been superseded by a proposal from 2012-12-14.
Commit message
Description of the change
Revisión del módulo l10n_ve_
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote : | # |
Bajando branch para testear...
les comento al finalizar.
saludos
2012/12/11 Nhomar Hernandez (Vauxoo) <email address hidden>
> Review: Approve
>
> Por mi desde el punto de vista funcional hace todo lo esperado.
> --
>
> https:/
> You are subscribed to branch
> lp:~vauxoo/openerp-venezuela-localization/ovl70-whsrc-rev-yani.
>
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote : | # |
Si se instala el modulo sin data de demostrativa explota por que hace
referencia
a una vista que no existe en el modulo account: account_
lo otro es que los datos que estan creando no estan bien organizados
hay referencias a xml_id que estan antes de la definicion de la xml_id
como esta referencia seq_account_
xml_id se referncia antes de la definicion
Este otro caso de abajo, es que aparece arriba definido
luego se referencia y por ultimo se vuelve a definir.
realmente son dos registros distintos que se han registrado con el
mismo xml_id, estos dentro de un mismo modulo deben ser unicos.
seq_type_
El orden de esa data xml habria de ser,
ir.sequence.type
ir.sequence
account.journal
2012/12/12 Humberto Arocha <email address hidden>
> Bajando branch para testear...
>
> les comento al finalizar.
>
> saludos
>
> 2012/12/11 Nhomar Hernandez (Vauxoo) <email address hidden>
>
> Review: Approve
>>
>> Por mi desde el punto de vista funcional hace todo lo esperado.
>> --
>>
>> https:/
>> You are subscribed to branch
>> lp:~vauxoo/openerp-venezuela-localization/ovl70-whsrc-rev-yani.
>>
>
>
- 777. By hbto [Vauxoo] http://www.vauxoo.com
-
[IMP] Sorting Data,
getting rid of old references
renaming son xml_ids not uniques
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote : | # |
Paso la propuesta de merge a rechazado, para agregar los cambios y tareas que estan en el whiteboard y workitems del blueprint.
Nhomar - Vauxoo (nhomar) wrote : | # |
Yo creo que deberia estar en needs fixing no crees?
On Dec 12, 2012 1:20 AM, "hbto [Vauxoo] http://
<email address hidden>> wrote:
> Paso la propuesta de merge a rechazado, para agregar los cambios y tareas
> que estan en el whiteboard y workitems del blueprint.
>
> --
>
> https:/
> You are reviewing the proposed merge of
> lp:~vauxoo/openerp-venezuela-localization/ovl70-whsrc-rev-yani into
> lp:openerp-venezuela-localization.
>
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote : | # |
Si esa opción es correcta y existe por favor aplicala, no recuerdo haberla
visto
Hbto [Vauxoo]
On Dec 12, 2012 1:43 AM, "Nhomar Hernandez (Vauxoo)" <email address hidden>
wrote:
> Yo creo que deberia estar en needs fixing no crees?
> On Dec 12, 2012 1:20 AM, "hbto [Vauxoo] http://
> <email address hidden>> wrote:
>
> > Paso la propuesta de merge a rechazado, para agregar los cambios y tareas
> > que estan en el whiteboard y workitems del blueprint.
> >
> > --
> >
> >
> https:/
> > You are reviewing the proposed merge of
> > lp:~vauxoo/openerp-venezuela-localization/ovl70-whsrc-rev-yani into
> > lp:openerp-venezuela-localization.
> >
>
> --
>
> https:/
> You are subscribed to branch
> lp:~vauxoo/openerp-venezuela-localization/ovl70-whsrc-rev-yani.
>
Nhomar - Vauxoo (nhomar) wrote : | # |
Sorry Tiene errores técnicos.
- 778. By Yanina Aular (Vauxoo)
-
[ADD] button to change retention, for now does not work
- 779. By Yanina Aular (Vauxoo)
-
[IMP] Button Change retention is work
- 780. By Yanina Aular (Vauxoo)
-
[IMP] Button is visible when invoice is open
- 781. By Yanina Aular (Vauxoo)
-
[IMP] Maximum retention is 5%
- 782. By Yanina Aular (Vauxoo)
-
[ADD] Files to wizard change retention
- 783. By Yanina Aular (Vauxoo)
-
[IMP] Interface retention wizard
- 784. By Yanina Aular (Vauxoo)
-
[ADD] Access rules
- 785. By Yanina Aular (Vauxoo)
-
[FIX] Added button change retention to invoice supplier view
- 786. By Yanina Aular (Vauxoo)
-
[IMP] filter the type of document, in_invoice for suppliers, out_invoice for clients
- 787. By Yanina Aular (Vauxoo)
-
[FIX] retention change button in the view of supplier, was misplaced
- 788. By Yanina Aular (Vauxoo)
-
[IMP] type field readonly
- 789. By Yanina Aular (Vauxoo)
-
[FIX] reverted change 770
- 790. By Yanina Aular (Vauxoo)
-
[ADD] fields to the view partner extension
- 791. By Yanina Aular (Vauxoo)
-
[MERGE] withholding module
- 792. By Yanina Aular (Vauxoo)
-
[ADD] Onchange_partner_id was modified so that when creating a customer invoice, charge what is indicated on your registration res.partner,
when loading a vendor invoice, charge what is marked as my retainer fee, for I am the customer. - 793. By Yanina Aular (Vauxoo)
-
[ADD] partner_id fields is be readonly when i am not retention agent and be in_invoice
- 794. By Yanina Aular (Vauxoo)
-
[ADD] In view of the supplier src Full list of partners, as long as my company, my company, is a withholding agent,
At the same hearing, the type should be invisible or read-only and should be in_invoice.In the view of customer src, display only a list of partners, who are withholding agents. At the same hearing, the type should be invisible or read-only and should be in_invoice.
- 795. By Yanina Aular (Vauxoo)
-
[DEL] Method unused
- 796. By hbto [Vauxoo] http://www.vauxoo.com
-
[FIX] reverting wrong move in 776
- 797. By hbto [Vauxoo] http://www.vauxoo.com
-
[FIX] reverting wrong move in file l10n_ve_
withholding_ src/model/ partner. py
and file l10n_ve_withholding_ src/view/ partner_ view.xml - 798. By Yanina Aular (Vauxoo)
-
[IMP] wizard kill
Unmerged revisions
- 798. By Yanina Aular (Vauxoo)
-
[IMP] wizard kill
Preview Diff
1 | === modified file 'l10n_ve_withholding_src/__openerp__.py' |
2 | --- l10n_ve_withholding_src/__openerp__.py 2012-08-22 22:56:20 +0000 |
3 | +++ l10n_ve_withholding_src/__openerp__.py 2012-12-12 05:44:19 +0000 |
4 | @@ -59,7 +59,7 @@ |
5 | 'view/company_view.xml', |
6 | 'workflow/l10n_ve_wh_src_wf.xml', |
7 | 'data/data.xml', |
8 | - 'wh_src_report.xml', |
9 | + 'report/wh_src_report.xml', |
10 | ], |
11 | "active": False, |
12 | "installable": True |
13 | |
14 | === modified file 'l10n_ve_withholding_src/data/data.xml' |
15 | --- l10n_ve_withholding_src/data/data.xml 2012-09-11 00:38:30 +0000 |
16 | +++ l10n_ve_withholding_src/data/data.xml 2012-12-12 05:44:19 +0000 |
17 | @@ -2,17 +2,35 @@ |
18 | <openerp> |
19 | <data noupdate="1"> |
20 | |
21 | + <!-- Sequence types for account.wh.src --> |
22 | + |
23 | <record id="seq_type_account_wh_iva" model="ir.sequence.type"> |
24 | <field name="name">Withholding src costumer</field> |
25 | <field name="code">wh.src.out</field> |
26 | </record> |
27 | |
28 | <record id="seq_type_account_wh_iva_purchase" model="ir.sequence.type"> |
29 | - <field name="name">Withholding src supplier</field> |
30 | + <field name="name">Withholding src supplier</field> |
31 | <field name="code">wh.src.in</field> |
32 | </record> |
33 | - |
34 | - <record id="seq_type_account_wh_src_supplier" model="ir.sequence"> |
35 | + |
36 | + <record id="seq_type_account_wh_src_supplier" model="ir.sequence.type"> |
37 | + <field name="name">Withholding local.supplier</field> |
38 | + <field name="code">account.wh.src.in_invoice</field> |
39 | + </record> |
40 | + |
41 | + |
42 | + <!-- Sequences for account.wh.src --> |
43 | + |
44 | + <record id="seq_account_retencion_src_customer" model="ir.sequence"> |
45 | + <field name="name">Withholding local customer</field> |
46 | + <field name="code">account.wh.src.in_invoice</field> |
47 | + <field name="prefix">RET-SRC</field> |
48 | + <field name="padding">8</field> |
49 | + <field name="number_increment">1</field> |
50 | + </record> |
51 | + |
52 | + <record id="seq_account_wh_src_supplier" model="ir.sequence"> |
53 | <field name="name">Withholding src</field> |
54 | <field name="code">wh.src.out</field> |
55 | <field name="prefix">src:</field> |
56 | @@ -20,48 +38,30 @@ |
57 | <field name="number_increment">1</field> |
58 | </record> |
59 | |
60 | - <record id="seq_account_retencion_src_customer" model="ir.sequence"> |
61 | + <record id="seq_account_retencion_src_purchase" model="ir.sequence"> |
62 | <field name="name">Withholding src purchase</field> |
63 | <field name="code">wh.src.in</field> |
64 | <field name="prefix">%(year)s-%(month)s-</field> |
65 | <field name="padding">8</field> |
66 | <field name="number_increment">1</field> |
67 | </record> |
68 | + |
69 | + |
70 | + <!-- Journals for account.wh.src --> |
71 | + |
72 | <record id="withholding_scr_purchase_journal" model="account.journal"> |
73 | <field name="name">DIARIO DE SRC PARA PROVEEDORES</field> |
74 | <field name="code">srcP</field> |
75 | <field name="type">src_purchase</field> |
76 | - <field name="view_id" ref="account.account_journal_view"/> |
77 | - <field name="sequence_id" ref="seq_type_account_wh_src_supplier"/> |
78 | + <field name="sequence_id" ref="seq_account_wh_src_supplier"/> |
79 | </record> |
80 | |
81 | <record id="withholding_src_sale_journal" model="account.journal"> |
82 | <field name="name">DIARIO DE SRC PARA CLIENTES</field> |
83 | <field name="code">srcC</field> |
84 | <field name="type">src_sale</field> |
85 | - <field name="view_id" ref="account.account_journal_view"/> |
86 | <field name="sequence_id" ref="seq_account_retencion_src_customer"/> |
87 | </record> |
88 | - |
89 | - <!-- Sequences type for account.wh.src --> |
90 | - |
91 | - |
92 | - <record id="seq_type_account_wh_src_supplier" model="ir.sequence.type"> |
93 | - <field name="name">Withholding local.supplier</field> |
94 | - <field name="code">account.wh.src.in_invoice</field> |
95 | - </record> |
96 | - |
97 | - <!-- Sequences for account.wh.src --> |
98 | - |
99 | - |
100 | - <record id="seq_account_retencion_src_customer" model="ir.sequence"> |
101 | - <field name="name">Withholding local customer</field> |
102 | - <field name="code">account.wh.src.in_invoice</field> |
103 | - <field name="prefix">RET-SRC</field> |
104 | - <field name="padding">8</field> |
105 | - <field name="number_increment">1</field> |
106 | - </record> |
107 | - |
108 | |
109 | </data> |
110 | </openerp> |
111 | |
112 | === modified file 'l10n_ve_withholding_src/model/invoice.py' |
113 | --- l10n_ve_withholding_src/model/invoice.py 2012-01-27 05:37:46 +0000 |
114 | +++ l10n_ve_withholding_src/model/invoice.py 2012-12-12 05:44:19 +0000 |
115 | @@ -84,7 +84,7 @@ |
116 | pay_journal_id, writeoff_acc_id, |
117 | writeoff_period_id, writeoff_journal_id, date, |
118 | name, context=context) |
119 | - if context.get('src_wh',False): |
120 | + if context.get('wh_src',False): |
121 | invoice = self.browse(cr, uid, ids[0]) |
122 | |
123 | types = {'out_invoice': -1, 'in_invoice': 1, 'out_refund': 1, 'in_refund': -1} |
124 | |
125 | === removed file 'l10n_ve_withholding_src/model/partner.py' |
126 | --- l10n_ve_withholding_src/model/partner.py 2012-01-26 22:29:50 +0000 |
127 | +++ l10n_ve_withholding_src/model/partner.py 1970-01-01 00:00:00 +0000 |
128 | @@ -1,44 +0,0 @@ |
129 | -#!/usr/bin/python |
130 | -# -*- encoding: utf-8 -*- |
131 | -########################################################################### |
132 | -# Module Writen to OpenERP, Open Source Management Solution |
133 | -# Copyright (C) OpenERP Venezuela (<http://openerp.com.ve>). |
134 | -# All Rights Reserved |
135 | -###############Credits###################################################### |
136 | -# Coded by: Humberto Arocha <hbto@vauxoo.com> |
137 | -# Planified by: Humberto Arocha / Nhomar Hernandez |
138 | -# Audited by: Vauxoo C.A. |
139 | -############################################################################# |
140 | -# Copyright (c) 2009 Latinux Inc (http://www.latinux.com/) All Rights Reserved. |
141 | -# This program is free software: you can redistribute it and/or modify |
142 | -# it under the terms of the GNU Affero General Public License as published by |
143 | -# the Free Software Foundation, either version 3 of the License, or |
144 | -# (at your option) any later version. |
145 | -# |
146 | -# This program is distributed in the hope that it will be useful, |
147 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
148 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
149 | -# GNU Affero General Public License for more details. |
150 | -# |
151 | -# You should have received a copy of the GNU Affero General Public License |
152 | -# along with this program. If not, see <http://www.gnu.org/licenses/>. |
153 | -################################################################################ |
154 | - |
155 | -from osv import fields, osv |
156 | -from tools.translate import _ |
157 | -import decimal_precision as dp |
158 | -import netsvc |
159 | - |
160 | -class res_partner(osv.osv): |
161 | - _inherit = 'res.partner' |
162 | - #~ logger = netsvc.Logger() |
163 | - #~ _columns = { |
164 | - #~ 'wh_src_agent': fields.boolean('Wh. Agent', help="Indicate if the partner is a withholding vat agent"), |
165 | - #~ 'wh_src_rate': fields.float(string='Rate', digits_compute= dp.get_precision('Withhold'), help="Withholding vat rate"), |
166 | - #~ } |
167 | - #~ _defaults = { |
168 | - #~ 'wh_src_rate': lambda *a: 0, |
169 | - #~ } |
170 | - |
171 | - |
172 | -res_partner() |
173 | |
174 | === modified file 'l10n_ve_withholding_src/model/wh_src.py' |
175 | --- l10n_ve_withholding_src/model/wh_src.py 2012-09-26 22:10:42 +0000 |
176 | +++ l10n_ve_withholding_src/model/wh_src.py 2012-12-12 05:44:19 +0000 |
177 | @@ -208,7 +208,7 @@ |
178 | inv_obj = self.pool.get('account.invoice') |
179 | if context is None: context = {} |
180 | |
181 | - context.update({'src_wh':True}) |
182 | + context.update({'wh_src':True}) |
183 | |
184 | ret = self.browse(cr, uid, ids[0], context) |
185 | |
186 | |
187 | === added file 'l10n_ve_withholding_src/report/wh_src_report.xml' |
188 | --- l10n_ve_withholding_src/report/wh_src_report.xml 1970-01-01 00:00:00 +0000 |
189 | +++ l10n_ve_withholding_src/report/wh_src_report.xml 2012-12-12 05:44:19 +0000 |
190 | @@ -0,0 +1,17 @@ |
191 | +<?xml version="1.0" encoding="utf-8"?> |
192 | +<openerp> |
193 | + <data> |
194 | + |
195 | + <report |
196 | + auto="True" |
197 | + id="wh_src_report_1" |
198 | + model="account.wh.src" |
199 | + name="wh.src.report" |
200 | + rml="l10n_ve_withholding_src/report/wh_src_report.rml" |
201 | + string="Reporte Compromiso Social" |
202 | + menu="True" |
203 | + header="False" |
204 | + /> |
205 | + |
206 | + </data> |
207 | +</openerp> |
208 | |
209 | === modified file 'l10n_ve_withholding_src/view/account_invoice_view.xml' |
210 | --- l10n_ve_withholding_src/view/account_invoice_view.xml 2012-11-07 21:33:58 +0000 |
211 | +++ l10n_ve_withholding_src/view/account_invoice_view.xml 2012-12-12 05:44:19 +0000 |
212 | @@ -8,14 +8,14 @@ |
213 | <field name="type">form</field> |
214 | <field name="inherit_id" ref="l10n_ve_withholding.wh_inv_customer"/> |
215 | <field name="arch" type="xml"> |
216 | - <xpath expr="//field[@name='currency_id']" position="after"> |
217 | + <xpath expr="//separator[@string='rsep']" position="after"> |
218 | <newline/> |
219 | <group col="6" colspan="4"> |
220 | <field name="wh_src_rate"/> |
221 | <field name="wh_src_id"/> |
222 | </group> |
223 | </xpath> |
224 | - <xpath expr="//field[@name='account_id']" position='attributes'> |
225 | + <xpath expr="//separator[@string='rsep']" position='attributes'> |
226 | <attribute name="string">SRC Withholdings</attribute> |
227 | </xpath> |
228 | </field> |
229 | |
230 | === modified file 'l10n_ve_withholding_src/view/company_view.xml' |
231 | --- l10n_ve_withholding_src/view/company_view.xml 2012-01-27 05:37:46 +0000 |
232 | +++ l10n_ve_withholding_src/view/company_view.xml 2012-12-12 05:44:19 +0000 |
233 | @@ -8,12 +8,12 @@ |
234 | <field name="type">form</field> |
235 | <field name="inherit_id" ref="base.view_company_form"/> |
236 | <field name="arch" type="xml"> |
237 | - <page string="Configuration" position="inside"> |
238 | - <separator string="Social Responsability Commitment Accounts" colspan="4"/> |
239 | + <xpath expr='//page[@string="Configuration"]/group/group[@name="account_grp"]' position="after"> |
240 | + <separator string="Social Responsability Commitment Accounts" colspan="2"/> |
241 | <field name="wh_src_collected_account_id" required='1'/> |
242 | <field name="wh_src_paid_account_id" required='1'/> |
243 | <newline/> |
244 | - </page> |
245 | + </xpath> |
246 | </field> |
247 | </record> |
248 | |
249 | |
250 | === removed file 'l10n_ve_withholding_src/view/partner_view.xml' |
251 | --- l10n_ve_withholding_src/view/partner_view.xml 2012-01-26 04:52:17 +0000 |
252 | +++ l10n_ve_withholding_src/view/partner_view.xml 1970-01-01 00:00:00 +0000 |
253 | @@ -1,33 +0,0 @@ |
254 | -<?xml version="1.0" encoding="utf-8"?> |
255 | -<openerp> |
256 | - <data> |
257 | - |
258 | - |
259 | - |
260 | - <!-- |
261 | - ===================================================== |
262 | - Partners Extension |
263 | - ===================================================== |
264 | - --> |
265 | - |
266 | - <record id="partner_ext_munici_view_form_loc_ve" model="ir.ui.view"> |
267 | - <field name="name">partner_extended_munici.partner.form.view.loc_ve</field> |
268 | - <field name="model">res.partner</field> |
269 | - <field name="type">form</field> |
270 | - <field name="inherit_id" ref="l10n_ve_withholding.wh_partner"/> |
271 | - <field name="arch" type="xml"> |
272 | - <page string="Withholdings" position="inside"> |
273 | - <notebook> |
274 | - <page string="Local Withholdings"> |
275 | - <group col="4" colspan="2"> |
276 | - <field name="property_wh_munici_payable"/> |
277 | - <field name="property_wh_munici_receivable"/> |
278 | - </group> |
279 | - </page> |
280 | - </notebook> |
281 | - </page> |
282 | - </field> |
283 | - </record> |
284 | - |
285 | - </data> |
286 | -</openerp> |
287 | |
288 | === modified file 'l10n_ve_withholding_src/view/wh_src_view.xml' |
289 | --- l10n_ve_withholding_src/view/wh_src_view.xml 2012-01-30 20:48:44 +0000 |
290 | +++ l10n_ve_withholding_src/view/wh_src_view.xml 2012-12-12 05:44:19 +0000 |
291 | @@ -57,10 +57,10 @@ |
292 | <field name="arch" type="xml"> |
293 | <search string="Search Withholding Local"> |
294 | <group col="10" colspan="4"> |
295 | - <filter name="wh_src_draft" icon="terp-gtk-media-pause" string="Draft" domain="[('state','=','draft')]" help="Draft Withholding Local"/> |
296 | - <filter name="wh_src_confirmed" icon="terp-gtk-media-pause" string="Confirmed" domain="[('state','=','confirmed')]" help="Draft Withholding Local"/> |
297 | - <filter name="wh_src_done" icon="terp-check" string="Done" domain="[('state','=','done')]" help="Done Withholding Local"/> |
298 | - <filter name="wh_src_cancel" icon="terp-dialog-close" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Withholding Local"/> |
299 | + <filter name="wh_src_draft" string="Draft" domain="[('state','=','draft')]" help="Draft Withholding Local"/> |
300 | + <filter name="wh_src_confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Draft Withholding Local"/> |
301 | + <filter name="wh_src_done" string="Done" domain="[('state','=','done')]" help="Done Withholding Local"/> |
302 | + <filter name="wh_src_cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Withholding Local"/> |
303 | <separator orientation="vertical"/> |
304 | <field name="code"/> |
305 | <field name="number"/> |
306 | @@ -70,11 +70,11 @@ |
307 | </group> |
308 | <newline/> |
309 | <group expand="1" string="Group By..."> |
310 | - <filter string="Partner" icon="terp-partner" domain="[]" context="{'group_by':'partner_id'}"/> |
311 | - <separator orientation="vertical"/> |
312 | - <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/> |
313 | - <separator orientation="vertical"/> |
314 | - <filter string="Accounting Date of Withhold" icon="terp-go-month" domain="[]" context="{'group_by':'date_ret'}"/> |
315 | + <filter string="Partner" domain="[]" context="{'group_by':'partner_id'}"/> |
316 | + <separator orientation="vertical"/> |
317 | + <filter string="State" domain="[]" context="{'group_by':'state'}"/> |
318 | + <separator orientation="vertical"/> |
319 | + <filter string="Accounting Date of Withhold" domain="[]" context="{'group_by':'date_ret'}"/> |
320 | </group> |
321 | </search> |
322 | </field> |
323 | @@ -132,10 +132,10 @@ |
324 | <field name="state"/> |
325 | </group> |
326 | <group col="4" colspan="2"> |
327 | - <button name="wh_src_confirmed" states="draft" string="Confirm" icon="gtk-ok"/> |
328 | - <button name="wh_src_done" states="confirmed" string="Done" icon="gtk-execute"/> |
329 | - <button name="wh_src_cancel" states="done" string="Cancel" icon="gtk-cancel"/> |
330 | - <button name="wh_src_draft" states="cancel,confirmed" string="Set to draft" icon="gtk-refresh"/> |
331 | + <button name="wh_src_confirmed" states="draft" string="Confirm" /> |
332 | + <button name="wh_src_done" states="confirmed" string="Done" /> |
333 | + <button name="wh_src_cancel" states="done" string="Cancel" /> |
334 | + <button name="wh_src_draft" states="cancel,confirmed" string="Set to draft" /> |
335 | </group> |
336 | </page> |
337 | <page string="Other Information"> |
338 | @@ -153,7 +153,7 @@ |
339 | <field name="view_type">form</field> |
340 | <field name="view_mode">tree,form</field> |
341 | <field name="domain">[('type','=','out_invoice')]</field> |
342 | - <field name="context">{'type':'out_invoice'}</field> |
343 | + <field name="context">{'default_type':'out_invoice', 'type':'out_invoice' }</field> |
344 | <field name="search_view_id" ref="view_wh_src_filter"/> |
345 | <field name="help">With Social Responsibility Commitment Withholding Customer you can create and manage document withholding issued to your customers. OpenERP can also generate document withholding automatically from invoices. For retention must add the invoices, process them and then validate the document.</field> |
346 | </record> |
347 | @@ -185,7 +185,7 @@ |
348 | <field name="view_type">form</field> |
349 | <field name="view_mode">tree,form</field> |
350 | <field name="domain">[('type','=','in_invoice')]</field> |
351 | - <field name="context">{'type':'in_invoice'}</field> |
352 | + <field name="context">{'default_type':'out_invoice','type':'in_invoice'}</field> |
353 | <field name="search_view_id" ref="view_wh_src_filter"/> |
354 | <field name="help">With Social Responsibility Commitment Withholding Supplier you can create and manage document withholding issued to your customers. OpenERP can also generate document withholding automatically from invoices. For retention must add the invoices, process them and then validate the document.</field> |
355 | </record> |
356 | |
357 | === removed file 'l10n_ve_withholding_src/wh_src_report.xml' |
358 | --- l10n_ve_withholding_src/wh_src_report.xml 2012-02-20 20:11:16 +0000 |
359 | +++ l10n_ve_withholding_src/wh_src_report.xml 1970-01-01 00:00:00 +0000 |
360 | @@ -1,17 +0,0 @@ |
361 | -<?xml version="1.0" encoding="utf-8"?> |
362 | -<openerp> |
363 | - <data> |
364 | - |
365 | - <report |
366 | - auto="True" |
367 | - id="wh_src_report_1" |
368 | - model="account.wh.src" |
369 | - name="wh.src.report" |
370 | - rml="l10n_ve_withholding_src/report/wh_src_report.rml" |
371 | - string="Reporte Compromiso Social" |
372 | - menu="True" |
373 | - header="False" |
374 | - /> |
375 | - |
376 | - </data> |
377 | -</openerp> |
Por mi desde el punto de vista funcional hace todo lo esperado.