From 953e7dc67d047be05e71300ddf4f16ba28c4b351 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 15:26:09 +0200
Subject: [PATCH 1/4] [IMP] stock views
bzr revid: nel@tinyerp.com-20100616132609-abqesd6tm8axcokx
---
addons/purchase/security/ir.model.access.csv | 2 +
addons/stock/stock_view.xml | 51 +++++++++++++++-----
addons/stock/wizard/stock_move_view.xml | 4 +-
addons/stock/wizard/stock_splitinto.py | 8 +--
4 files changed, 48 insertions(+), 17 deletions(-)
diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv
index c6a09d5d728..d1ccce7b15f 100644
--- a/addons/purchase/security/ir.model.access.csv
+++ b/addons/purchase/security/ir.model.access.csv
@@ -24,3 +24,5 @@
"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","purchase.group_purchase_user",1,1,1,0
+"access_account_journal_manager","account.journal","account.model_account_journal","purchase.group_purchase_manager",1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 3fdfda9e057..bf07fe15058 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -631,15 +631,18 @@
+ groups="base.group_extended"
+ type="action" icon="terp-stock_effects-object-colorize"
+ states="draft,waiting,confirmed,assigned" />
@@ -677,9 +680,11 @@
-
+
@@ -792,9 +797,11 @@
@@ -837,9 +844,12 @@
-
+
@@ -993,9 +1003,11 @@
@@ -1027,9 +1039,12 @@
on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id)"/>
-
+
@@ -1178,13 +1193,16 @@
@@ -1216,7 +1234,9 @@
-
+
@@ -1371,11 +1391,12 @@
groups="base.group_extended"/>
@@ -1435,9 +1456,12 @@
-
+
-
@@ -1530,10 +1554,12 @@
groups="base.group_extended"/>
@@ -1582,10 +1608,13 @@
-
+
diff --git a/addons/stock/wizard/stock_move_view.xml b/addons/stock/wizard/stock_move_view.xml
index 05c35d5a830..71626e7d161 100644
--- a/addons/stock/wizard/stock_move_view.xml
+++ b/addons/stock/wizard/stock_move_view.xml
@@ -120,7 +120,7 @@
-
+
@@ -132,7 +132,7 @@
-
+
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index dcc97d6379d..ff4cd588c47 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -57,15 +57,15 @@ class stock_split_into(osv.osv_memory):
value_to_split = self.browse(cr, uid, data[0], context)
quantity = value_to_split.quantity or 0.0
ir_sequence_obj = self.pool.get('ir.sequence')
- prodlot_obj = self.pool.get('stock.production.lot')
+ track_obj = self.pool.get('stock.tracking')
for move in move_obj.browse(cr, uid, rec_id):
move_qty = move.product_qty
uos_qty_rest = move.product_uos_qty
quantity_rest = move_qty - quantity
if quantity_rest == 0:
continue
- sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.serial')
- prodlot_id = prodlot_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
+ sequence = ir_sequence_obj.get(cr, uid, 'stock.lot.tracking')
+ tracking_id = track_obj.create(cr, uid, {'name': sequence}, {'product_id': move.product_id.id})
uos_qty = quantity / move_qty * move.product_uos_qty
uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
default_val = {
@@ -76,7 +76,7 @@ class stock_split_into(osv.osv_memory):
current_move = move_obj.copy(cr, uid, move.id, default_val)
new_move.append(current_move)
update_val['product_qty'] = quantity_rest
- update_val['prodlot_id'] = prodlot_id
+ update_val['tracking_id'] = tracking_id
update_val['product_uos_qty'] = uos_qty_rest
move_obj.write(cr, uid, [move.id], update_val)
return {}
From a0606d8a036b975de45a9ce17b2e36f58ebe87dc Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 15:39:24 +0200
Subject: [PATCH 2/4] [IMP] set group user to sales menu
bzr revid: nel@tinyerp.com-20100616133924-j705xw200wlcvm9j
---
addons/sale/sale_view.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 0d28969c816..5e73d76056f 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -1,6 +1,7 @@
+
From eae27319ebc94021447519247765e2ec6b3de694 Mon Sep 17 00:00:00 2001
From: "nel@tinyerp.com" <>
Date: Wed, 16 Jun 2010 22:02:39 +0200
Subject: [PATCH 3/4] [IMP] stock: rules and view
bzr revid: nel@tinyerp.com-20100616200239-kznn7jkpgxggiprj
---
addons/stock/security/ir.model.access.csv | 4 +++-
addons/stock/stock_view.xml | 22 +++++++++-------------
addons/stock/wizard/stock_splitinto.py | 4 ++--
3 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv
index f7bbc7ea3b9..7ecb0b833e9 100644
--- a/addons/stock/security/ir.model.access.csv
+++ b/addons/stock/security/ir.model.access.csv
@@ -50,4 +50,6 @@
"access_stock_replacement_result","stock.replacement.result","model_stock_replacement_result","stock.group_stock_user",1,1,1,1
"access_stock_ups","stock.ups","model_stock_ups","stock.group_stock_user",1,1,1,1
"access_stock_ups_final","stock.ups.final","model_stock_ups_final","stock.group_stock_user",1,1,1,1
-"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
\ No newline at end of file
+"access_stock_ups_upload","stock.ups.upload","model_stock_ups_upload","stock.group_stock_user",1,1,1,1
+"access_stock_split_into","stock.split.into","model_stock_split_into","stock.group_stock_user",1,1,1,0
+"access_stock_split_into_manager","stock.split.into","model_stock_split_into","stock.group_stock_manager",1,1,1,1
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index bf07fe15058..d824cefe2c7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1192,8 +1192,8 @@
@@ -1385,8 +1385,8 @@
icon="gtk-convert" context="{'scrap': True}"
states="draft,waiting,confirmed,assigned" />
-
@@ -1595,27 +1595,23 @@
-
+
-
-
-
+
+
-
-
-
diff --git a/addons/stock/wizard/stock_splitinto.py b/addons/stock/wizard/stock_splitinto.py
index ff4cd588c47..d0f46e45658 100644
--- a/addons/stock/wizard/stock_splitinto.py
+++ b/addons/stock/wizard/stock_splitinto.py
@@ -69,13 +69,13 @@ class stock_split_into(osv.osv_memory):
uos_qty = quantity / move_qty * move.product_uos_qty
uos_qty_rest = quantity_rest / move_qty * move.product_uos_qty
default_val = {
- 'product_qty': quantity,
+ 'product_qty': quantity_rest,
'product_uos_qty': uos_qty,
'state': move.state
}
current_move = move_obj.copy(cr, uid, move.id, default_val)
new_move.append(current_move)
- update_val['product_qty'] = quantity_rest
+ update_val['product_qty'] = quantity
update_val['tracking_id'] = tracking_id
update_val['product_uos_qty'] = uos_qty_rest
move_obj.write(cr, uid, [move.id], update_val)
From d2d3ab1a6d0c0efc876e7d449f5db08ea9a9fe67 Mon Sep 17 00:00:00 2001
From: Launchpad Code Hosting
Date: Thu, 17 Jun 2010 04:33:45 +0100
Subject: [PATCH 4/4] Launchpad automatic translations update.
bzr revid: codehost@crowberry-20100617033345-dxafwr55ev6k3x9j
---
addons/account/i18n/it.po | 2 +-
addons/base_module_quality/i18n/it.po | 2 +-
addons/board/i18n/nl_BE.po | 2 +-
addons/google_map/i18n/ru.po | 2 +-
addons/mrp_operations/i18n/hi.po | 2 +-
addons/mrp_repair/i18n/hi.po | 2 +-
addons/multi_company/i18n/it.po | 2 +-
addons/product/i18n/vi.po | 2 +-
addons/stock/i18n/nl.po | 2 +-
addons/stock/i18n/pl.po | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po
index 499700a8777..d2a543a0a3e 100644
--- a/addons/account/i18n/it.po
+++ b/addons/account/i18n/it.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account
diff --git a/addons/base_module_quality/i18n/it.po b/addons/base_module_quality/i18n/it.po
index 565dd1e0f4d..3c18c0ec32e 100644
--- a/addons/base_module_quality/i18n/it.po
+++ b/addons/base_module_quality/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/board/i18n/nl_BE.po b/addons/board/i18n/nl_BE.po
index 2754b34b4bd..b36d1a918a6 100644
--- a/addons/board/i18n/nl_BE.po
+++ b/addons/board/i18n/nl_BE.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
diff --git a/addons/google_map/i18n/ru.po b/addons/google_map/i18n/ru.po
index c4f6acceef1..04619e44885 100644
--- a/addons/google_map/i18n/ru.po
+++ b/addons/google_map/i18n/ru.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: google_map
diff --git a/addons/mrp_operations/i18n/hi.po b/addons/mrp_operations/i18n/hi.po
index fa9b4ac9ef8..657860cae37 100644
--- a/addons/mrp_operations/i18n/hi.po
+++ b/addons/mrp_operations/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_operations
diff --git a/addons/mrp_repair/i18n/hi.po b/addons/mrp_repair/i18n/hi.po
index 902b7bbf5bd..6136b1e992a 100644
--- a/addons/mrp_repair/i18n/hi.po
+++ b/addons/mrp_repair/i18n/hi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_repair
diff --git a/addons/multi_company/i18n/it.po b/addons/multi_company/i18n/it.po
index aa820150b5a..1899d197277 100644
--- a/addons/multi_company/i18n/it.po
+++ b/addons/multi_company/i18n/it.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: multi_company
diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po
index 35d5e643150..93bb2e12631 100644
--- a/addons/product/i18n/vi.po
+++ b/addons/product/i18n/vi.po
@@ -14,7 +14,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po
index 25a0c9e5358..bc826ef796d 100644
--- a/addons/stock/i18n/nl.po
+++ b/addons/stock/i18n/nl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index aade911d099..95d22fcaa6c 100644
--- a/addons/stock/i18n/pl.po
+++ b/addons/stock/i18n/pl.po
@@ -13,7 +13,7 @@ msgstr ""
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-06-16 03:49+0000\n"
+"X-Launchpad-Export-Date: 2010-06-17 03:33+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock