diff --git a/addons/account_analytic_analysis/account_analytic_analysis.py b/addons/account_analytic_analysis/account_analytic_analysis.py
index 953bd11c432..a4cdef0f03e 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis.py
+++ b/addons/account_analytic_analysis/account_analytic_analysis.py
@@ -83,7 +83,6 @@ class account_analytic_account(osv.osv):
JOIN hr_timesheet_invoice_factor \
on hr_timesheet_invoice_factor.id = account_analytic_account.to_invoice \
WHERE account_analytic_account.id IN (%s) \
- AND account_analytic_journal.type='general' \
AND account_analytic_line.invoice_id is null \
AND account_analytic_line.to_invoice IS NOT NULL \
GROUP BY account_analytic_account.id;"""%acc_set)
@@ -223,7 +222,6 @@ class account_analytic_account(osv.osv):
join hr_timesheet_invoice_factor hr \
on (hr.id=a.to_invoice) \
where account_analytic_line.account_id IN (%s) \
- and account_analytic_journal.type = 'general' \
and a.to_invoice IS NOT NULL \
GROUP BY account_analytic_line.account_id"""%acc_set)
for account_id, sum in cr.fetchall():
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 1be2c360027..ee198cb76bc 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -638,15 +638,7 @@
[('state','=','confirmed')]
-
- Exceptions procurements to fix
- ir.actions.act_window
- mrp.procurement
- form
- tree,form
- [('state','=','exception'), ('message', '<>', '')]
-
-
+
Exceptions procurements
ir.actions.act_window
@@ -657,6 +649,32 @@
+
+ Exceptions procurements to fix
+ ir.actions.act_window
+ mrp.procurement
+ form
+ tree,form
+ [('state','=','exception'), ('message', '<>', '')]
+
+
+
+
+ Temporary Procurement Exceptions
+ ir.actions.act_window
+ mrp.procurement
+ form
+ tree,form
+ [('state','=','exception'), ('message', '=', '')]
+
+
+
=============================
Order Point
=============================
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index d497503b508..ea80b32afd1 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -168,7 +168,7 @@ class sale_order(osv.osv):
'incoterm': fields.selection(_incoterm_get, 'Incoterm',size=3),
'picking_policy': fields.selection([('direct','Direct Delivery'),('one','All at once')], 'Packing Policy', required=True ),
'order_policy': fields.selection([
- ('prepaid','Invoice before delivery'),
+ ('prepaid','Payment before delivery'),
('manual','Shipping & Manual Invoice'),
('postpaid','Automatic Invoice after delivery'),
('picking','Invoice from the packings'),
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 626fab89a94..ae57bdb2a3d 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -475,8 +475,8 @@ class stock_picking(osv.osv):
if pick.move_type=='one' and pick.loc_move_id:
if pick.lot_id:
id = self.pool.get('stock.move.lot').create(cr, uid, {
- 'name': 'MOVE:'+pick.name,
- 'origin': 'PICK:'+str(pick.id),
+ 'name': pick.name,
+ 'origin': str(pick.origin or ''),
'lot_id': pick.lot_id.id,
'loc_dest_id': pick.loc_move_id.id,
'address_id': pick.address_id.id
@@ -502,8 +502,8 @@ class stock_picking(osv.osv):
if pick.move_type=='direct' and pick.loc_move_id:
id = self.pool.get('stock.move.lot').create(cr, uid, {
- 'name': 'MOVE:'+pick.name,
- 'origin': 'PICK:'+str(pick.id),
+ 'name': pick.name,
+ 'origin': str(pick.origin or ''),
'lot_id': lot_id,
'loc_dest_id': pick.loc_move_id.id,
'address_id': pick.address_id.id
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index d253fe069bc..3014359ad54 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -391,8 +391,9 @@
tree
child_ids
-
+
+
@@ -664,6 +665,7 @@
+
@@ -699,6 +701,7 @@
ir.actions.act_window
form
+ {'contact_display': 'partner'}
@@ -708,6 +711,7 @@
form
tree,form
[('state','=','draft')]
+ {'contact_display': 'partner'}