Merge lp:~vauxoo/addons-vauxoo/partner_description_invoice_dev_luis into lp:addons-vauxoo

Proposed by Luis Torres - http://www.vauxoo.com
Status: Merged
Merged at revision: 353
Proposed branch: lp:~vauxoo/addons-vauxoo/partner_description_invoice_dev_luis
Merge into: lp:addons-vauxoo
Diff against target: 174 lines (+148/-0)
5 files modified
company_description/__init__.py (+1/-0)
company_description/__openerp__.py (+46/-0)
company_description/company_view.py (+10/-0)
company_description/company_view.xml (+24/-0)
company_description/i18n/es.po (+67/-0)
To merge this branch: bzr merge lp:~vauxoo/addons-vauxoo/partner_description_invoice_dev_luis
Reviewer Review Type Date Requested Status
Moisés López - http://www.vauxoo.com Needs Fixing
Review via email: mp+116552@code.launchpad.net

Description of the change

Se ha agregado un nuevo campo a la vista de partner en una nueva pestaña al final de las existentes

To post a comment you must log in.
353. By Luis Torres - http://www.vauxoo.com

[ADD][company_description]Add fields description for purchase, sale && invoice in company

354. By Luis Torres - http://www.vauxoo.com

[IMP]Chance fields descriptions of translate, rename files

355. By Luis Torres - http://www.vauxoo.com

[IMP] Add mi autoría in openerp

356. By Luis Torres - http://www.vauxoo.com

[DEL]Delete modul partner_description_invoice

Revision history for this message
Luis Torres - http://www.vauxoo.com (luis-cleto-) wrote :

Se elimino el campo leyend purchase de la compañia, se tomo ahora el campo de description_purchase, agregado en descripciones en la compañia

357. By Luis Torres - http://www.vauxoo.com

[IMP]Changed name of xml

Revision history for this message
Luis Torres - http://www.vauxoo.com (luis-cleto-) wrote :

Se cambio por el default el nombre de company.py, agregandoselo al _openerp_

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

Luis,
Te hacer
bzr add company.py

(no se encuentra dicho archivo, pero sí se invoca en el __init__.py

review: Needs Fixing
Revision history for this message
Luis Torres - http://www.vauxoo.com (luis-cleto-) wrote :

Se cambio en el init el import

Revision history for this message
Luis Torres - http://www.vauxoo.com (luis-cleto-) wrote :

Se cambio la Referencia de la vista que se hereda

Revision history for this message
Luis Torres - http://www.vauxoo.com (luis-cleto-) wrote :

Se agrego el mensaje de licencias en los py

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'company_description'
2=== added file 'company_description/__init__.py'
3--- company_description/__init__.py 1970-01-01 00:00:00 +0000
4+++ company_description/__init__.py 2012-07-25 21:50:42 +0000
5@@ -0,0 +1,1 @@
6+import company
7
8=== added file 'company_description/__openerp__.py'
9--- company_description/__openerp__.py 1970-01-01 00:00:00 +0000
10+++ company_description/__openerp__.py 2012-07-25 21:50:42 +0000
11@@ -0,0 +1,46 @@
12+# -*- encoding: utf-8 -*-
13+###########################################################################
14+# Module Writen to OpenERP, Open Source Management Solution
15+#
16+# Copyright (c) 2010 Vauxoo - http://www.vauxoo.com/
17+# All Rights Reserved.
18+# info Vauxoo (info@vauxoo.com)
19+############################################################################
20+# Coded by: Luis Torres (luis_t@vauxoo.com)
21+############################################################################
22+#
23+# This program is free software: you can redistribute it and/or modify
24+# it under the terms of the GNU Affero General Public License as
25+# published by the Free Software Foundation, either version 3 of the
26+# License, or (at your option) any later version.
27+#
28+# This program is distributed in the hope that it will be useful,
29+# but WITHOUT ANY WARRANTY; without even the implied warranty of
30+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
31+# GNU Affero General Public License for more details.
32+#
33+# You should have received a copy of the GNU Affero General Public License
34+# along with this program. If not, see <http://www.gnu.org/licenses/>.
35+#
36+##############################################################################
37+
38+{
39+ "name" : "Descriptions Company",
40+ "version" : "1.0",
41+ "author" : "Vauxoo",
42+ "category" : "Generic Modules",
43+ "description" : """
44+ Add fields description for purchase, sale & invoice in company
45+ """,
46+ "website" : "http://www.vauxoo.com/",
47+ "license" : "AGPL-3",
48+ "depends" : ["base",
49+ ],
50+ "init_xml" : [],
51+ "demo_xml" : [],
52+ "update_xml" : [
53+ "company_view.xml",
54+ ],
55+ "installable" : True,
56+ "active" : False,
57+}
58
59=== added file 'company_description/company_view.py'
60--- company_description/company_view.py 1970-01-01 00:00:00 +0000
61+++ company_description/company_view.py 2012-07-25 21:50:42 +0000
62@@ -0,0 +1,10 @@
63+from osv import osv, fields
64+
65+class res_company(osv.osv):
66+ _inherit = 'res.company'
67+ _columns = {
68+ 'description_invoice': fields.text('Description Invoice',translate=True),
69+ 'description_sale': fields.text('Description Sale',translate=True),
70+ 'description_purchase': fields.text('Description Purchase',translate=True),
71+ }
72+res_company()
73
74=== added file 'company_description/company_view.xml'
75--- company_description/company_view.xml 1970-01-01 00:00:00 +0000
76+++ company_description/company_view.xml 2012-07-25 21:50:42 +0000
77@@ -0,0 +1,24 @@
78+<?xml version="1.0" encoding="utf-8"?>
79+<openerp>
80+ <data>
81+ <record model="ir.ui.view" id="view_res_company_inherit_legend_form">
82+ <field name="name">view.res.company.inherit.legend.form</field>
83+ <field name="model">res.company</field>
84+ <field name="type">form</field>
85+ <field name="inherit_id" ref="account.view_company_inherit_form"/>
86+ <field name="arch" type="xml">
87+ <xpath expr="/form/notebook/page[@string='Overdue Payments']" position="after">
88+ <page string="Descriptions">
89+ <separator string="Invoice Description"/>
90+ <field colspan="4" name="description_invoice" nolabel="1"/>
91+ <separator string="Sale Description"/>
92+ <field colspan="4" name="description_sale" nolabel="1"/>
93+ <separator string="Purchase Description"/>
94+ <field colspan="4" name="description_purchase" nolabel="1"/>
95+ </page>
96+ </xpath>
97+ </field>
98+ </record>
99+ </data>
100+</openerp>
101+
102
103=== added directory 'company_description/i18n'
104=== added file 'company_description/i18n/es.po'
105--- company_description/i18n/es.po 1970-01-01 00:00:00 +0000
106+++ company_description/i18n/es.po 2012-07-25 21:50:42 +0000
107@@ -0,0 +1,67 @@
108+# Translation of OpenERP Server.
109+# This file contains the translation of the following modules:
110+# * company_description
111+#
112+msgid ""
113+msgstr ""
114+"Project-Id-Version: OpenERP Server 6.1\n"
115+"Report-Msgid-Bugs-To: \n"
116+"POT-Creation-Date: 2012-07-24 23:11+0000\n"
117+"PO-Revision-Date: 2012-07-24 23:11+0000\n"
118+"Last-Translator: <>\n"
119+"Language-Team: \n"
120+"MIME-Version: 1.0\n"
121+"Content-Type: text/plain; charset=UTF-8\n"
122+"Content-Transfer-Encoding: \n"
123+"Plural-Forms: \n"
124+
125+#. module: company_description
126+#: field:res.company,description_purchase:0
127+msgid "Description Purchase"
128+msgstr "Descripción Compras"
129+
130+#. module: company_description
131+#: field:res.company,description_invoice:0
132+msgid "Description Invoice"
133+msgstr "Descripción Facturas"
134+
135+#. module: company_description
136+#: view:res.company:0
137+msgid "Sale Description"
138+msgstr "Descripción Ventas"
139+
140+#. module: company_description
141+#: model:ir.model,name:company_description.model_res_company
142+msgid "Companies"
143+msgstr "Compañías"
144+
145+#. module: company_description
146+#: constraint:res.company:0
147+msgid "Error! You can not create recursive companies."
148+msgstr "¡Error! No puede crear compañías recursivas."
149+
150+#. module: company_description
151+#: field:res.company,description_sale:0
152+msgid "Description Sale"
153+msgstr "Descripción Ventas"
154+
155+#. module: company_description
156+#: view:res.company:0
157+msgid "Purchase Description"
158+msgstr "Descripción Compras"
159+
160+#. module: company_description
161+#: view:res.company:0
162+msgid "Descriptions"
163+msgstr "Descripciones"
164+
165+#. module: company_description
166+#: sql_constraint:res.company:0
167+msgid "The company name must be unique !"
168+msgstr "¡El nombre de la compañía debe ser único!"
169+
170+#. module: company_description
171+#: view:res.company:0
172+msgid "Invoice Description"
173+msgstr "Descripción Facturas"
174+