Merge lp:~vauxoo/addons-vauxoo/7.0-account_invoice_supplier_number_tree-dev_saul into lp:addons-vauxoo/7.0

Proposed by Saul Gonzalez
Status: Merged
Merged at revision: 939
Proposed branch: lp:~vauxoo/addons-vauxoo/7.0-account_invoice_supplier_number_tree-dev_saul
Merge into: lp:addons-vauxoo/7.0
Diff against target: 111 lines (+47/-8)
3 files modified
account_invoice_number/__openerp__.py (+7/-4)
account_invoice_number/account_invoice_view.xml (+24/-4)
account_invoice_number/i18n/account_invoice_number.pot (+16/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/7.0-account_invoice_supplier_number_tree-dev_saul
Reviewer Review Type Date Requested Status
hbto [Vauxoo] http://www.vauxoo.com Approve
Moisés López - http://www.vauxoo.com Needs Fixing
Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com Needs Fixing
Saul Gonzalez Pending
Review via email: mp+195396@code.launchpad.net

This proposal supersedes a proposal from 2013-11-12.

Description of the change

Nuevo modulo: account_invoice_supplier_number_tree

1.Creado nuevo action para la vista tree de facturas de proveedores
2.Nueva vista tree de facturas de proveedores
3.Agregado campo supplier_invoice_number a la vista tree de facturas de proveedores
4.Archivo .pot

To post a comment you must log in.
Revision history for this message
Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com (josemoralesp) wrote :
Download full text (3.2 KiB)

La llaves del diccionario del __openerp__.py no son las correspondientes a la version 7.0, deben ser las siguientes
{
    'name' : '',
    'version' : '1.0',
    'author' : '',
    'category' : '',
    'description' : """

    """,
    'website': 'http://www.vauxoo.com',
    'images' : [],
    'depends' : [

    ],
    'data': [

    ],
    'js': [

    ],
    'qweb' : [

    ],
    'css':[

    ],
    'demo': [
    ],
    'test': [
    ],
    'installable': True,
    'auto_...

Read more...

review: Needs Fixing
Revision history for this message
Moisés López - http://www.vauxoo.com (moylop260) wrote :

Ya existe un módulo llamado
account_invoice_number
Utiliza ese mismo por favor para no tener 2 modulos nuestros iguales.

review: Needs Fixing
932. By Saul Gonzalez

[ADD] Code move to module account_invoice_number.
[REMOVE] Module account_invoice_supplier_number_tree deleted.
[FIX] Openerp manifest modified in order to be 7.0 compliant

933. By Saul Gonzalez

[ADD] i18n directory and pot file added

Revision history for this message
Saul Gonzalez (saulguillermo) wrote :

> La llaves del diccionario del __openerp__.py no son las correspondientes a la
> version 7.0, deben ser las siguientes
> {
> 'name' : '',
> 'version' : '1.0',
> 'author' : '',
> 'category' : '',
> 'description' : """
>
> """,
> 'website': 'http://www.vauxoo.com',
> 'images' : [],
> 'depends' : [
>
>
> ],
> 'data': [
>
> ],
> 'js': [
>
> ],
> 'qweb' : [
>
> ],
> 'css':[
>
> ],
> 'demo': [
> ],
> 'test': [
> ],
> 'installable': True,
> 'auto_install': False,
> }

Realice lo cambios sugeridos, aunque en el __openerp__.py del modulo account_invoice_number.
El __openerp__.py del modulo account_invoice_supplier_number_tree lo removí junto con el resto del modulo.

Revision history for this message
Saul Gonzalez (saulguillermo) wrote :

> Ya existe un módulo llamado
> account_invoice_number
> Utiliza ese mismo por favor para no tener 2 modulos nuestros iguales.

Realice los cambios sugeridos, me parece una buena idea.

934. By Saul Gonzalez

[FIX] Modified account.view_account_invoice_filter view in order to resolve conflict with module invoice_date_ref

935. By Saul Gonzalez

[FIX] all inherited fields modified using position='attributes' and set original field to
'invisible' and new field to 'after'.

Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

Luce Bien para mi.

Se quitó la sobre escritura de los campos que anteriormente se hacía con "replace"

ahora se hace mediante un atributo, aquellas secciones que se deseaban sacar del aire
se hicieron invisible, y los elementos que las reemplazaban se hiciero aparecer posterior
al elemento de reemplazo.

Saludos

review: Approve
Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

> La llaves del diccionario del __openerp__.py no son las correspondientes a la
> version 7.0, deben ser las siguientes
> {
> 'name' : '',
> 'version' : '1.0',
> 'author' : '',
> 'category' : '',
> 'description' : """
>
> """,
> 'website': 'http://www.vauxoo.com',
> 'images' : [],
> 'depends' : [
>
>
> ],
> 'data': [
>
> ],
> 'js': [
>
> ],
> 'qweb' : [
>
> ],
> 'css':[
>
> ],
> 'demo': [
> ],
> 'test': [
> ],
> 'installable': True,
> 'auto_install': False,
> }

Puedes revisar nuevamente Jose, Por favor,

Saludos

Revision history for this message
hbto [Vauxoo] http://www.vauxoo.com (humbertoarocha) wrote :

> Ya existe un módulo llamado
> account_invoice_number
> Utiliza ese mismo por favor para no tener 2 modulos nuestros iguales.

Moy, puedes revisar nuevamente, se reutilizó el modulo que comentas, y
se hizo un refactory de las vistas que presentaban conflictos.

Saludos

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'account_invoice_number/__openerp__.py'
2--- account_invoice_number/__openerp__.py 2013-06-22 15:51:09 +0000
3+++ account_invoice_number/__openerp__.py 2013-11-25 18:35:51 +0000
4@@ -29,11 +29,14 @@
5 "version": "1.0",
6 "author": "Vauxoo",
7 "category": "Localization/Mexico",
8- "description" : """This module add field internal_number to invoice view.
9- when you cancel a customer invoice will not delete the invoice number
10+ "description" : """
11+This module add field internal_number to invoice view.
12+When you cancel a customer invoice will not delete the invoice number.
13+
14+It also adds field Supplier Invoice Number for suppliers in tree view.
15 """,
16 "website": "http://www.vauxoo.com/",
17- "license": "AGPL-3",
18+ "images": [],
19 "depends": ["account"],
20 "demo": [],
21 "data": [
22@@ -44,5 +47,5 @@
23 'css': [],
24 'test': [],
25 "installable": True,
26- "active": False,
27+ "auto_install": False,
28 }
29
30=== modified file 'account_invoice_number/account_invoice_view.xml'
31--- account_invoice_number/account_invoice_view.xml 2013-06-20 06:37:24 +0000
32+++ account_invoice_number/account_invoice_view.xml 2013-11-25 18:35:51 +0000
33@@ -1,4 +1,4 @@
34-<?xml version="1.0"?>
35+<?xml version="1.0" encoding="utf-8"?>
36 <openerp>
37 <data>
38
39@@ -7,7 +7,10 @@
40 <field name="model">account.invoice</field>
41 <field name="inherit_id" ref="account.invoice_form"/>
42 <field name="arch" type="xml">
43- <xpath expr="/form/sheet[@string='Invoice']/h1/field[@name='number']" position="replace">
44+ <xpath expr="/form/sheet[@string='Invoice']/h1/field[@name='number']" position="attributes">
45+ <attribute name="invisible">True</attribute>
46+ </xpath>
47+ <xpath expr="/form/sheet[@string='Invoice']/h1/field[@name='number']" position="after">
48 <field name="internal_number"/>
49 </xpath>
50 </field>
51@@ -19,7 +22,10 @@
52 <field name="model">account.invoice</field>
53 <field name="inherit_id" ref="account.view_account_invoice_filter"/>
54 <field name="arch" type="xml">
55- <xpath expr="/search/field[@name='number']" position="replace">
56+ <xpath expr="/search/field[@name='number']" position="attributes">
57+ <attribute name="invisible">True</attribute>
58+ </xpath>
59+ <xpath expr="/search/field[@name='number']" position="after">
60 <field name="internal_number"/>
61 </xpath>
62 </field>
63@@ -30,11 +36,25 @@
64 <field name="model">account.invoice</field>
65 <field name="inherit_id" ref="account.invoice_tree"/>
66 <field name="arch" type="xml">
67- <xpath expr="/tree/field[@name='number']" position="replace">
68+ <xpath expr="/tree/field[@name='number']" position="attributes">
69+ <attribute name="invisible">True</attribute>
70+ </xpath>
71+ <xpath expr="/tree/field[@name='number']" position="after">
72 <field name="internal_number"/>
73 </xpath>
74 </field>
75 </record>
76
77+ <record id="invoice_tree_supplier_number" model="ir.ui.view">
78+ <field name="name">account.invoice.tree</field>
79+ <field name="model">account.invoice</field>
80+ <field name="inherit_id" ref="account.invoice_tree" />
81+ <field name="arch" type="xml">
82+ <xpath expr="/tree/field[@name='date_invoice']" position="after">
83+ <field name="supplier_invoice_number" invisible="context.get('type', False) in ('out_invoice','out_refund') or False"/>
84+ </xpath>
85+ </field>
86+ </record>
87+
88 </data>
89 </openerp>
90
91=== added directory 'account_invoice_number/i18n'
92=== added file 'account_invoice_number/i18n/account_invoice_number.pot'
93--- account_invoice_number/i18n/account_invoice_number.pot 1970-01-01 00:00:00 +0000
94+++ account_invoice_number/i18n/account_invoice_number.pot 2013-11-25 18:35:51 +0000
95@@ -0,0 +1,16 @@
96+# Translation of OpenERP Server.
97+# This file contains the translation of the following modules:
98+#
99+msgid ""
100+msgstr ""
101+"Project-Id-Version: OpenERP Server 7.0\n"
102+"Report-Msgid-Bugs-To: \n"
103+"POT-Creation-Date: 2013-11-20 21:50+0000\n"
104+"PO-Revision-Date: 2013-11-20 21:50+0000\n"
105+"Last-Translator: <>\n"
106+"Language-Team: \n"
107+"MIME-Version: 1.0\n"
108+"Content-Type: text/plain; charset=UTF-8\n"
109+"Content-Transfer-Encoding: \n"
110+"Plural-Forms: \n"
111+