Merge lp:~unifield-team/unifield-server/us-1573 into lp:unifield-server
- us-1573
- 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 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
Commit message
Description of the change
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 | 832 | class res_partner_address(osv.osv): | 832 | class res_partner_address(osv.osv): |
| 6 | 833 | _inherit = 'res.partner.address' | 833 | _inherit = 'res.partner.address' |
| 7 | 834 | 834 | ||
| 8 | 835 | _columns = { | ||
| 9 | 836 | 'office_name': fields.char( | ||
| 10 | 837 | string='Office name', | ||
| 11 | 838 | size=128, | ||
| 12 | 839 | ), | ||
| 13 | 840 | } | ||
| 14 | 841 | |||
| 15 | 835 | def unlink(self, cr, uid, ids, context=None): | 842 | def unlink(self, cr, uid, ids, context=None): |
| 16 | 836 | """ | 843 | """ |
| 17 | 837 | Check if the deleted address is not a system one | 844 | Check if the deleted address is not a system one |
| 18 | 838 | 845 | ||
| 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 | 203 | <group colspan="2" col="4"> | 203 | <group colspan="2" col="4"> |
| 24 | 204 | <separator string="Postal Address" colspan="4" col="4" /> | 204 | <separator string="Postal Address" colspan="4" col="4" /> |
| 25 | 205 | <field name="type" string="Type" colspan="2"/> | 205 | <field name="type" string="Type" colspan="2"/> |
| 26 | 206 | <field name="office_name" colspan="2" /> | ||
| 27 | 206 | <field name="street" colspan="4"/> | 207 | <field name="street" colspan="4"/> |
| 28 | 207 | <field name="street2" colspan="4"/> | 208 | <field name="street2" colspan="4"/> |
| 29 | 208 | <field name="zip"/> | 209 | <field name="zip"/> |
| 30 | 209 | 210 | ||
| 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 | 75814 | msgid "Partner Created on this instance" | 75814 | msgid "Partner Created on this instance" |
| 36 | 75815 | msgstr "Partenaire créé sur cette instance" | 75815 | msgstr "Partenaire créé sur cette instance" |
| 37 | 75816 | 75816 | ||
| 38 | 75817 | <<<<<<< TREE | ||
| 39 | 75817 | #. module: account_reconciliation | 75818 | #. module: account_reconciliation |
| 40 | 75818 | #: code:addons/account_reconciliation/wizard/account_reconcile.py:207 | 75819 | #: code:addons/account_reconciliation/wizard/account_reconcile.py:207 |
| 41 | 75819 | #, python-format | 75820 | #, python-format |
| 42 | @@ -75854,3 +75855,9 @@ | |||
| 43 | 75854 | #, python-format | 75855 | #, python-format |
| 44 | 75855 | msgid "Wrong total: %.2f, instead of: %.2f" | 75856 | msgid "Wrong total: %.2f, instead of: %.2f" |
| 45 | 75856 | msgstr "Total erroné : %.2f, au lieu de : %.2f" | 75857 | msgstr "Total erroné : %.2f, au lieu de : %.2f" |
| 46 | 75858 | ======= | ||
| 47 | 75859 | #. module: msf_partner | ||
| 48 | 75860 | #: field:res.partner.address,office_name:0 | ||
| 49 | 75861 | msgid "Office name" | ||
| 50 | 75862 | msgstr "Nom du bureau" | ||
| 51 | 75863 | >>>>>>> MERGE-SOURCE | ||
| 52 | 75857 | 75864 | ||
| 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 | 204 | 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 | 204 | 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 | 205 | 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 | 205 | 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 | 206 | 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 | 206 | 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 |
| 61 | 207 | 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 | 207 | 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 | 208 | 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 | 208 | 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 | 209 | 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 | 209 | 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 | 210 | 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 | 210 | 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 | 211 | 211 | ||
| 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 | 179 | <para style="TextInformation"> </para> | 179 | <para style="TextInformation"> </para> |
| 71 | 180 | </td> | 180 | </td> |
| 72 | 181 | <td> | 181 | <td> |
| 74 | 182 | <para style="TextInformation">[[ objects[0].partner_address_id.name and objects[0].partner_id.name or '' ]]</para> | 182 | <para style="TextInformation"> </para> |
| 75 | 183 | <!--<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 | 183 | </td> | 184 | </td> |
| 77 | 184 | <td> | 185 | <td> |
| 78 | 185 | <para style="TextInformation"> </para> | 186 | <para style="TextInformation"> </para> |
| 79 | @@ -202,25 +203,25 @@ | |||
| 80 | 202 | <para style="TextInformation"> </para> | 203 | <para style="TextInformation"> </para> |
| 81 | 203 | </td> | 204 | </td> |
| 82 | 204 | <td> | 205 | <td> |
| 102 | 205 | <para style="TextInformation">[[ objects[0].company_id.partner_id.name ]]</para> | 206 | <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 | 206 | </td> | 207 | </td> |
| 104 | 207 | <td> | 208 | <td> |
| 105 | 208 | <para style="TextInformation"> </para> | 209 | <para style="TextInformation"> </para> |
| 106 | 209 | </td> | 210 | </td> |
| 107 | 210 | <td> | 211 | <td> |
| 108 | 211 | <para style="TextInformation">[[ objects[0].partner_address_id.name or objects[0].partner_id.name ]]</para> | 212 | <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 | 212 | </td> | 213 | </td> |
| 110 | 213 | <td> | 214 | <td> |
| 111 | 214 | <para style="TextInformation"> </para> | 215 | <para style="TextInformation"> </para> |
| 112 | 215 | </td> | 216 | </td> |
| 113 | 216 | <td> | 217 | <td> |
| 114 | 217 | <para style="TextInformation">[[ objects[0].dest_address_id.partner_id.name or objects[0].partner_id.name ]]</para> | 218 | <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 | 218 | </td> | 219 | </td> |
| 116 | 219 | <td> | 220 | <td> |
| 117 | 220 | <para style="TextInformation"> </para> | 221 | <para style="TextInformation"> </para> |
| 118 | 221 | </td> | 222 | </td> |
| 119 | 222 | <td> | 223 | <td> |
| 120 | 223 | <para style="TextInformation">[[ objects[0].invoice_address_id.partner_id.name or objects[0].company_id.partner_id.name ]] </para> | 224 | <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 | 224 | </td> | 225 | </td> |
| 122 | 225 | </tr> | 226 | </tr> |
| 123 | 226 | <tr> | 227 | <tr> |
| 124 | 227 | 228 | ||
| 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 | 181 | <para style="TextInformation"> </para> | 181 | <para style="TextInformation"> </para> |
| 130 | 182 | </td> | 182 | </td> |
| 131 | 183 | <td> | 183 | <td> |
| 133 | 184 | <para style="TextInformation">[[ objects[0].partner_address_id.name and objects[0].partner_id.name or '' ]]</para> | 184 | <para style="TextInformation"> </para> |
| 134 | 185 | <!--<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 | 185 | </td> | 186 | </td> |
| 136 | 186 | <td> | 187 | <td> |
| 137 | 187 | <para style="TextInformation"> </para> | 188 | <para style="TextInformation"> </para> |
| 138 | @@ -204,25 +205,25 @@ | |||
| 139 | 204 | <para style="TextInformation"> </para> | 205 | <para style="TextInformation"> </para> |
| 140 | 205 | </td> | 206 | </td> |
| 141 | 206 | <td> | 207 | <td> |
| 161 | 207 | <para style="TextInformation">[[ objects[0].company_id.partner_id.name ]]</para> | 208 | <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 | 208 | </td> | 209 | </td> |
| 163 | 209 | <td> | 210 | <td> |
| 164 | 210 | <para style="TextInformation"> </para> | 211 | <para style="TextInformation"> </para> |
| 165 | 211 | </td> | 212 | </td> |
| 166 | 212 | <td> | 213 | <td> |
| 167 | 213 | <para style="TextInformation">[[ objects[0].partner_address_id.name or objects[0].partner_id.name ]]</para> | 214 | <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 | 214 | </td> | 215 | </td> |
| 169 | 215 | <td> | 216 | <td> |
| 170 | 216 | <para style="TextInformation"> </para> | 217 | <para style="TextInformation"> </para> |
| 171 | 217 | </td> | 218 | </td> |
| 172 | 218 | <td> | 219 | <td> |
| 173 | 219 | <para style="TextInformation">[[ objects[0].dest_address_id.partner_id.name or objects[0].partner_id.name ]]</para> | 220 | <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 | 220 | </td> | 221 | </td> |
| 175 | 221 | <td> | 222 | <td> |
| 176 | 222 | <para style="TextInformation"> </para> | 223 | <para style="TextInformation"> </para> |
| 177 | 223 | </td> | 224 | </td> |
| 178 | 224 | <td> | 225 | <td> |
| 179 | 225 | <para style="TextInformation">[[ objects[0].invoice_address_id.partner_id.name or objects[0].company_id.partner_id.name ]] </para> | 226 | <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 | 226 | </td> | 227 | </td> |
| 181 | 227 | </tr> | 228 | </tr> |
| 182 | 228 | <tr> | 229 | <tr> |
