From 852979228b05818f1822dd28694e9cfbd3fe65e1 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 12 Oct 2010 09:08:22 +0200 Subject: [PATCH 1/6] fix bzr revid: fp@tinyerp.com-20101012070822-i14gascmf97noos4 --- addons/procurement/schedulers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 88dbafc3c62..94fad9f68b0 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -25,6 +25,7 @@ from mx import DateTime from osv import osv import netsvc import pooler +from tools.translate import _ class procurement_order(osv.osv): _inherit = 'procurement.order' From c49dadba38e7c46cd754cb9dce93a63150d38443 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 12 Oct 2010 10:47:48 +0200 Subject: [PATCH 2/6] [FIX] missing import in procurement.schedulers bzr revid: xmo@openerp.com-20101012084748-thncj5nmcjpjbh05 --- addons/procurement/schedulers.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py index 88dbafc3c62..831e07b726f 100644 --- a/addons/procurement/schedulers.py +++ b/addons/procurement/schedulers.py @@ -23,6 +23,7 @@ import time from mx import DateTime from osv import osv +from tools.translate import _ import netsvc import pooler From da1523806ea301ebd613e6f449d6a2669951b280 Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 12 Oct 2010 11:17:52 +0200 Subject: [PATCH 3/6] [FIX] delivery: finish removal of Delivery Picking form, replaced by Outgoing Order with dedicated journal bzr revid: odo@openerp.com-20101012091752-69thk0p0j0zw4nfx --- addons/delivery/delivery_view.xml | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 91513709e03..5cdaedfd08a 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -175,22 +175,6 @@ - - delivery.stock.picking_withcarrier.delivery.form.view - form - stock.picking - - - - - - - - - - - - Picking to be invoiced stock.picking @@ -242,19 +226,6 @@ - - delivery.stock.picking_withcarrier.delivery.move.form.view - form - stock.picking - - - - - - - - - stock.move.form.weight form From bac3fe249ac6afd4ec657218aea610f6a37ef260 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 12 Oct 2010 11:37:45 +0200 Subject: [PATCH 4/6] merg bzr revid: fp@tinyerp.com-20101012093745-kpfyjls7h8ftczjm --- addons/purchase/security/ir.model.access.csv | 5 +++-- addons/stock/wizard/stock_splitinto.py | 22 ++++++++++---------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index 86784a34351..77a0aff7bb4 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -31,8 +31,9 @@ "access_account_sequence_fiscalyear_purchase_user","account.sequence.fiscalyear purchase","account.model_account_sequence_fiscalyear","group_purchase_user",1,1,1,1 "access_res_partner_purchase_user","res.partner purchase","base.model_res_partner","group_purchase_user",1,0,0,0 "access_res_partner_address_purchase_user","res.partner.address purchase","base.model_res_partner_address","group_purchase_user",1,0,0,0 -"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,1,1,0 -"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,1,1,1 +"access_account_journal_period","account.journal.period","account.model_account_journal_period","group_purchase_user",1,1,1,0 +"access_account_journal","account.journal","account.model_account_journal","group_purchase_user",1,0,0,0 +"access_account_journal_manager","account.journal","account.model_account_journal","group_purchase_manager",1,0,0,0 "access_account_period","account.period","account.model_account_period","group_purchase_user",1,0,0,0 "access_account_fiscalyear","account.fiscalyear","account.model_account_fiscalyear","group_purchase_user",1,0,0,0 "access_account_move","account.move","account.model_account_move","group_purchase_user",1,1,1,1 diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py index a54e6a485c2..c514c9714eb 100644 --- a/addons/stock/wizard/stock_splitinto.py +++ b/addons/stock/wizard/stock_splitinto.py @@ -41,14 +41,14 @@ class stock_split_into(osv.osv_memory): quantity = self.browse(cr, uid, data[0], context).quantity or 0.0 for move in move_obj.browse(cr, uid, rec_id): quantity_rest = move.product_qty - quantity - if move.tracking_id : - raise osv.except_osv(_('Error!'), _('The current move line is already assigned to a pack, please remove it first if you really want to change it ' \ - 'for this product: "%s" (id: %d)') % \ - (move.product_id.name, move.product_id.id,)) + #if move.tracking_id : + # raise osv.except_osv(_('Error!'), _('The current move line is already assigned to a pack, please remove it first if you really want to change it ' \ + # 'for this product: "%s" (id: %d)') % \ + # (move.product_id.name, move.product_id.id,)) if quantity > move.product_qty: raise osv.except_osv(_('Error!'), _('Total quantity after split exceeds the quantity to split ' \ 'for this product: "%s" (id: %d)') % \ - (move.product_id.name, move.product_id.id,)) + (move.product_id.name, move.product_id.id,)) if quantity > 0: move_obj.setlast_tracking(cr, uid, [move.id], context=context) move_obj.write(cr, uid, [move.id], { @@ -63,12 +63,12 @@ class stock_split_into(osv.osv_memory): move_obj.write(cr, uid, [move.id], {'tracking_id': tracking_id}) else: default_val = { - 'product_qty': quantity_rest, - 'product_uos_qty': quantity_rest, - 'tracking_id': tracking_id, - 'state': move.state, - 'product_uos': move.product_uom.id - } + 'product_qty': quantity_rest, + 'product_uos_qty': quantity_rest, + 'tracking_id': tracking_id, + 'state': move.state, + 'product_uos': move.product_uom.id + } move_obj.copy(cr, uid, move.id, default_val) return {} stock_split_into() From 53ae3b4d103b6c24acafd0a0e865dbc8821f8f7a Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Tue, 12 Oct 2010 11:38:55 +0200 Subject: [PATCH 5/6] [FIX] delivery: removed incorrect reference to date_planned field of stock.move bzr revid: odo@openerp.com-20101012093855-t9zg66lu06al09f3 --- addons/delivery/test/delivery_report.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/delivery/test/delivery_report.yml b/addons/delivery/test/delivery_report.yml index a88b6bd1942..53b06a9d36a 100644 --- a/addons/delivery/test/delivery_report.yml +++ b/addons/delivery/test/delivery_report.yml @@ -12,7 +12,6 @@ invoice_state: none move_lines: - company_id: base.main_company - date_planned: '2010-05-11 15:18:57' location_dest_id: stock.stock_location_customers location_id: stock.stock_location_stock name: HP CD writers From 499793ae415ffd183fcec068b93362428e74d498 Mon Sep 17 00:00:00 2001 From: "Jay (OpenERP)" Date: Tue, 12 Oct 2010 16:14:08 +0530 Subject: [PATCH 6/6] [FIX] Delivery : context corrected for SO view bzr revid: jvo@tinyerp.com-20101012104408-1p69jj12v8itbpd9 --- addons/delivery/delivery_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml index 5cdaedfd08a..3d03235d872 100644 --- a/addons/delivery/delivery_view.xml +++ b/addons/delivery/delivery_view.xml @@ -258,7 +258,7 @@ -