openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #01166
[Merge] lp:~openerp-dev/openobject-addons/ksa-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2
ksa(OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/ksa-addons2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons2.
Requested reviews:
OpenERP Core Team (openerp)
Related bugs:
#500931 No analytic entry is generated finishing one production order
https://bugs.launchpad.net/bugs/500931
#543979 product: check uos not necessary
https://bugs.launchpad.net/bugs/543979
#674551 "qunatity" in MRP
https://bugs.launchpad.net/bugs/674551
#674578 no pdf report "delivery order" in warehouse management
https://bugs.launchpad.net/bugs/674578
#675418 account moves with same account in debit and credit
https://bugs.launchpad.net/bugs/675418
#677437 Production : done moves should not be re-considered while completing production order
https://bugs.launchpad.net/bugs/677437
#680916 "Work center" spelling is inconsistent
https://bugs.launchpad.net/bugs/680916
#687360 Warehouse : change order of buttons in incoming and outgoingview
https://bugs.launchpad.net/bugs/687360
Task 1847 : Improvement
https://bugs.launchpad.net/openobject-addons/+bug/677437
https://bugs.launchpad.net/openobject-addons/+bug/680916
https://bugs.launchpad.net/openobject-addons/+bug/674578
https://bugs.launchpad.net/openobject-addons/+bug/687360
--
https://code.launchpad.net/~openerp-dev/openobject-addons/ksa-addons2/+merge/43331
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/ksa-addons2.
=== modified file 'delivery/delivery_view.xml'
--- delivery/delivery_view.xml 2010-11-24 16:58:40 +0000
+++ delivery/delivery_view.xml 2010-12-10 10:43:57 +0000
@@ -280,7 +280,7 @@
<field name="model">stock.picking</field>
<field name="inherit_id" ref="stock.view_picking_out_form"/>
<field name="arch" type="xml">
- <xpath expr="/form/notebook/page[@string='Products']/group/button[@name='action_process']" position="after">
+ <xpath expr="/form/notebook/page[@string='Products']/group/button[@string='Create Invoice']" position="after">
<button name="%(report_shipping)d" string="Delivery Order" states="done,assigned" type="action" icon="gtk-print"/>
</xpath>
</field>
=== modified file 'mrp/report/mrp_report_view.xml'
--- mrp/report/mrp_report_view.xml 2010-10-19 05:23:18 +0000
+++ mrp/report/mrp_report_view.xml 2010-12-10 10:43:57 +0000
@@ -7,7 +7,7 @@
<field name="model">report.workcenter.load</field>
<field name="type">tree</field>
<field name="arch" type="xml">
- <tree string="Work Centers load">
+ <tree string="Work Center Load">
<field name="name"/>
<field name="workcenter_id"/>
<field name="cycle"/>
@@ -21,7 +21,7 @@
<field name="model">report.workcenter.load</field>
<field name="type">graph</field>
<field name="arch" type="xml">
- <graph string="Work Center load" type="bar">
+ <graph string="Work Center Load" type="bar">
<field name="name"/>
<field name="cycle" operator="+"/>
<field name="hour" operator="+"/>
@@ -29,25 +29,25 @@
</graph>
</field>
</record>
-
+
<record id="view_workcenter_load_search" model="ir.ui.view">
<field name="name">report.workcenter.load.search</field>
<field name="model">report.workcenter.load</field>
<field name="type">search</field>
<field name="arch" type="xml">
- <search string="Work Center load">
+ <search string="Work Center Load">
<field name="name"/>
<field name="workcenter_id" widget="selection"/>
</search>
</field>
</record>
<record id="action_report_workcenter_load_tree" model="ir.actions.act_window">
- <field name="name">Work Center Loads</field>
+ <field name="name">Work Center Load</field>
<field name="res_model">report.workcenter.load</field>
<field name="view_type">form</field>
<field name="view_mode">graph,tree</field>
<field name="search_view_id" ref="view_workcenter_load_search"/>
- <field name="help">Work Center Loads gives you a projection of work center loads over a specified period. It is expressed in number of hours and machine related cycles.</field>
+ <field name="help">Work Center Load gives you a projection of work center loads over a specified period. It is expressed in number of hours and machine related cycles.</field>
</record>
<menuitem id="next_id_77" name="Reporting"
parent="base.menu_mrp_root" sequence="49"/>
=== modified file 'mrp/wizard/mrp_workcenter_load.py'
--- mrp/wizard/mrp_workcenter_load.py 2010-08-13 12:20:05 +0000
+++ mrp/wizard/mrp_workcenter_load.py 2010-12-10 10:43:57 +0000
@@ -23,7 +23,7 @@
class mrp_workcenter_load(osv.osv_memory):
_name = 'mrp.workcenter.load'
- _description = 'Workcenter Load'
+ _description = 'Work Center Load'
_columns = {
'time_unit': fields.selection([('day', 'Day by day'),('week', 'Per week'),('month', 'Per month')],'Type of period', required=True),
=== modified file 'procurement/procurement_view.xml'
--- procurement/procurement_view.xml 2010-12-10 10:25:54 +0000
+++ procurement/procurement_view.xml 2010-12-10 10:43:57 +0000
@@ -224,10 +224,15 @@
<field name="procurement_id" readonly="1"/>
<field name="active" />
</group>
+<<<<<<< TREE
<group col="4" colspan="4" groups="base.group_extended">
<separator string="Procurement Orders to Process" colspan="4" />
<field name="procurement_draft_ids" colspan="4" nolabel="1"/>
</group>
+=======
+ <separator string="Procurement Orders to Process" colspan="4" />
+ <field name="procurement_draft_ids" colspan="4" nolabel="1"/>
+>>>>>>> MERGE-SOURCE
</form>
</field>
</record>
=== modified file 'procurement/schedulers.py'
--- procurement/schedulers.py 2010-12-08 07:17:22 +0000
+++ procurement/schedulers.py 2010-12-10 10:43:57 +0000
@@ -240,24 +240,18 @@
continue
if op.product_id.type not in ('consu'):
# Check draft procurement related to this order point
- if op.procurement_draft_ids:
- procure_qty = {}
- #Compute list of draft procurement attached to Orderpoint
- for pro_data in op.procurement_draft_ids:
- procure_qty.update({pro_data.product_qty: pro_data.id })
- procure_list = procure_qty.keys()
- procure_list.sort()
- procure_list.reverse()
-
- to_generate = qty
- for proc in procure_list:
- if to_generate >= proc:
- wf_service.trg_validate(uid, 'procurement.order', procure_qty[proc], 'button_confirm', cr)
- procurement_obj.write(cr, uid, [procure_qty[proc]], {'origin': op.name}, context=context)
- to_generate -= proc
- if not to_generate:
- break
- qty = to_generate
+ pro_ids = map(lambda x:x.id, op.procurement_draft_ids or [])
+ cr.execute('select id, product_qty from procurement_order where id in %s order by product_qty desc', (tuple(pro_ids), ))
+ procure_datas = cr.dictfetchall()
+ to_generate = qty
+ for proc_data in procure_datas:
+ if to_generate >= proc_data['product_qty']:
+ wf_service.trg_validate(uid, 'procurement.order', proc_data['id'], 'button_confirm', cr)
+ procurement_obj.write(cr, uid, [proc_data['id']], {'origin': op.name}, context=context)
+ to_generate -= proc_data['product_qty']
+ if not to_generate:
+ break
+ qty = to_generate
if qty:
proc_id = procurement_obj.create(cr, uid, {
=== modified file 'stock/report/picking.rml'
--- stock/report/picking.rml 2010-11-16 06:20:22 +0000
+++ stock/report/picking.rml 2010-12-10 10:43:57 +0000
@@ -34,6 +34,10 @@
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
</blockTableStyle>
<blockTableStyle id="Content_Order_Reference_Table">
<blockAlignment value="LEFT"/>
@@ -51,6 +55,11 @@
<lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="3,0" stop="3,-1"/>
<lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="3,0" stop="3,0"/>
<lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="3,-1" stop="3,-1"/>
+ <lineStyle kind="LINEBEFORE" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+ <lineStyle kind="LINEAFTER" colorName="#e6e6e6" start="4,0" stop="4,-1"/>
+ <lineStyle kind="LINEABOVE" colorName="#e6e6e6" start="4,0" stop="4,0"/>
+ <lineStyle kind="LINEBELOW" colorName="#e6e6e6" start="4,-1" stop="4,-1"/>
+
</blockTableStyle>
<blockTableStyle id="Move_Line_Header">
<blockAlignment value="LEFT"/>
@@ -180,16 +189,21 @@
<blockTable colWidths="538.0" style="Table_Title_String">
<tr>
<td>
- <para style="terp_header">Packing List: [[ picking.name ]]</para>
+ <para style="terp_header">Delivery Order: [[ (picking.type == 'out' or removeParentNode('para')) and '' ]] [[ picking.name ]] </para>
+ <para style="terp_header">Reception: [[ (picking.type == 'in' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
+ <para style="terp_header">Picking List: [[ (picking.type == 'internal' or removeParentNode('para')) and '' ]] [[ picking.name ]]</para>
</td>
</tr>
</blockTable>
<para style="terp_default_5cm_Above_Space">
<font color="white"> </font>
</para>
- <blockTable colWidths="123.0,134.0,133.0,134.0" style="Header_Order_Reference_Tbl">
+ <blockTable colWidths="100.0,110.0,130.0,120.0,60.0" style="Header_Order_Reference_Tbl">
<tr>
<td>
+ <para style="terp_tblheader_General_Centre">Journal</para>
+ </td>
+ <td>
<para style="terp_tblheader_General_Centre">Order(Origin)</para>
</td>
<td>
@@ -199,13 +213,16 @@
<para style="terp_tblheader_General_Centre">Expected Shipping Date </para>
</td>
<td>
- <para style="terp_tblheader_General_Centre">weight</para>
+ <para style="terp_tblheader_General_Centre">Weight</para>
</td>
</tr>
</blockTable>
- <blockTable colWidths="123.0,134.0,133.0,134.0" style="Content_Order_Reference_Table">
+ <blockTable colWidths="100.0,110.0,130.0,120.0,60.0" style="Content_Order_Reference_Table">
<tr>
<td>
+ <para style="terp_default_Centre_8">[[ picking.stock_journal_id.name]]</para>
+ </td>
+ <td>
<para style="terp_default_Centre_8">[[ picking.origin or '']]</para>
</td>
<td>
=== modified file 'stock/stock.py'
--- stock/stock.py 2010-12-08 09:32:58 +0000
+++ stock/stock.py 2010-12-10 10:43:57 +0000
@@ -2031,6 +2031,7 @@
"""
partial_datas=''
picking_ids = []
+ move_ids = []
partial_obj=self.pool.get('stock.partial.picking')
partial_id=partial_obj.search(cr,uid,[])
if partial_id:
@@ -2046,6 +2047,10 @@
self.action_confirm(cr, uid, todo, context=context)
for move in self.browse(cr, uid, ids):
+ if move.state in ['done','cancel']:
+ continue
+ move_ids.append(move.id)
+
if move.picking_id:
picking_ids.append(move.picking_id.id)
if move.move_dest_id.id and (move.state != 'done'):
@@ -2062,10 +2067,11 @@
prodlot_id =partial_datas and partial_datas.get('move%s_prodlot_id'%(move.id), False)
if prodlot_id:
self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id})
- self.write(cr, uid, ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')})
- wf_service = netsvc.LocalService("workflow")
- for id in ids:
- wf_service.trg_trigger(uid, 'stock.move', id, cr)
+ if move_ids:
+ self.write(cr, uid, move_ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')})
+ wf_service = netsvc.LocalService("workflow")
+ for id in move_ids:
+ wf_service.trg_trigger(uid, 'stock.move', id, cr)
wf_service = netsvc.LocalService("workflow")
for pick_id in picking_ids:
=== modified file 'stock/stock_view.xml'
--- stock/stock_view.xml 2010-12-09 11:56:59 +0000
+++ stock/stock_view.xml 2010-12-10 10:43:57 +0000
@@ -940,8 +940,8 @@
<button name="action_assign" states="confirmed" string="Check Availability" type="object" groups="base.group_extended" icon="gtk-find"/>
<button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
<button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
+ <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" states="done" type="action" icon="terp-gtk-go-back-rtl"/>
- <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
</group>
</page>
<page string="Additional info" groups="base.group_extended,base.group_multi_company">
@@ -1161,9 +1161,9 @@
<button name="force_assign" states="confirmed" string="Force Availability" type="object" groups="base.group_extended" icon="gtk-jump-to"/>
<button name="action_process" states="assigned" string="Process" type="object" icon="gtk-go-forward"/>
<group colspan="1" states="done">
+ <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
+ </group>
<button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" type="action" icon="terp-gtk-go-back-rtl"/>
- </group>
- <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="gtk-execute"/>
</group>
</page>
<page string="Additional Info" groups="base.group_extended,base.group_multi_company">
