Unifield Server

Merge lp:~unifield-team/unifield-server/us-1573 into lp:unifield-server

  1. us-1573
  2. Merge into trunk
Proposed by Quentin THEURET @Amaris
Status: Merged
Merged at revision: 4136
Proposed branch: lp:~unifield-team/unifield-server/us-1573
Merge into: lp:unifield-server
Diff against target: 182 lines (+58/-41) (has conflicts)
6 files modified
bin/addons/msf_partner/partner.py (+7/-0)
bin/addons/msf_partner/partner_view.xml (+1/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+7/-0)
bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+1/-1)
bin/addons/purchase_override/report/merged_order.rml (+21/-20)
bin/addons/purchase_override/report/purchase_order.rml (+21/-20)
Text conflict in bin/addons/msf_profile/i18n/fr_MF.po
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1573
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314329@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/msf_partner/partner.py'
2--- bin/addons/msf_partner/partner.py 2016-12-06 16:13:55 +0000
3+++ bin/addons/msf_partner/partner.py 2017-01-10 09:54:29 +0000
4@@ -832,6 +832,13 @@
5 class res_partner_address(osv.osv):
6 _inherit = 'res.partner.address'
7
8+ _columns = {
9+ 'office_name': fields.char(
10+ string='Office name',
11+ size=128,
12+ ),
13+ }
14+
15 def unlink(self, cr, uid, ids, context=None):
16 """
17 Check if the deleted address is not a system one
18
19=== modified file 'bin/addons/msf_partner/partner_view.xml'
20--- bin/addons/msf_partner/partner_view.xml 2016-12-06 16:13:55 +0000
21+++ bin/addons/msf_partner/partner_view.xml 2017-01-10 09:54:29 +0000
22@@ -203,6 +203,7 @@
23 <group colspan="2" col="4">
24 <separator string="Postal Address" colspan="4" col="4" />
25 <field name="type" string="Type" colspan="2"/>
26+ <field name="office_name" colspan="2" />
27 <field name="street" colspan="4"/>
28 <field name="street2" colspan="4"/>
29 <field name="zip"/>
30
31=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
32--- bin/addons/msf_profile/i18n/fr_MF.po 2017-01-02 08:52:42 +0000
33+++ bin/addons/msf_profile/i18n/fr_MF.po 2017-01-10 09:54:29 +0000
34@@ -75814,6 +75814,7 @@
35 msgid "Partner Created on this instance"
36 msgstr "Partenaire créé sur cette instance"
37
38+<<<<<<< TREE
39 #. module: account_reconciliation
40 #: code:addons/account_reconciliation/wizard/account_reconcile.py:207
41 #, python-format
42@@ -75854,3 +75855,9 @@
43 #, python-format
44 msgid "Wrong total: %.2f, instead of: %.2f"
45 msgstr "Total erroné : %.2f, au lieu de : %.2f"
46+=======
47+#. module: msf_partner
48+#: field:res.partner.address,office_name:0
49+msgid "Office name"
50+msgstr "Nom du bureau"
51+>>>>>>> MERGE-SOURCE
52
53=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
54--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2016-11-28 13:22:17 +0000
55+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2017-01-10 09:54:29 +0000
56@@ -204,7 +204,7 @@
57 msf_usb_sync_data_server.cp_price_list_version,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'date_end', 'date_start', 'name', 'pricelist_id/id']",USB,product.pricelist.version,,[MASTER] Price List Version,Valid,,1651
58 msf_usb_sync_data_server.cp_all_partners,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['comment', 'credit_limit', 'customer', 'customer_lt', 'lang', 'manufacturer', 'name', 'partner_type', 'po_by_project', 'procurement_lt', 'property_account_payable/id', 'property_account_position/id', 'property_account_receivable/id', 'property_payment_term/id', 'property_product_pricelist/id', 'property_product_pricelist_purchase/id', 'property_stock_customer/id', 'property_stock_supplier/id', 'ref', 'supplier', 'supplier_lt', 'transport_0', 'transport_0_lt', 'transport_1', 'transport_1_lt', 'transport_2', 'transport_2_lt', 'transporter']",USB,res.partner,,[MASTER] Partner,Valid,,1660
59 msf_usb_sync_data_server.cp_all_partners_tree,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],USB,res.partner,,[MASTER] Partner Tree,Valid,,1661
60-msf_usb_sync_data_server.cp_all_partners_address,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",USB,res.partner.address,,[MASTER] Partner Address,Valid,,1662
61+msf_usb_sync_data_server.cp_all_partners_address,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip', 'office_name']",USB,res.partner.address,,[MASTER] Partner Address,Valid,,1662
62 msf_usb_sync_data_server.cp_product_price_list,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'company_id/id', 'currency_id/id', 'currency_name', 'name', 'type']",USB,product.pricelist,,[MASTER] Product_price_list,Valid,,1670
63 msf_usb_sync_data_server.cp_country_restrictions,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],['name'],USB,res.country.restriction,,[MASTER] Country restrictions,Valid,,1680
64 msf_usb_sync_data_server.cp_all_product,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['alert_time', 'batch_management', 'asset_type_id', 'categ_id/id', 'closed_article','manufacturer_txt', 'manufacturer_ref','code', 'cold_chain/id', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item/id', 'international_status/id', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'xmlid_code', 'active', 'state', 'old_code', 'new_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume','volume_updated', 'soq_quantity', 'soq_weight','soq_volume']",USB,product.product,,[MASTER] Products,Valid,,1810
65
66=== modified file 'bin/addons/purchase_override/report/merged_order.rml'
67--- bin/addons/purchase_override/report/merged_order.rml 2016-12-06 10:51:12 +0000
68+++ bin/addons/purchase_override/report/merged_order.rml 2017-01-10 09:54:29 +0000
69@@ -179,7 +179,8 @@
70 <para style="TextInformation"> </para>
71 </td>
72 <td>
73- <para style="TextInformation">[[ objects[0].partner_address_id.name and objects[0].partner_id.name or '' ]]</para>
74+ <para style="TextInformation"> </para>
75+ <!--<para style="TextInformation">[[ objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name ]]</para>-->
76 </td>
77 <td>
78 <para style="TextInformation"> </para>
79@@ -202,25 +203,25 @@
80 <para style="TextInformation"> </para>
81 </td>
82 <td>
83- <para style="TextInformation">[[ objects[0].company_id.partner_id.name ]]</para>
84- </td>
85- <td>
86- <para style="TextInformation"> </para>
87- </td>
88- <td>
89- <para style="TextInformation">[[ objects[0].partner_address_id.name or objects[0].partner_id.name ]]</para>
90- </td>
91- <td>
92- <para style="TextInformation"> </para>
93- </td>
94- <td>
95- <para style="TextInformation">[[ objects[0].dest_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
96- </td>
97- <td>
98- <para style="TextInformation"> </para>
99- </td>
100- <td>
101- <para style="TextInformation">[[ objects[0].invoice_address_id.partner_id.name or objects[0].company_id.partner_id.name ]] </para>
102+ <para style="TextInformation">[[ len(objects[0].company_id.partner_id.address) and objects[0].company_id.partner_id.address[0].office_name or objects[0].company_id.partner_id.name or '' ]]</para>
103+ </td>
104+ <td>
105+ <para style="TextInformation"> </para>
106+ </td>
107+ <td>
108+ <para style="TextInformation">[[ objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
109+ </td>
110+ <td>
111+ <para style="TextInformation"> </para>
112+ </td>
113+ <td>
114+ <para style="TextInformation">[[ objects[0].dest_address_id.office_name or objects[0].dest_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
115+ </td>
116+ <td>
117+ <para style="TextInformation"> </para>
118+ </td>
119+ <td>
120+ <para style="TextInformation">[[ objects[0].invoice_address_id.office_name or objects[0].invoice_address_id.partner_id.name or objects[0].company_id.partner_id.name ]] </para>
121 </td>
122 </tr>
123 <tr>
124
125=== modified file 'bin/addons/purchase_override/report/purchase_order.rml'
126--- bin/addons/purchase_override/report/purchase_order.rml 2016-12-06 10:51:12 +0000
127+++ bin/addons/purchase_override/report/purchase_order.rml 2017-01-10 09:54:29 +0000
128@@ -181,7 +181,8 @@
129 <para style="TextInformation"> </para>
130 </td>
131 <td>
132- <para style="TextInformation">[[ objects[0].partner_address_id.name and objects[0].partner_id.name or '' ]]</para>
133+ <para style="TextInformation"> </para>
134+ <!--<para style="TextInformation">[[ objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name ]]</para> -->
135 </td>
136 <td>
137 <para style="TextInformation"> </para>
138@@ -204,25 +205,25 @@
139 <para style="TextInformation"> </para>
140 </td>
141 <td>
142- <para style="TextInformation">[[ objects[0].company_id.partner_id.name ]]</para>
143- </td>
144- <td>
145- <para style="TextInformation"> </para>
146- </td>
147- <td>
148- <para style="TextInformation">[[ objects[0].partner_address_id.name or objects[0].partner_id.name ]]</para>
149- </td>
150- <td>
151- <para style="TextInformation"> </para>
152- </td>
153- <td>
154- <para style="TextInformation">[[ objects[0].dest_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
155- </td>
156- <td>
157- <para style="TextInformation"> </para>
158- </td>
159- <td>
160- <para style="TextInformation">[[ objects[0].invoice_address_id.partner_id.name or objects[0].company_id.partner_id.name ]] </para>
161+ <para style="TextInformation">[[ len(objects[0].company_id.partner_id.address) and objects[0].company_id.partner_id.address[0].office_name or objects[0].company_id.partner_id.name ]]</para>
162+ </td>
163+ <td>
164+ <para style="TextInformation"> </para>
165+ </td>
166+ <td>
167+ <para style="TextInformation">[[ objects[0].partner_address_id.office_name or objects[0].partner_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
168+ </td>
169+ <td>
170+ <para style="TextInformation"> </para>
171+ </td>
172+ <td>
173+ <para style="TextInformation">[[ objects[0].dest_address_id.office_name or objects[0].dest_address_id.partner_id.name or objects[0].partner_id.name ]]</para>
174+ </td>
175+ <td>
176+ <para style="TextInformation"> </para>
177+ </td>
178+ <td>
179+ <para style="TextInformation">[[ objects[0].invoice_address_id.office_name or objects[0].invoice_address_id.partner_id.name or objects[0].company_id.partner_id.name ]] </para>
180 </td>
181 </tr>
182 <tr>

Subscribers

People subscribed via source and target branches

to all changes: