tfr (Openerp) has proposed merging lp:~openerp-dev/openerp-int/mck_address_role
into lp:~openerp-dev/openerp-int/mck_addons.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-int/mck_address_role/+merge/127703
--
https://code.launchpad.net/~openerp-dev/openerp-int/mck_address_role/+merge/127703
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openerp-int/mck_address_role into
lp:~openerp-dev/openerp-int/mck_addons.
=== modified file 'mck_contact/company.py'
--- mck_contact/company.py 2012-10-02 12:50:06 +0000
+++ mck_contact/company.py 2012-10-03 10:13:32 +0000
@@ -160,7 +160,6 @@
return self.name_get(cr, uid, ids, context=context)
def create(self, cr, uid, values, context=None):
-
trace_log(cr, uid, self.__logger_address, 'info', 'create a new company')
vals = values.copy()
error = True
=== modified file 'mck_contact/view/company.xml'
--- mck_contact/view/company.xml 2012-10-02 07:38:46 +0000
+++ mck_contact/view/company.xml 2012-10-03 10:13:32 +0000
@@ -257,10 +257,121 @@
parent="mck_address_book_menuitem" action="res_partner_form"
sequence="99" />
-
-
-
-
+<<<<<<< TREE
+
+
+
+
+=======
+ <!-- Conf -> Address Book -> Companies -->
+
+
+ <!-- McKinsey Address Book Company Addresses -->
+
+ <!-- inherited from res.partner -->
+
+ <record id="res_partner_location_search_view" model="ir.ui.view">
+ <field name="name">res.partner.location.search</field>
+ <field name="model">res.partner.location</field>
+ <field name="type">search</field>
+ <field name="priority">15</field>
+ <field name="arch" type="xml">
+ <search string="Company Address">
+ <field name="partner_id" />
+ <field name="country_id" />
+ <field name="city" />
+ <field name="zip" />
+ <field name="state" />
+ </search>
+ </field>
+ </record>
+
+ <record id="res_partner_location_tree_view" model="ir.ui.view">
+ <field name="name">res.partner.location.tree</field>
+ <field name="model">res.partner.location</field>
+ <field name="type">tree</field>
+ <field name="priority">15</field>
+ <field name="arch" type="xml">
+ <tree string="Company Address">
+ <field name="partner_id"/>
+ <field name="street" />
+ <field name="street2" />
+ <field name="city" />
+ <field name="zip" />
+ <field name="country_id" />
+ <field name="state" />
+ </tree>
+ </field>
+ </record>
+
+ <record id="res_partner_location_form_view" model="ir.ui.view">
+ <field name="name">res.partner.location.form</field>
+ <field name="model">res.partner.location</field>
+ <field name="type">form</field>
+ <field name="priority">1</field>
+ <field name="arch" type="xml">
+ <form string="Company Address">
+ <group colspan="4" col="8">
+ <label string="" colspan="8"/>
+ <field name="partner_id" colspan="4" />
+ <field name="hq" colspan="4" />
+ <label string="" colspan="8"/>
+ <field name="street" colspan="4" />
+ <field name="street2" colspan="4" />
+ <label string="" colspan="8"/>
+ <field name="city" />
+ <field name="zip" />
+ <field name="country_id" />
+ <field name="state" />
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <record id="res_partner_location_form_view1" model="ir.ui.view">
+ <field name="name">res.partner.location.form</field>
+ <field name="model">res.partner.location</field>
+ <field name="type">form</field>
+ <field name="priority">15</field>
+ <field name="arch" type="xml">
+ <form string="Company Address">
+ <group colspan="4" col="8">
+ <label string="" colspan="8"/>
+ <field name="partner_id" readonly="1" colspan="4" />
+ <field name="hq" colspan="4" />
+ <label string="" colspan="8"/>
+ <field name="street" colspan="4" />
+ <field name="street2" colspan="4" />
+ <label string="" colspan="8"/>
+ <field name="city" />
+ <field name="zip" />
+ <field name="country_id" />
+ <field name="state" />
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <record id="res_partner_location" model="ir.actions.act_window">
+ <field name="name">Address Book Companies Addresses</field>
+ <field name="res_model">res.partner.location</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ </record>
+
+ <!-- Conf -> Address Book -> Addresses -->
+ <menuitem id="mck_config_address_book_addresses" name="Addresses"
+ parent="mck_base_menu.mck_config_address_book" sequence="2" />
+
+ <!-- Conf -> Address Book -> Addresses -> Addresses -->
+ <menuitem id="mck_address_book_config_addresses" name="Addresses"
+ parent="mck_config_address_book_addresses" action="res_partner_location" />
+
+ <!-- Conf -> Address Book -> Addresses -> Countries -->
+ <menuitem id="mck_address_book_config_countries" name="Countries" groups="mck_base_menu.uber_user"
+ parent="mck_config_address_book_addresses" action="base.action_country" />
+
+>>>>>>> MERGE-SOURCE
<!-- Disable Companies in Configuration/Settings -->
<menuitem id="menu_res_company_global" groups="base.group_no_one" />
=== modified file 'mck_contact/view/executive.xml'
--- mck_contact/view/executive.xml 2012-10-02 12:50:06 +0000
+++ mck_contact/view/executive.xml 2012-10-03 10:13:32 +0000
@@ -49,9 +49,14 @@
context="{'form_view_ref' : 'mck_contact.res_partner_form_view_simple'}"
colspan="8" />
<field name="location_id" domain="[('partner_id', '=', partner_id)]"
+<<<<<<< TREE
on_change="onchange_location_id(location_id)" context="{'default_partner_id' : partner_id}"
colspan="4" />
<field name="region" colspan="4" />
+=======
+ on_change="onchange_location_id(location_id)" context="{'default_partner_id' : partner_id, 'form_view_ref' : 'mck_contact.res_partner_location_form_view1'}"
+ colspan="8" />
+>>>>>>> MERGE-SOURCE
<field name="country_id" invisible="1"/>
<label string="" colspan="16" />
<label string="" colspan="16" />
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
