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

Proposed by jftempo
Status: Merged
Merged at revision: 4167
Proposed branch: lp:~unifield-team/unifield-server/us-1721
Merge into: lp:unifield-server
Diff against target: 37 lines (+14/-0) (has conflicts)
2 files modified
bin/addons/msf_profile/data/patches.xml (+7/-0)
bin/addons/msf_profile/msf_profile.py (+7/-0)
Text conflict in bin/addons/msf_profile/data/patches.xml
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1721
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+315031@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
=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml 2016-12-06 16:47:10 +0000
+++ bin/addons/msf_profile/data/patches.xml 2017-01-18 15:49:53 +0000
@@ -142,9 +142,16 @@
142 <record id="us_1671_stopped_products" model="patch.scripts">142 <record id="us_1671_stopped_products" model="patch.scripts">
143 <field name="method">us_1671_stopped_products</field>143 <field name="method">us_1671_stopped_products</field>
144 </record>144 </record>
145<<<<<<< TREE
145146
146 <record id="us_2075_partner_locally_created" model="patch.scripts">147 <record id="us_2075_partner_locally_created" model="patch.scripts">
147 <field name="method">us_2075_partner_locally_created</field>148 <field name="method">us_2075_partner_locally_created</field>
148 </record>149 </record>
150=======
151
152 <record id="us_1721_dates_on_products" model="patch.scripts">
153 <field name="method">us_1721_dates_on_products</field>
154 </record>
155>>>>>>> MERGE-SOURCE
149 </data>156 </data>
150</openerp>157</openerp>
151158
=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py 2016-12-06 16:47:10 +0000
+++ bin/addons/msf_profile/msf_profile.py 2017-01-18 15:49:53 +0000
@@ -1072,6 +1072,13 @@
1072 smrl_obj.write(cr, uid, smrl.id, {'product_state': smrl.product_id.state.code}, context=context)1072 smrl_obj.write(cr, uid, smrl.id, {'product_state': smrl.product_id.state.code}, context=context)
1073 return True1073 return True
10741074
1075 def us_1721_dates_on_products(self, cr, uid, *a, **b):
1076 """
1077 Fill the uf_create_date and uf_write_date for existing products
1078 """
1079 cr.execute("""UPDATE product_product SET uf_write_date = write_date, uf_create_date = create_date""")
1080 return True
1081
10751082
1076patch_scripts()1083patch_scripts()
10771084

Subscribers

People subscribed via source and target branches

to all changes: