diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py
index 1ee414e6b74..ca37e254d7b 100644
--- a/addons/account/account_move_line.py
+++ b/addons/account/account_move_line.py
@@ -488,6 +488,11 @@ class account_move_line(osv.osv):
return r_id
def view_header_get(self, cr, user, view_id, view_type, context):
+ if context.get('account_id', False):
+ cr.execute('select code from account_account where id=%d', (context['account_id'],))
+ res = cr.fetchone()
+ res = _('Entries: ')+ (res[0] or '')
+ return res
if (not context.get('journal_id', False)) or (not context.get('period_id', False)):
return False
cr.execute('select code from account_journal where id=%d', (context['journal_id'],))
@@ -495,8 +500,8 @@ class account_move_line(osv.osv):
cr.execute('select code from account_period where id=%d', (context['period_id'],))
p = cr.fetchone()[0] or ''
if j or p:
- return j+':'+p
- return 'Journal'
+ return j+(p and (':'+p) or '')
+ return False
def fields_view_get(self, cr, uid, view_id=None, view_type='form', context={}, toolbar=False):
result = super(osv.osv, self).fields_view_get(cr, uid, view_id,view_type,context)
@@ -709,7 +714,6 @@ class account_move_line(osv.osv):
tax_id=tax_obj.browse(cr,uid,vals['account_tax_id'])
total = vals['credit'] or (-vals['debit'])
for tax in tax_obj.compute(cr,uid,[tax_id],total,1.00):
- print 'Processing Tax', tax
self.write(cr, uid,[result], {
'tax_code_id': tax['base_code_id'],
'tax_amount': tax['base_sign'] * total
@@ -729,7 +733,6 @@ class account_move_line(osv.osv):
'credit': tax['amount']>0 and tax['amount'] or 0.0,
'debit': tax['amount']<0 and -tax['amount'] or 0.0,
}
- print data
self.create(cr, uid, data, context)
if check:
self.pool.get('account.move').validate(cr, uid, [vals['move_id']], context)
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 8b66b7b62b8..b3e5b24960e 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -887,7 +887,7 @@
-
+
@@ -1318,17 +1318,18 @@
- Move line select
+ Entries
account.move.line
form
tree,form
[('account_id','child_of', [active_id]),('state','<>','draft')]
+ {'account_id':active_id}
- Open all entries lines
+ Account Entries
@@ -1513,14 +1514,14 @@
-
+
account.chart.template.form
account.chart.template
form
-
- Account Chart Templates
+ Chart of Accounts Templates
account.chart.template
form
tree,form
@@ -1597,7 +1598,7 @@
wizard.account.chart.duplicate
form
-
- Duplicate Account Chart
+ Duplicate Chart of Accounts
ir.actions.act_window
wizard.account.chart.duplicate
form
diff --git a/addons/account/partner_view.xml b/addons/account/partner_view.xml
index ccc93735a59..8e523c5bc4d 100644
--- a/addons/account/partner_view.xml
+++ b/addons/account/partner_view.xml
@@ -5,20 +5,6 @@
Partners Extension
-->
-
- res.partner.form.inherit
- res.partner
- form
-
-
-
-
-
-
-
-
-
-
res.partner.property.form.inherit
res.partner
@@ -26,16 +12,56 @@
2
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/account/product_view.xml b/addons/account/product_view.xml
index 1512b202f2f..3ca95e625b8 100644
--- a/addons/account/product_view.xml
+++ b/addons/account/product_view.xml
@@ -50,10 +50,13 @@
form
-
-
-
-
+
diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml
index 27ba38f3f88..d8f6d8af516 100644
--- a/addons/account/project/project_view.xml
+++ b/addons/account/project/project_view.xml
@@ -78,7 +78,7 @@
- Analytic Charts of Accounts
+ Analytic Chart of Accounts
ir.actions.act_window
account.analytic.account
[('parent_id','=',False)]
diff --git a/addons/account/wizard/wizard_move_line_select.py b/addons/account/wizard/wizard_move_line_select.py
index 86c677ffb6a..10c69f81468 100644
--- a/addons/account/wizard/wizard_move_line_select.py
+++ b/addons/account/wizard/wizard_move_line_select.py
@@ -52,7 +52,10 @@ class wizard_move_line_select(wizard.interface):
result = mod_obj._get_id(cr, uid, 'account', 'action_move_line_tree1')
id = mod_obj.read(cr, uid, [result], ['res_id'])[0]['res_id']
result = act_obj.read(cr, uid, [id])[0]
- result['context'] = str({'fiscalyear': context.get('fiscalyear', False)})
+ result['context'] = {
+ 'fiscalyear': context.get('fiscalyear', False),
+ 'account_id': data['id']
+ }
result['domain']=result['domain'][0:-1]+','+domain+result['domain'][-1]
return result
diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 4aaced6c4f6..d643f44feb7 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -124,10 +124,9 @@
sale.order
-
+
-
-
+
@@ -195,4 +194,4 @@
-
\ No newline at end of file
+
diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml
index fdfe3ba3e4e..16ac3e910cc 100644
--- a/addons/membership/membership_view.xml
+++ b/addons/membership/membership_view.xml
@@ -318,7 +318,7 @@
res.partner
-
+
@@ -341,7 +341,7 @@
-
+
diff --git a/addons/product/partner_view.xml b/addons/product/partner_view.xml
index 68fc31d3640..c13194c47e6 100644
--- a/addons/product/partner_view.xml
+++ b/addons/product/partner_view.xml
@@ -7,9 +7,12 @@
form
-
-
-
+
+
+
+
+
+
diff --git a/addons/product/product.py b/addons/product/product.py
index 529936bec0b..a9bf05ad65c 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -328,6 +328,13 @@ class product_template(osv.osv):
product_template()
class product_product(osv.osv):
+ def view_header_get(self, cr, uid, view_id, view_type, context):
+ res = super(product_product, self).view_header_get(cr, uid, view_id, view_type, context)
+ if res: return res
+ if (not context.get('categ_id', False)):
+ return False
+ return _('Products: ')+self.pool.get('product.category').browse(cr, uid, context['categ_id'], context).name
+
def _product_price(self, cr, uid, ids, name, arg, context={}):
res = {}
quantity = context.get('quantity', 1)
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 61e00f64916..aed5604555e 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -46,64 +46,64 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
+
@@ -162,8 +162,7 @@
-
-
+
@@ -199,12 +198,13 @@
- product.normal.action.tree
+
ir.actions.act_window
product.product
form
tree,form
[('categ_id','child_of',[active_id])]
+ {'categ_id':active_id}
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 188ac119d79..cdab52d471f 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -7,9 +7,11 @@
form
-
-
-
+
+
+
+
+
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 35c46825008..688892ee02f 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -99,10 +99,10 @@ class purchase_order(osv.osv):
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'posted':[('readonly',True)]}),
'location_id': fields.many2one('stock.location', 'Delivery destination', required=True),
- 'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
+ 'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Confirmed'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'Order State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
- 'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order State', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
+ 'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)]}),
'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
'notes': fields.text('Notes'),
'invoice_id': fields.many2one('account.invoice', 'Invoice', readonly=True),
@@ -331,7 +331,7 @@ class purchase_order_line(osv.osv):
}
_table = 'purchase_order_line'
_name = 'purchase.order.line'
- _description = 'Purchase Order line'
+ _description = 'Purchase Order lines'
def copy(self, cr, uid, id, default=None,context={}):
if not default:
default = {}
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 57bdae954ec..5484b22ea8b 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -1,10 +1,6 @@
-
- Suppliers
-
-
@@ -13,23 +9,23 @@
form
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index e060ab15ca0..1eb0b03f75a 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -8,12 +8,14 @@
form
-
-
-
-
-
-
+
@@ -48,8 +50,8 @@
-
-
+
+
product.normal.stock.form.inherit
@@ -58,13 +60,13 @@
-
+
-
-
-
-
-
+
+
+
+
+
@@ -76,12 +78,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 224420d2e8d..dcf66f4a14a 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1136,6 +1136,8 @@ class product_product(osv.osv):
# Utiliser browse pour limiter les queries !
#
def view_header_get(self, cr, user, view_id, view_type, context):
+ res = super(product_product, self).view_header_get(cr, user, view_id, view_type, context)
+ if res: return res
if (not context.get('location', False)):
return False
cr.execute('select name from stock_location where id=%d', (context['location'],))
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f1d8550cd1d..256ee36b4e4 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -55,20 +55,19 @@
form
@@ -185,7 +184,6 @@
-
@@ -310,27 +308,27 @@
form
@@ -538,12 +536,12 @@
form