-
- W
- W
-
-
diff --git a/addons/note/static/src/css/note.css b/addons/note/static/src/css/note.css
index 43bc455e04a..1b7e9315e74 100644
--- a/addons/note/static/src/css/note.css
+++ b/addons/note/static/src/css/note.css
@@ -46,7 +46,7 @@
.openerp .oe_kanban_record .oe_kanban_card_fancy {
text-shadow: none;
border-radius: 2px;
- padding: 12px;
+ padding: 8px;
margin-left: 3px;
margin-right: 3px;
padding-bottom: 16px;
diff --git a/addons/note/static/src/css/note.sass b/addons/note/static/src/css/note.sass
index ff39ce8708c..b5bc28a2593 100644
--- a/addons/note/static/src/css/note.sass
+++ b/addons/note/static/src/css/note.sass
@@ -50,7 +50,7 @@
.oe_kanban_card_fancy
text-shadow: none
border-radius: 2px
- padding: 12px
+ padding: 8px
margin-left: 3px
margin-right: 3px
padding-bottom: 16px
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 360f88b715b..d7d6d3181f1 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -465,7 +465,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal
var product_list = this.pos.get('product_list');
var product = this.get_product();
- var taxes_ids = product.taxes_id;
+ var taxes_ids = product.get('taxes_id');;
var taxes = self.pos.get('taxes');
var taxtotal = 0;
_.each(taxes_ids, function(el) {
diff --git a/addons/point_of_sale/static/src/js/widgets.js b/addons/point_of_sale/static/src/js/widgets.js
index 28ab79c65b2..ed9b1fd060a 100644
--- a/addons/point_of_sale/static/src/js/widgets.js
+++ b/addons/point_of_sale/static/src/js/widgets.js
@@ -202,12 +202,8 @@ function openerp_pos_widgets(instance, module){ //module is instance.point_of_sa
this.currentOrderLines.bind('remove', this.renderElement, this);
},
update_numpad: function() {
- var reset = false;
- if (this.selected_line !== this.pos.get('selectedOrder').getSelectedLine()) {
- reset = true;
- }
this.selected_line = this.pos.get('selectedOrder').getSelectedLine();
- if (reset && this.numpadState)
+ if (this.numpadState)
this.numpadState.reset();
},
renderElement: function() {
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 1c8ac5934fc..0c96bf1e689 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -197,6 +197,12 @@ class procurement_order(osv.osv):
'location_id': orderpoint.location_id.id,
'procure_method': 'make_to_order',
'origin': orderpoint.name}
+
+ def _product_virtual_get(self, cr, uid, order_point):
+ location_obj = self.pool.get('stock.location')
+ return location_obj._product_virtual_get(cr, uid,
+ order_point.location_id.id, [order_point.product_id.id],
+ {'uom': order_point.product_uom.id})[order_point.product_id.id]
def _procure_orderpoint_confirm(self, cr, uid, automatic=False,\
use_new_cursor=False, context=None, user_id=False):
@@ -217,7 +223,7 @@ class procurement_order(osv.osv):
if use_new_cursor:
cr = pooler.get_db(use_new_cursor).cursor()
orderpoint_obj = self.pool.get('stock.warehouse.orderpoint')
- location_obj = self.pool.get('stock.location')
+
procurement_obj = self.pool.get('procurement.order')
wf_service = netsvc.LocalService("workflow")
offset = 0
@@ -227,14 +233,9 @@ class procurement_order(osv.osv):
while ids:
ids = orderpoint_obj.search(cr, uid, [], offset=offset, limit=100)
for op in orderpoint_obj.browse(cr, uid, ids, context=context):
- if op.procurement_id.state != 'exception':
- if op.procurement_id and hasattr(op.procurement_id, 'purchase_id'):
- if op.procurement_id.purchase_id.state in ('draft', 'confirmed'):
- continue
- prods = location_obj._product_virtual_get(cr, uid,
- op.location_id.id, [op.product_id.id],
- {'uom': op.product_uom.id})[op.product_id.id]
-
+ prods = self._product_virtual_get(cr, uid, op)
+ if prods is None:
+ continue
if prods < op.product_min_qty:
qty = max(op.product_min_qty, op.product_max_qty)-prods
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index 14477d2401a..fead62f8521 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -96,7 +96,6 @@
consu
-
4.0
17" LCD Monitor
Processor AMD 8-Core
512MB RAM
@@ -113,7 +112,6 @@ HDD SH-1
-
4.0
19" LCD Monitor
Processor Core i5 2.70 Ghz
2GB RAM
@@ -129,7 +127,6 @@ HDD SH-1
consu
-
7.0
Custom computer assembled on order based on customer's requirement.
diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py
index eb05cdfa848..441f8859dc6 100644
--- a/addons/project_gtd/__openerp__.py
+++ b/addons/project_gtd/__openerp__.py
@@ -24,7 +24,7 @@
'name': 'Todo Lists',
'version': '1.0',
'category': 'Project Management',
- 'sequence': 20,
+ 'sequence': 9,
'summary': 'Personal Tasks, Contexts, Timeboxes',
'description': """
Implement concepts of the "Getting Things Done" methodology
diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py
index f35ca0251d3..b2e9197cefd 100644
--- a/addons/project_issue/__openerp__.py
+++ b/addons/project_issue/__openerp__.py
@@ -24,7 +24,7 @@
'name': 'Issue Tracker',
'version': '1.0',
'category': 'Project Management',
- 'sequence': 22,
+ 'sequence': 9,
'summary': 'Support, Bug Tracker, Helpdesk',
'description': """
Track Issues/Bugs Management for Projects
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 53e70dd4fb7..7d17364f369 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -1105,6 +1105,12 @@ class procurement_order(osv.osv):
self.write(cr, uid, [procurement.id], {'state': 'running', 'purchase_id': res[procurement.id]})
self.purchase_order_create_note(cr, uid, ids, context=context)
return res
+
+ def _product_virtual_get(self, cr, uid, order_point):
+ procurement = order_point.procurement_id
+ if procurement and procurement.state != 'exception' and procurement.purchase_id and procurement.purchase_id.state in ('draft', 'confirmed'):
+ return None
+ return super(procurement_order, self)._product_virtual_get(cr, uid, order_point)
def purchase_order_create_note(self, cr, uid, ids, context=None):
for procurement in self.browse(cr, uid, ids, context=context):
diff --git a/addons/purchase/test/ui/duplicate_order.yml b/addons/purchase/test/ui/duplicate_order.yml
index ff7f7d906c5..d49cec22d73 100644
--- a/addons/purchase/test/ui/duplicate_order.yml
+++ b/addons/purchase/test/ui/duplicate_order.yml
@@ -4,5 +4,4 @@
I duplicate order.
-
!python {model: purchase.order}: |
- context.update({'active_id':ref('purchase_order_1')})
self.copy(cr, uid, ref('purchase_order_1'), context)
diff --git a/addons/sale_stock/report/sale_report_view.xml b/addons/sale_stock/report/sale_report_view.xml
index 99aefa7e66f..ae8b12ca168 100644
--- a/addons/sale_stock/report/sale_report_view.xml
+++ b/addons/sale_stock/report/sale_report_view.xml
@@ -5,7 +5,6 @@
sale.report.tree.sale.stock
sale.report
-
tree
diff --git a/addons/sale_stock/res_config_view.xml b/addons/sale_stock/res_config_view.xml
index aa15be1d090..ad3b91b2a30 100644
--- a/addons/sale_stock/res_config_view.xml
+++ b/addons/sale_stock/res_config_view.xml
@@ -5,7 +5,6 @@
sale settings
sale.config.settings
- form
diff --git a/addons/sale_stock/sale_stock_view.xml b/addons/sale_stock/sale_stock_view.xml
index b1da04e3d7c..4c38e198b60 100644
--- a/addons/sale_stock/sale_stock_view.xml
+++ b/addons/sale_stock/sale_stock_view.xml
@@ -18,7 +18,6 @@
sale.shop.sale.stock
sale.shop
- tree
@@ -32,7 +31,6 @@
sale.order.form.sale.stock
sale.order
- form
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 9610ef7dc1d..64a500b1cca 100644
--- a/addons/stock/i18n/zh_CN.po
+++ b/addons/stock/i18n/zh_CN.po
@@ -7,14 +7,14 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-06-20 09:34+0000\n"
-"Last-Translator: openerp-china.black-jack \n"
+"PO-Revision-Date: 2012-11-06 14:21+0000\n"
+"Last-Translator: Wei \"oldrev\" Li \n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-10-30 04:48+0000\n"
-"X-Generator: Launchpad (build 16206)\n"
+"X-Launchpad-Export-Date: 2012-11-07 04:38+0000\n"
+"X-Generator: Launchpad (build 16232)\n"
#. module: stock
#: field:product.product,track_outgoing:0
@@ -940,7 +940,7 @@ msgstr "如果您需要在成品库位生产请留空.如在固定地点生产
#. module: stock
#: view:res.partner:0
msgid "Inventory Properties"
-msgstr "盘点表属性"
+msgstr "库存属性"
#. module: stock
#: field:report.stock.move,day_diff:0
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 9fb0c9b68aa..606cb9247d5 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -2130,7 +2130,7 @@ class stock_move(osv.osv):
new_id = move_obj.copy(cr, uid, move.id, {
'location_id': move.location_dest_id.id,
'location_dest_id': loc.id,
- 'date_moved': time.strftime('%Y-%m-%d'),
+ 'date': time.strftime('%Y-%m-%d'),
'picking_id': pickid,
'state': 'waiting',
'company_id': company_id or res_obj._company_default_get(cr, uid, 'stock.company', context=context) ,