Merge branch '8.0' of github.com:ingadhoc/odoo-addons into 8.0

jjscarafia · jjscarafia · commit e439e167f239 · 2015-08-25T13:31:17.000-03:00
diff --git a/partner_internal_code/__openerp__.py b/partner_internal_code/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     "name": "Partner Internal Code",
-    'version': '1.0',
+    'version': '8.0.0.1.0',
     'category': 'Tools',
     'sequence': 14,
     'author':  'ADHOC SA',
diff --git a/partner_internal_code/partner_view.xml b/partner_internal_code/partner_view.xml
@@ -14,5 +14,17 @@
             </field>
         </record>
 
+        <record id="view_partner_user_tree" model="ir.ui.view">
+            <field name="name">partner.user.tree</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_tree"/>
+            <field name="arch" type="xml">
+                <field name="display_name" position="before">
+                    <field name="internal_code" required="False"/>
+                </field>
+                
+            </field>
+        </record>
+
     </data>
 </openerp>
diff --git a/partner_views_fields/__openerp__.py b/partner_views_fields/__openerp__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 {
     "name": "Add Fields on Partners Views",
-    "version": "1.0",
+    "version": "8.0.0.1.1",
     "author": "ADHOC SA",
     "category": "",
     "description": """
diff --git a/partner_views_fields/res_config.py b/partner_views_fields/res_config.py
@@ -33,5 +33,9 @@ class partner_configuration(models.TransientModel):
         "Show Function On Partners Tree and Search Views",
         implied_group='partner_views_fields.group_function',
         )
+    group_street = fields.Boolean(
+        "Show Street On Partners Tree and Search Views",
+        implied_group='partner_views_fields.group_street',
+        )
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/partner_views_fields/res_config_view.xml b/partner_views_fields/res_config_view.xml
@@ -35,6 +35,10 @@
                                 <field name="group_country_id" class="oe_inline"/>
                                 <label for="group_country_id"/>
                             </div>
+                            <div name="group_street">
+                                <field name="group_street" class="oe_inline"/>
+                                <label for="group_street"/>
+                            </div>
                         </div>
                     </group>                    
                 </group>
diff --git a/partner_views_fields/res_partner_view.xml b/partner_views_fields/res_partner_view.xml
@@ -9,6 +9,9 @@
                     <field name="ref" groups="partner_views_fields.group_ref"/>
                     <field name="function" groups="partner_views_fields.group_function"/>
                 </field>
+                <field name="phone" position="after">
+                    <field name="street" groups="partner_views_fields.group_street"/>
+                </field>
                 <field name="country_id" position="replace"/>
                 <field name="user_id" position="after">
                     <field name="user_id" groups="partner_views_fields.group_user_id"/>
diff --git a/partner_views_fields/security/partner_person_security.xml b/partner_views_fields/security/partner_person_security.xml
@@ -26,6 +26,10 @@
         <field name="name">Partner Tree and Search Function</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
+    <record id="group_street" model="res.groups">
+        <field name="name">Partner Tree and Search Street</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
 
 </data>
 </openerp>
diff --git a/sale_partner_require_origin/i18n/es_AR.po b/sale_partner_require_origin/i18n/es_AR.po
diff --git a/sale_partner_require_origin/i18n/sale_partner_require_origin.pot b/sale_partner_require_origin/i18n/sale_partner_require_origin.pot
diff --git a/sale_require_purchase_order_number/__init__.py b/sale_require_purchase_order_number/__init__.py
@@ -6,3 +6,5 @@
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 from . import sale
 from . import partner
+from . import account
+from . import stock
diff --git a/sale_require_purchase_order_number/__openerp__.py b/sale_require_purchase_order_number/__openerp__.py
@@ -19,25 +19,27 @@
 #
 ##############################################################################
 {
-    'name': 'Sale Partner Require Origin',
-    'version': '1.0',
+    'name': 'Sale Require Purchase Order Number',
+    'version': '8.0.0.1.0',
     'category': 'Projects & Services',
     'sequence': 14,
     'summary': '',
     'description': """
-Sale Partner Require Origin
-===========================
+Sale Require Purchase Order Number
+==================================
     """,
     'author':  'ADHOC SA',
     'website': 'www.adhoc.com.ar',
     'images': [
     ],
     'depends': [
-        'sale',
+        'sale', 'stock'
     ],
     'data': [
         'sale_view.xml',
-        'partner_view.xml'
+        'partner_view.xml',
+        'account_view.xml',
+        'stock_view.xml'
     ],
     'demo': [
     ],
diff --git a/sale_require_purchase_order_number/account.py b/sale_require_purchase_order_number/account.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+# For copyright and license notices, see __openerp__.py file in module root
+# directory
+##############################################################################
+from openerp import models, fields
+
+
+class account_invoice(models.Model):
+    _inherit = "account.invoice"
+
+    require_purchase_order_number = fields.Boolean(
+        string='Sale Require Origin',
+        related='partner_id.require_purchase_order_number')
+    purchase_order_number = fields.Char(
+        'Purchase Order Number',
+        readonly=True, states={'draft': [('readonly', False)]})
diff --git a/sale_require_purchase_order_number/account_view.xml b/sale_require_purchase_order_number/account_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="view_account_invoice_form" model="ir.ui.view">
+            <field name="name">account.invoice.form</field>
+            <field name="model">account.invoice</field>
+            <field name="inherit_id" ref="account.invoice_form"/>
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="require_purchase_order_number" invisible="1"/>
+                    <field name="purchase_order_number" attrs="{'required': [('require_purchase_order_number', '=', True)]}"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>
diff --git a/sale_require_purchase_order_number/i18n/es_AR.po b/sale_require_purchase_order_number/i18n/es_AR.po
@@ -0,0 +1,49 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* sale_require_purchase_order_number
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-25 13:12+0000\n"
+"PO-Revision-Date: 2015-08-25 10:14-0300\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.5.4\n"
+
+#. module: sale_require_purchase_order_number
+#: model:ir.model,name:sale_require_purchase_order_number.model_account_invoice
+msgid "Invoice"
+msgstr "Factura"
+
+#. module: sale_require_purchase_order_number
+#: model:ir.model,name:sale_require_purchase_order_number.model_res_partner
+msgid "Partner"
+msgstr "Partner"
+
+#. module: sale_require_purchase_order_number
+#: model:ir.model,name:sale_require_purchase_order_number.model_stock_picking
+msgid "Picking List"
+msgstr "Albarán"
+
+#. module: sale_require_purchase_order_number
+#: field:account.invoice,purchase_order_number:0
+#: field:sale.order,purchase_order_number:0
+#: field:stock.picking,purchase_order_number:0
+msgid "Purchase Order Number"
+msgstr "Numero de Orden de Compra"
+
+#. module: sale_require_purchase_order_number
+#: field:res.partner,require_purchase_order_number:0
+msgid "Require Purchase Order Number"
+msgstr "Requiere Orden de Compra del Cliente"
+
+#. module: sale_require_purchase_order_number
+#: model:ir.model,name:sale_require_purchase_order_number.model_sale_order
+msgid "Sales Order"
+msgstr "Orden de Ventas"
diff --git a/sale_require_purchase_order_number/i18n/sale_require_purchase_order_number.pot b/sale_require_purchase_order_number/i18n/sale_require_purchase_order_number.pot
@@ -0,0 +1,49 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* sale_require_purchase_order_number
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-08-25 13:12+0000\n"
+"PO-Revision-Date: 2015-08-25 13:12+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: sale_require_purchase_order_number
+#: model:ir.model,name:sale_require_purchase_order_number.model_account_invoice
+msgid "Invoice"
+msgstr ""
+
+#. module: sale_require_purchase_order_number
+#: model:ir.model,name:sale_require_purchase_order_number.model_res_partner
+msgid "Partner"
+msgstr ""
+
+#. module: sale_require_purchase_order_number
+#: model:ir.model,name:sale_require_purchase_order_number.model_stock_picking
+msgid "Picking List"
+msgstr ""
+
+#. module: sale_require_purchase_order_number
+#: field:account.invoice,purchase_order_number:0
+#: field:sale.order,purchase_order_number:0
+#: field:stock.picking,purchase_order_number:0
+msgid "Purchase Order Number"
+msgstr ""
+
+#. module: sale_require_purchase_order_number
+#: field:res.partner,require_purchase_order_number:0
+msgid "Require Purchase Order Number"
+msgstr ""
+
+#. module: sale_require_purchase_order_number
+#: model:ir.model,name:sale_require_purchase_order_number.model_sale_order
+msgid "Sales Order"
+msgstr ""
+
diff --git a/sale_require_purchase_order_number/partner.py b/sale_require_purchase_order_number/partner.py
@@ -9,4 +9,5 @@
 class partner(models.Model):
     _inherit = "res.partner"
 
-    sale_require_origin = fields.Boolean(string='Sale Require Origin')
+    require_purchase_order_number = fields.Boolean(
+        string='Require Purchase Order Number')
diff --git a/sale_require_purchase_order_number/partner_view.xml b/sale_require_purchase_order_number/partner_view.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="base.view_partner_form"/>
             <field name="arch" type="xml">
                 <field name="user_id" position="after">
-                    <field name="sale_require_origin" attrs="{'invisible': [('customer', '!=', True)]}"/>
+                    <field name="require_purchase_order_number" attrs="{'invisible': [('customer', '!=', True)]}"/>
                 </field>
             </field>
         </record>
diff --git a/sale_require_purchase_order_number/sale.py b/sale_require_purchase_order_number/sale.py
@@ -9,6 +9,8 @@
 class sale_order(models.Model):
     _inherit = "sale.order"
 
-    sale_require_origin = fields.Boolean(
+    require_purchase_order_number = fields.Boolean(
         string='Sale Require Origin',
-        related='partner_id.sale_require_origin')
+        related='partner_id.require_purchase_order_number')
+    purchase_order_number = fields.Char(
+        'Purchase Order Number')
diff --git a/sale_require_purchase_order_number/sale_view.xml b/sale_require_purchase_order_number/sale_view.xml
@@ -6,9 +6,9 @@
             <field name="model">sale.order</field>
             <field name="inherit_id" ref="sale.view_order_form"/>
             <field name="arch" type="xml">
-                <field name="origin" position="replace">
-                    <field name="sale_require_origin" invisible="1"/>
-                    <field name="origin" attrs="{'required': [('sale_require_origin', '=', True)]}"/>
+                <field name="origin" position="after">
+                    <field name="require_purchase_order_number" invisible="1"/>
+                    <field name="purchase_order_number" attrs="{'required': [('require_purchase_order_number', '=', True)]}"/>
                 </field>
             </field>
         </record>
diff --git a/sale_require_purchase_order_number/stock.py b/sale_require_purchase_order_number/stock.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+# For copyright and license notices, see __openerp__.py file in module root
+# directory
+##############################################################################
+from openerp import models, fields
+
+
+class stock_picking(models.Model):
+    _inherit = "stock.picking"
+
+    require_purchase_order_number = fields.Boolean(
+        string='Sale Require Origin',
+        related='partner_id.require_purchase_order_number')
+    purchase_order_number = fields.Char(
+        'Purchase Order Number',
+        states={'cancel': [('readonly', True)],
+                'done': [('readonly', True)]})
diff --git a/sale_require_purchase_order_number/stock_view.xml b/sale_require_purchase_order_number/stock_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<openerp>
+    <data>
+        <record id="view_stock_picking_form" model="ir.ui.view">
+            <field name="name">stock.picking.form</field>
+            <field name="model">stock.picking</field>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
+            <field name="arch" type="xml">
+                <field name="origin" position="after">
+                    <field name="require_purchase_order_number" invisible="1"/>
+                    <field name="purchase_order_number" attrs="{'required': [('require_purchase_order_number', '=', True)]}"/>
+                </field>
+            </field>
+        </record>
+    </data>
+</openerp>

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`
`22`	`22`	`{`
`23`	`23`	`"name": "Partner Internal Code",`
`24`		`- 'version': '1.0',`
	`24`	`+ 'version': '8.0.0.1.0',`
`25`	`25`	`'category': 'Tools',`
`26`	`26`	`'sequence': 14,`
`27`	`27`	`'author': 'ADHOC SA',`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`# -- encoding: utf-8 --`
`2`	`2`	`{`
`3`	`3`	`"name": "Add Fields on Partners Views",`
`4`		`- "version": "1.0",`
	`4`	`+ "version": "8.0.0.1.1",`
`5`	`5`	`"author": "ADHOC SA",`
`6`	`6`	`"category": "",`
`7`	`7`	`"description": """`
Original file line number	Diff line number	Diff line change
`@@ -33,5 +33,9 @@ class partner_configuration(models.TransientModel):`
`33`	`33`	`"Show Function On Partners Tree and Search Views",`
`34`	`34`	`implied_group='partner_views_fields.group_function',`
`35`	`35`	`)`
	`36`	`+ group_street = fields.Boolean(`
	`37`	`+ "Show Street On Partners Tree and Search Views",`
	`38`	`+ implied_group='partner_views_fields.group_street',`
	`39`	`+ )`
`36`	`40`
`37`	`41`	`# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:`