Unifield Server

Merge lp:~unifield-team/unifield-server/us-402-1056-842-1159 into lp:unifield-server

  1. us-402-1056-842-1159
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 3882
Proposed branch: lp:~unifield-team/unifield-server/us-402-1056-842-1159
Merge into: lp:unifield-server
Diff against target: 187 lines (+34/-17)
9 files modified
bin/addons/procurement_request/procurement_request_view.xml (+7/-0)
bin/addons/purchase_override/purchase_view.xml (+1/-1)
bin/addons/specific_rules/stock.py (+1/-1)
bin/addons/specific_rules/stock_view.xml (+4/-4)
bin/addons/stock/stock.py (+1/-1)
bin/addons/stock_forecast/wizard/stock_forecast.py (+15/-5)
bin/addons/stock_override/stock_view.xml (+2/-2)
bin/addons/tender_flow/report/purchase_report_view.xml (+2/-2)
bin/addons/tender_flow/tender_flow_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-402-1056-842-1159
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+300707@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/procurement_request/procurement_request_view.xml'
2--- bin/addons/procurement_request/procurement_request_view.xml 2016-05-31 08:51:54 +0000
3+++ bin/addons/procurement_request/procurement_request_view.xml 2016-07-21 08:20:41 +0000
4@@ -38,6 +38,13 @@
5 <field name="priority" eval="250" />
6 <field name="arch" type="xml">
7 <form string="Internal Request">
8+ <group colspan="6" attrs="{'invisible': [('state', '!=', 'validated')]}">
9+ <html>
10+ <p style="text-align:center; color: red; font-weight: bold; font-size: 1.2em;">
11+ WARNING: This document has already been validated, are you sure you wish to modify after validation?
12+ </p>
13+ </html>
14+ </group>
15 <group col="6" colspan="4" name="header">
16 <field name="name" />
17 <field name="date_order" attrs="{'readonly': [('state', 'not in', ['draft', 'validated'])]}" />
18
19=== modified file 'bin/addons/purchase_override/purchase_view.xml'
20--- bin/addons/purchase_override/purchase_view.xml 2016-04-18 13:09:03 +0000
21+++ bin/addons/purchase_override/purchase_view.xml 2016-07-21 08:20:41 +0000
22@@ -186,7 +186,7 @@
23 <field name="dest_partner_names" />
24 <field name="shipped_rate" widget="progressbar" />
25 <field name="invoiced_rate" widget="progressbar" />
26- <field name="amount_total" sum="Total amount" />
27+ <field name="amount_total" />
28 <field name="pricelist_id" string="Currency" />
29 <field name="state" />
30 </tree>
31
32=== modified file 'bin/addons/specific_rules/stock.py'
33--- bin/addons/specific_rules/stock.py 2016-04-25 10:27:20 +0000
34+++ bin/addons/specific_rules/stock.py 2016-07-21 08:20:41 +0000
35@@ -518,7 +518,7 @@
36 'date': fields.date(string='Creation date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
37 'reevaluation_line_ids': fields.one2many('stock.cost.reevaluation.line', 'reevaluation_id', string='Lines',
38 readonly=True, states={'draft': [('readonly', False)]}),
39- 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Confirmed'), ('done', 'Done'), ('cancel', 'Cancel')],
40+ 'state': fields.selection([('draft', 'Draft'), ('confirm', 'Validated'), ('done', 'Done'), ('cancel', 'Cancel')],
41 string='State', readonly=True, required=True),
42 'sublist_id': fields.many2one('product.list', string='List/Sublist', ondelete='set null'),
43 'nomen_manda_0': fields.many2one('product.nomenclature', 'Main Type', ondelete='set null'),
44
45=== modified file 'bin/addons/specific_rules/stock_view.xml'
46--- bin/addons/specific_rules/stock_view.xml 2016-02-05 09:13:42 +0000
47+++ bin/addons/specific_rules/stock_view.xml 2016-07-21 08:20:41 +0000
48@@ -70,8 +70,8 @@
49 <group colspan="4" col="6">
50 <field name="state" />
51 <button name="action_cancel_inventary" states="draft,confirm" string="Cancel Inventory" type="object" icon="gtk-cancel" />
52- <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply" />
53- <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to" />
54+ <button name="action_confirm" states="draft" string="Validate Inventory" type="object" icon="gtk-apply" />
55+ <button name="action_done" states="confirm" string="Confirm Inventory" type="object" icon="gtk-jump-to" />
56 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert" />
57 </group>
58 </form>
59@@ -169,8 +169,8 @@
60 <group colspan="4" col="6">
61 <field name="state" />
62 <button name="action_cancel" type="object" string="Cancel" icon="gtk-cancel" states="draft,confirm" />
63- <button name="action_confirm" type="object" string="Confirm" icon="gtk-apply" states="draft" />
64- <button name="action_done" type="object" string="Validate" icon="gtk-jump-to" states="confirm" />
65+ <button name="action_confirm" type="object" string="Validate" icon="gtk-apply" states="draft" />
66+ <button name="action_done" type="object" string="Confirm" icon="gtk-jump-to" states="confirm" />
67 <button name="action_cancel_draft" type="object" string="Set to Draft" icon="gtk-convert" states="cancel" />
68 </group>
69 </form>
70
71=== modified file 'bin/addons/stock/stock.py'
72--- bin/addons/stock/stock.py 2016-05-24 08:44:23 +0000
73+++ bin/addons/stock/stock.py 2016-07-21 08:20:41 +0000
74@@ -2789,7 +2789,7 @@
75 'date_done': fields.datetime('Date done'),
76 'inventory_line_id': fields.one2many('stock.inventory.line', 'inventory_id', 'Inventories', states={'done': [('readonly', True)]}),
77 'move_ids': fields.many2many('stock.move', 'stock_inventory_move_rel', 'inventory_id', 'move_id', 'Created Moves'),
78- 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Confirmed'),('cancel','Cancelled')), 'State', readonly=True, select=True),
79+ 'state': fields.selection( (('draft', 'Draft'), ('done', 'Done'), ('confirm','Validated'),('cancel','Cancelled')), 'State', readonly=True, select=True),
80 'company_id': fields.many2one('res.company', 'Company', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
81
82 }
83
84=== modified file 'bin/addons/stock_forecast/wizard/stock_forecast.py'
85--- bin/addons/stock_forecast/wizard/stock_forecast.py 2016-03-08 15:48:47 +0000
86+++ bin/addons/stock_forecast/wizard/stock_forecast.py 2016-07-21 08:20:41 +0000
87@@ -88,7 +88,7 @@
88 'first': lambda *a: 'z',
89 }
90
91- _order = 'date asc, first asc'
92+ _order = 'date asc, first asc, id asc'
93
94 stock_forecast_line()
95
96@@ -376,7 +376,8 @@
97 move_obj = self.pool.get('stock.move')
98 product_obj = self.pool.get('product.product')
99 uom_obj = self.pool.get('product.uom')
100-
101+ data_obj = self.pool.get('ir.model.data')
102+
103 # clear existing lines
104 line_ids = line_obj.search(cr, uid, [('wizard_id', 'in', ids)], context=context)
105 line_obj.unlink(cr, uid, line_ids, context=context)
106@@ -408,10 +409,19 @@
107 # qty of all products
108 c = context.copy()
109 # if you remove the coma after done, it will no longer work properly
110+ cross_docking_id = data_obj.get_object_reference(cr, uid, 'msf_cross_docking', 'stock_location_cross_docking')[1]
111+ location_ids = [cross_docking_id]
112+ if wizard.warehouse_id:
113+ location_ids.append(wizard.warehouse_id.lot_stock_id.id)
114+ else:
115+ wids = self.pool.get('stock.warehouse').search(cr, uid, [], context=context)
116+ for w in self.pool.get('stock.warehouse').browse(cr, uid, wids, context=context):
117+ location_ids.append(w.lot_stock_id.id)
118+
119 c.update({'states': ('done',),
120 'what': ('in', 'out'),
121 'to_date': time.strftime('%Y-%m-%d %H:%M:%S'),
122- 'warehouse': warehouse_id,
123+ 'location': location_ids,
124 'uom': product_uom_id})
125 qty = product_obj.get_product_available(cr, uid, product_list, context=c)
126 overall_qty = sum(qty.values())
127@@ -425,7 +435,7 @@
128 # SALE ORDERS - negative
129 # list all sale order lines corresponding to selected product
130 #so_list = so_obj.search(cr, uid, [()], context=context)
131- sol_list = sol_obj.search(cr, uid, [('state', 'in', ('procurement', 'progress', 'draft')),
132+ sol_list = sol_obj.search(cr, uid, [('state', 'in', ('procurement', 'progress', 'draft', 'sourced')),
133 ('product_id', '=', product.id)], order='date_planned', context=context)
134
135 for sol in sol_obj.browse(cr, uid, sol_list, context=context):
136@@ -440,7 +450,7 @@
137 'stock_situation': False,
138 'wizard_id': wizard.id,}
139 if sol.procurement_request:
140- values.update(doc='ISR')
141+ values.update(doc='IR')
142
143 line_to_create.append(values)
144
145
146=== modified file 'bin/addons/stock_override/stock_view.xml'
147--- bin/addons/stock_override/stock_view.xml 2016-05-24 08:44:23 +0000
148+++ bin/addons/stock_override/stock_view.xml 2016-07-21 08:20:41 +0000
149@@ -1154,8 +1154,8 @@
150 </group>
151 <group col="3" colspan="2">
152 <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
153- <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
154- <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
155+ <button name="action_confirm" states="draft" string="Validate Inventory" type="object" icon="gtk-apply"/>
156+ <button name="action_done" states="confirm" string="Confirm Inventory" type="object" icon="gtk-jump-to"/>
157 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
158 </group>
159 </form>
160
161=== modified file 'bin/addons/tender_flow/report/purchase_report_view.xml'
162--- bin/addons/tender_flow/report/purchase_report_view.xml 2013-09-03 08:10:46 +0000
163+++ bin/addons/tender_flow/report/purchase_report_view.xml 2016-07-21 08:20:41 +0000
164@@ -26,8 +26,8 @@
165 <field name="nbr" sum="# of Lines"/>
166 <field name="quantity" />
167 <field name="product_uom" />
168- <field name="price_average" sum="Average Price" invisible="1" />
169- <field name="price_total" sum="Subtotal" string="Subtotal"/>
170+ <field name="price_average" invisible="1" />
171+ <field name="price_total" string="Subtotal"/>
172 <field name="currency_id" />
173 <!-- <field name="price_standard" sum="Products Value" invisible="0"/>
174 <field name="negociation" widget="progressbar"/> -->
175
176=== modified file 'bin/addons/tender_flow/tender_flow_view.xml'
177--- bin/addons/tender_flow/tender_flow_view.xml 2016-03-04 10:44:48 +0000
178+++ bin/addons/tender_flow/tender_flow_view.xml 2016-07-21 08:20:41 +0000
179@@ -400,7 +400,7 @@
180 <field name="partner_id" />
181 <field name="delivery_requested_date" />
182 <field name="origin" />
183- <field name="amount_total" sum="Total amount" />
184+ <field name="amount_total" />
185 <field name="state" />
186 </tree>
187 </field>

Subscribers

People subscribed via source and target branches

to all changes: