avanzosc team mailing list archive
-
avanzosc team
-
Mailing list archive
-
Message #00864
[Merge] lp:~avanzosc-security-team/avanzosc/72h_nayar_h72_sync into lp:~avanzosc-security-team/avanzosc/72horas
Oihane (Avanzosc) has proposed merging lp:~avanzosc-security-team/avanzosc/72h_nayar_h72_sync 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_nayar_h72_sync/+merge/226284
Se le ha quitado la dependencia de base_contact y se han solucionado los problemas que daba al instalar
--
https://code.launchpad.net/~avanzosc-security-team/avanzosc/72h_nayar_h72_sync/+merge/226284
Your team Avanzosc_security is subscribed to branch lp:~avanzosc-security-team/avanzosc/72horas.
=== modified file 'nayar_h72_sync/__openerp__.py'
--- nayar_h72_sync/__openerp__.py 2014-07-02 12:34:42 +0000
+++ nayar_h72_sync/__openerp__.py 2014-07-10 11:51:01 +0000
@@ -23,12 +23,23 @@
{
"name": "72horas Sync",
"version": "1.0",
- "description": "Sincronización entre bases de datos de red móvil y de 72horas.",
+ "description": """
+ Sincronización entre bases de datos de red móvil y de 72horas.
+ """,
"author": "Nayar Systems",
"website": "",
"category": "Enterprise Specific Modules",
- "depends": ["base", "base_contact", "dos_contracts", "dos_refund_products"],
- "data": ['views/h72_view.xml', 'views/partner_view.xml', 'views/sale_view.xml',
- 'security/ir.model.access.csv'],
+ "depends": [
+ "base",
+ # "base_contact",
+ "dos_contracts",
+ "dos_refund_products",
+ ],
+ "data": [
+ 'views/h72_view.xml',
+ 'views/partner_view.xml',
+ 'views/sale_view.xml',
+ 'security/ir.model.access.csv',
+ ],
"installable": True
}
=== modified file 'nayar_h72_sync/models/__init__.py'
--- nayar_h72_sync/models/__init__.py 2014-07-02 12:34:42 +0000
+++ nayar_h72_sync/models/__init__.py 2014-07-10 11:51:01 +0000
@@ -19,8 +19,8 @@
#
##############################################################################
+from . import h72_sync
from . import contract
-from . import h72_sync
from . import partner
from . import refund_products
from . import sale
=== modified file 'nayar_h72_sync/models/h72_sync.py'
--- nayar_h72_sync/models/h72_sync.py 2014-07-02 12:34:42 +0000
+++ nayar_h72_sync/models/h72_sync.py 2014-07-10 11:51:01 +0000
@@ -216,7 +216,7 @@
updates = 0
partner_72horas_obj = self.pool['res.partner.h72.partner']
- address_obj = self.pool['res.partner.address']
+ address_obj = self.pool['res.partner']
profile_obj = self.pool['h72.profile']
profile_obj.write(cr, uid, profile_obj.search(cr, uid, []),
{'active': False}, context=context)
@@ -266,7 +266,7 @@
news += 1
self.logger.info("%s nuevos, %s actualizados" % (news, updates))
- def update_annexes(self, cr, uid, context=context):
+ def update_annexes(self, cr, uid, context=None):
self.logger.info("*** Actualización de anexos ***")
sql = ("SELECT n_telefono, COUNT(*) "
"FROM telefonos "
=== modified file 'nayar_h72_sync/models/partner.py'
--- nayar_h72_sync/models/partner.py 2014-07-02 12:34:42 +0000
+++ nayar_h72_sync/models/partner.py 2014-07-10 11:51:01 +0000
@@ -19,12 +19,13 @@
#
##############################################################################
-from openerp import orm, fields
+from openerp.osv import orm, fields
class ResPartnerH72Partner(orm.Model):
_name = 'res.partner.h72.partner'
_description = 'Clientes 72horas'
+
_columns = {
'partner_id': fields.many2one('res.partner', 'Partner', select=True,
required=True),
@@ -34,28 +35,30 @@
class ResPartner(orm.Model):
- _name = 'res.partner'
_inherit = 'res.partner'
+
_columns = {
'res_partner_h72_partner_ids':
fields.one2many('res.partner.h72.partner', 'partner_id',
'Cliente 72horas'),
'address_to_72horas': fields.boolean('Usar dirección'),
+ 'phones_to_72horas': fields.boolean('Alta Telefonos'),
}
_defaults = {
'res_partner_h72_partner_ids': lambda *a: False,
'address_to_72horas': False,
- }
-
-
-class ResPartnerAddress(orm.Model):
- _inherit = 'res.partner.address'
- _columns = {
- 'partner_id_72horas': fields.integer('Cliente 72horas'),
- 'phones_to_72horas': fields.boolean('Alta Telefonos'),
- 'address_to_72horas': fields.boolean('Usar dirección'),
- }
- _defaults = {
'phones_to_72horas': True,
- 'address_to_72horas': False,
- }
+ }
+
+
+# class ResPartnerAddress(orm.Model):
+# _inherit = 'res.partner.address'
+# _columns = {
+# 'partner_id_72horas': fields.integer('Cliente 72horas'),
+# 'phones_to_72horas': fields.boolean('Alta Telefonos'),
+# 'address_to_72horas': fields.boolean('Usar dirección'),
+# }
+# _defaults = {
+# 'phones_to_72horas': True,
+# 'address_to_72horas': False,
+# }
=== modified file 'nayar_h72_sync/models/refund_products.py'
--- nayar_h72_sync/models/refund_products.py 2014-07-02 12:34:42 +0000
+++ nayar_h72_sync/models/refund_products.py 2014-07-10 11:51:01 +0000
@@ -19,7 +19,7 @@
#
##############################################################################
-from openerp import orm, fields
+from openerp.osv import orm, fields
class RefundProducts(orm.Model):
=== modified file 'nayar_h72_sync/models/sale.py'
--- nayar_h72_sync/models/sale.py 2014-07-02 15:30:21 +0000
+++ nayar_h72_sync/models/sale.py 2014-07-10 11:51:01 +0000
@@ -19,7 +19,7 @@
#
##############################################################################
-from openerp import orm, fields
+from openerp.osv import orm, fields
class SaleOrder(orm.Model):
=== modified file 'nayar_h72_sync/views/partner_view.xml'
--- nayar_h72_sync/views/partner_view.xml 2014-07-02 12:34:42 +0000
+++ nayar_h72_sync/views/partner_view.xml 2014-07-10 11:51:01 +0000
@@ -1,86 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
- <!-- Res Partner Inherit Form View -->
- <record model="ir.ui.view" id="view_partner_additional_info_form">
- <field name="name">res.partner.additional.info.form</field>
- <field name="model">res.partner</field>
- <field name="inherit_id" ref="base.view_partner_form"/>
- <field name="priority">1</field>
- <field name="arch" type="xml">
- <page string="Notes" position="after">
- <page string="72horas">
- <field name="res_partner_h72_partner_ids" nolabel="1"/>
- <separator string="Opciones" colspan="4" col="4" />
- <group colspan="4" col="4">
- <field name="address_to_72horas" />
- </group>
- </page>
- </page>
- </field>
- </record>
-
- <record model="ir.ui.view" id="view_partner_branches_form">
- <field name="name">res.partner.branches.form</field>
- <field name="model">res.partner</field>
- <field name="inherit_id" ref="base_contact.view_partner_form_inherit"/>
- <field name="priority">1</field>
- <field name="arch" type="xml">
- <field name="email" widget="email" position="after">
- <separator string="72horas" colspan="2" col="2" />
- <field name="partner_id_72horas" />
- <field name="phones_to_72horas" />
- <field name="address_to_72horas" />
- </field>
- </field>
- </record>
-
- <!-- Res Partner Address Inherit Form Views -->
- <record model="ir.ui.view" id="view_partner_address_form1">
- <field name="name">res.partner.address.form1</field>
- <field name="model">res.partner.address</field>
- <field name="inherit_id" ref="base.view_partner_address_form1" />
- <field name="priority">1</field>
- <field name="arch" type="xml">
- <form string="Address">
- <group colspan="2" col="2">
- <separator string="72horas" colspan="4" col="4" />
- <field name="partner_id_72horas" />
- <field name="phones_to_72horas" />
- <field name="address_to_72horas" />
- </group>
- </form>
- </field>
- </record>
-
- <!-- Partner 72horas Tree View-->
- <record id="view_partner_h72_partner_tree" model="ir.ui.view">
- <field name="name">view.partner.h72.partner.tree</field>
- <field name="model">res.partner.h72.partner</field>
- <field name="priority">1</field>
- <field name="arch" type="xml">
- <tree string="Clientes 72horas">
- <field name="partner_id_72horas" />
- <field name="phones_to_72horas" />
- </tree>
- </field>
- </record>
-
- <!-- Partner 72horas Form View -->
- <record id="view_partner_h72_partner_form" model="ir.ui.view" >
- <field name="name">view.partner.h72.partner.form</field>
- <field name="model">res.partner.h72.partner</field>
- <field name="priority">1</field>
- <field name="arch" type="xml">
- <form string="Cliente 72horas">
- <group colspan="2" col="2">
- <separator string="Relación con Cliente 72horas" colspan="4" col="4" />
- <field name="partner_id_72horas" />
- <field name="phones_to_72horas" />
- </group>
- </form>
- </field>
- </record>
-
- </data>
+ <data>
+ <!-- Res Partner Inherit Form View -->
+ <record model="ir.ui.view" id="view_partner_additional_info_form">
+ <field name="name">res.partner.additional.info.form</field>
+ <field name="model">res.partner</field>
+ <field name="inherit_id" ref="base.view_partner_form" />
+ <field name="priority">1</field>
+ <field name="arch" type="xml">
+ <page string="Internal Notes" position="after">
+ <page string="72horas">
+ <field name="res_partner_h72_partner_ids"
+ nolabel="1" />
+ <separator string="Opciones" colspan="4"
+ col="4" />
+ <group colspan="4" col="4">
+ <field name="address_to_72horas" />
+ </group>
+ </page>
+ </page>
+ </field>
+ </record>
+
+ <!-- Partner 72horas Tree View -->
+ <record id="view_partner_h72_partner_tree" model="ir.ui.view">
+ <field name="name">view.partner.h72.partner.tree</field>
+ <field name="model">res.partner.h72.partner</field>
+ <field name="priority">1</field>
+ <field name="arch" type="xml">
+ <tree string="Clientes 72horas">
+ <field name="partner_id_72horas" />
+ <field name="phones_to_72horas" />
+ </tree>
+ </field>
+ </record>
+
+ <!-- Partner 72horas Form View -->
+ <record id="view_partner_h72_partner_form" model="ir.ui.view">
+ <field name="name">view.partner.h72.partner.form</field>
+ <field name="model">res.partner.h72.partner</field>
+ <field name="priority">1</field>
+ <field name="arch" type="xml">
+ <form string="Cliente 72horas">
+ <group colspan="2" col="2">
+ <separator string="Relación con Cliente 72horas"
+ colspan="4" col="4" />
+ <field name="partner_id_72horas" />
+ <field name="phones_to_72horas" />
+ </group>
+ </form>
+ </field>
+ </record>
+
+ </data>
</openerp>
=== modified file 'nayar_h72_sync/views/sale_view.xml'
--- nayar_h72_sync/views/sale_view.xml 2014-07-02 12:34:42 +0000
+++ nayar_h72_sync/views/sale_view.xml 2014-07-10 11:51:01 +0000
@@ -1,24 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
- <data>
- <!-- Sale Order Inherit Form View -->
- <record model="ir.ui.view" id="view_order_72horas_info_form">
- <field name="name">sale.order.72horas.info.form</field>
- <field name="model">sale.order</field>
- <field name="inherit_id" ref="sale.view_order_form"/>
- <field name="priority">1</field>
- <field name="arch" type="xml">
- <page string="Sales Order" position="after">
- <page string="72horas">
- <group colspan="2" col="4">
- <field name="save_to_72horas" string="Grabar en 72horas"/>
- <field name="profile_id" string="Perfil" colspan="4"/>
- <field name="address_to_72horas" string="Usar dirección"/>
- </group>
- </page>
- </page>
- </field>
- </record>
+ <data>
+ <!-- Sale Order Inherit Form View -->
+ <record model="ir.ui.view" id="view_order_72horas_info_form">
+ <field name="name">sale.order.72horas.info.form</field>
+ <field name="model">sale.order</field>
+ <field name="inherit_id" ref="sale.view_order_form" />
+ <field name="priority">1</field>
+ <field name="arch" type="xml">
+ <page string="Order Lines" position="after">
+ <page string="72horas">
+ <group colspan="2" col="4">
+ <field name="save_to_72horas" string="Grabar en 72horas" />
+ <field name="profile_id" string="Perfil"
+ colspan="4" />
+ <field name="address_to_72horas"
+ string="Usar dirección" />
+ </group>
+ </page>
+ </page>
+ </field>
+ </record>
- </data>
+ </data>
</openerp>
Follow ups
