← Back to team overview

avanzosc team mailing list archive

[Merge] lp:~avanzosc-security-team/avanzosc/72h_dos_sales_elevator_partner into lp:~avanzosc-security-team/avanzosc/72horas

 

Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_dos_sales_elevator_partner into lp:~avanzosc-security-team/avanzosc/72horas.

Requested reviews:
  Pedro Manuel Baeza (pedro.baeza)

For more details, see:
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_sales_elevator_partner/+merge/226092

Corregidos errores al instalar
-- 
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_dos_sales_elevator_partner/+merge/226092
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'dos_sales_elevator_partner/__openerp__.py'
--- dos_sales_elevator_partner/__openerp__.py	2014-06-25 16:15:45 +0000
+++ dos_sales_elevator_partner/__openerp__.py	2014-07-09 10:14:56 +0000
@@ -26,16 +26,21 @@
     "category": "Enterprise Specific Modules",
     "description": """
     Module to allow set elevator partner in sale orders, stock picking and
-     account invoice.
+    account invoice.
     """,
-    "depends": ["base", "sale", "stock", "account",
-                "dos_partner_additional_info", "dos_contracts",
-                ],
-    "demo_xml": [],
-    "data": ['view/sale_view.xml',
-             'view/stock_view.xml',
-             'view/account_view.xml',
-             ],
+    "depends": [
+        "base",
+        "sale",
+        "stock",
+        "account",
+        "dos_partner_additional_info",
+        "dos_contracts",
+    ],
+    "data": [
+        'views/sale_view.xml',
+        'views/stock_view.xml',
+        'views/account_view.xml',
+    ],
     "website": 'http://www.dos-sl.es',
     "installable": True
 }

=== modified file 'dos_sales_elevator_partner/models/stock.py'
--- dos_sales_elevator_partner/models/stock.py	2014-07-04 09:44:32 +0000
+++ dos_sales_elevator_partner/models/stock.py	2014-07-09 10:14:56 +0000
@@ -35,7 +35,7 @@
                             states={'done': [('readonly', True)],
                                     'cancel': [('readonly', True)]}),
         'elevator_invoice_id':
-            fields.many2one('res.partner.address', 'Elevator Invoice Address',
+            fields.many2one('res.partner', 'Elevator Invoice Address',
                             states={'done': [('readonly', True)],
                                     'cancel': [('readonly', True)]},
                             help="Elevator invoice address for current "

=== modified file 'dos_sales_elevator_partner/views/sale_view.xml'
--- dos_sales_elevator_partner/views/sale_view.xml	2014-06-25 16:15:45 +0000
+++ dos_sales_elevator_partner/views/sale_view.xml	2014-07-09 10:14:56 +0000
@@ -16,10 +16,10 @@
                 <attribute name="domain">['|', ('partner_id','=',partner_id), ('partner_id','=',elevator_partner_id)]</attribute>
                 <attribute name="on_change">onchange_partner_shipping_id(partner_shipping_id)</attribute>
             </field>
-            <field name="partner_order_id" position="attributes">
-                <attribute name="domain">['|', ('partner_id','=',partner_id), ('partner_id','=',elevator_partner_id)]</attribute>
-                <attribute name="invisible">1</attribute>
-            </field>
+<!--             <field name="partner_order_id" position="attributes"> -->
+<!--                 <attribute name="domain">['|', ('partner_id','=',partner_id), ('partner_id','=',elevator_partner_id)]</attribute> -->
+<!--                 <attribute name="invisible">1</attribute> -->
+<!--             </field> -->
       </field>
     </record>
   </data>


Follow ups