From e77abb81fe3af1bad710a199b5aeb4b684754518 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 Nov 2011 16:46:14 +0100 Subject: [PATCH 001/186] [IMP] Use babel's locale-aware date formatting when formatting dates in read_group titles bzr revid: xmo@openerp.com-20111110154614-ok0i1w11xvace41y --- openerp/osv/orm.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index a89074d322d..a93f4f4a620 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -54,6 +54,8 @@ import time import traceback import types import warnings + +import babel.dates from lxml import etree import fields @@ -2471,7 +2473,9 @@ class BaseModel(object): dt = datetime.datetime.strptime(alldata[d['id']][groupby][:7], '%Y-%m') days = calendar.monthrange(dt.year, dt.month)[1] - d[groupby] = datetime.datetime.strptime(d[groupby][:10], '%Y-%m-%d').strftime('%B %Y') + date_value = datetime.datetime.strptime(d[groupby][:10], '%Y-%m-%d') + d[groupby] = babel.dates.format_date( + date_value, format='MMMM yyyy', locale=context.get('lang', 'en_US')) d['__domain'] = [(groupby, '>=', alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-01', '%Y-%m-%d').strftime('%Y-%m-%d') or False),\ (groupby, '<=', alldata[d['id']][groupby] and datetime.datetime.strptime(alldata[d['id']][groupby][:7] + '-' + str(days), '%Y-%m-%d').strftime('%Y-%m-%d') or False)] + domain del alldata[d['id']][groupby] From 79b29e17c4966f0be4f6bc42397c156e6e2d7e49 Mon Sep 17 00:00:00 2001 From: "pankita shah (Open ERP)" Date: Wed, 25 Jul 2012 12:59:52 +0530 Subject: [PATCH 002/186] [FIX]remove ProgrammingError in event module bzr revid: shp@tinyerp.com-20120725072952-mcnyappum33w1smy --- addons/event/report/report_event_registration.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 17472e0cc95..59515f87a00 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -80,6 +80,7 @@ class report_event_registration(osv.osv): LEFT JOIN event_registration r ON (e.id=r.event_id) + where r.id is not null GROUP BY event_id, From 7096a336c084bab9f12aa1d13ae96e82cbf12d7d Mon Sep 17 00:00:00 2001 From: Date: Tue, 28 Aug 2012 16:22:02 +0200 Subject: [PATCH 003/186] [FIX] a default value (created using "Set Default" wizard) should never be shared between companies, but assigned on the user's company bzr revid: guewen.baconnier@camptocamp.com-20120828142202-9lwdicrdgc2spp6s --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index b64f34f3aaf..60e3d8361bc 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -1007,7 +1007,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM field_to_set, self.fields[field_to_set].get_value(), all_users, - false, + true, condition || false ]).then(function () { d.close(); }); }} From dad2475d9f68d8bafb0dcb633a7b05256a8ea0be Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Wed, 26 Sep 2012 12:01:47 +0530 Subject: [PATCH 004/186] [IMP]sale_crm:made Convert to Quotation button invisible if opportunity is closed(Won) bzr revid: ssu@tinyerp.com-20120926063147-l4nvifaehms9lugc --- addons/sale_crm/sale_crm_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index e54ba158b9b..efee3953788 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -9,8 +9,8 @@ - From 533ac5b6f3258fda737b2e9818302657faf87e8f Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 3 Oct 2012 14:34:31 +0530 Subject: [PATCH 068/186] [FIX]hr_expense: remove purchase_ok from return bzr revid: mma@tinyerp.com-20121003090431-ia11akxym2ax2nsy --- addons/hr_expense/hr_expense.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 91dc44fed61..c685eb3f95b 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -243,7 +243,7 @@ class product_product(osv.osv): data_obj = self.pool.get('ir.model.data') cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense') categ_id = data_obj.browse(cr, uid, cat_id).res_id - res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }} + res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy', 'sale_ok' :False,'categ_id':categ_id }} return res product_product() From 638982a0d29c429fac29b9c6e77d3722520dfb1a Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Wed, 3 Oct 2012 14:46:21 +0530 Subject: [PATCH 069/186] [IMP]sale:rename field name Several analytic accounts on sales into Use multiple analytic accounts on sales bzr revid: ssu@tinyerp.com-20121003091621-7ga3az5hlthor6ab --- addons/sale/res_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py index 843e1fd3343..50eaf7a394a 100644 --- a/addons/sale/res_config.py +++ b/addons/sale/res_config.py @@ -125,7 +125,7 @@ class sale_configuration(osv.osv_memory): class account_config_settings(osv.osv_memory): _inherit = 'account.config.settings' _columns = { - 'module_sale_analytic_plans': fields.boolean('Several analytic accounts on sales', + 'module_sale_analytic_plans': fields.boolean('Use multiple analytic accounts on sales', help="""This allows install module sale_analytic_plans."""), 'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales', implied_group='sale.group_analytic_accounting', From b993bf588fadac427a801d18e1aef46a3be6f52e Mon Sep 17 00:00:00 2001 From: Saurang Suthar Date: Wed, 3 Oct 2012 14:56:11 +0530 Subject: [PATCH 070/186] [IMP]hr_attendance:rename field Track attendances into Attendance group allocation to users bzr revid: ssu@tinyerp.com-20121003092611-sklycsd74m4n669h --- addons/hr_attendance/res_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_attendance/res_config.py b/addons/hr_attendance/res_config.py index 0da2d183409..c32e056621d 100644 --- a/addons/hr_attendance/res_config.py +++ b/addons/hr_attendance/res_config.py @@ -25,7 +25,7 @@ class hr_attendance_config_settings(osv.osv_memory): _inherit = 'hr.config.settings' _columns = { - 'group_hr_attendance': fields.boolean('Track attendances', + 'group_hr_attendance': fields.boolean('Attendance group allocation to users', implied_group='base.group_hr_attendance', help="Allocates attendance group to all users."), } From 948841f419e54d4b08ec59169b4f6b102decb9f4 Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 3 Oct 2012 14:59:39 +0530 Subject: [PATCH 071/186] [IMP]improve help bzr revid: sgo@tinyerp.com-20121003092939-nr2u8ft9uozb24ev --- addons/sale/sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 6c73f4513a3..b89b687db98 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -184,7 +184,7 @@ class sale_order(osv.osv): 'user_id': fields.many2one('res.users', 'Salesperson', states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True), 'partner_id': fields.many2one('res.partner', 'Customer', readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, required=True, change_default=True, select=True), 'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Invoice address for current sales order."), - 'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Shipping address for current sales order."), + 'partner_shipping_id': fields.many2one('res.partner', 'Delivery Address', readonly=True, required=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, help="Delivery address for current sales order."), 'order_policy': fields.selection([ ('manual', 'On Demand'), ], 'Create Invoice', required=True, readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, From 43951ef5b42310889ff4b5ce6f14e1bb5a3f327c Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 3 Oct 2012 15:07:42 +0530 Subject: [PATCH 072/186] [IMP]rename field and improve code for removing error bzr revid: sgo@tinyerp.com-20121003093742-waibinp6s7t6ismv --- addons/crm/crm_lead.py | 2 +- addons/sale/sale.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 7e33f397e8a..cfa30a48b7b 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -776,7 +776,7 @@ class crm_lead(base_stage, format_address, osv.osv): 'default_user_id': uid, 'default_section_id': opportunity.section_id and opportunity.section_id.id or False, 'default_email_from': opportunity.email_from, - 'default_state': 'open', + 'default_state': 'needs-action', 'default_name': opportunity.name, } return res diff --git a/addons/sale/sale.py b/addons/sale/sale.py index c47bf1357c8..5f12d302f10 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -694,7 +694,7 @@ class sale_order_line(osv.osv): _description = 'Sales Order Line' _columns = { 'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}), - 'name': fields.text('Product Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}), + 'name': fields.text('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."), 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True), 'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True), From 4ef3f9218bb97b66b301f84ed49661d3be79a909 Mon Sep 17 00:00:00 2001 From: "Purnendu Singh (OpenERP)" Date: Wed, 3 Oct 2012 15:12:42 +0530 Subject: [PATCH 073/186] [IMP] document: add on_change on fname so it will update the download link with the name of attached document bzr revid: psi@tinyerp.com-20121003094242-5wu6pki5cx442jte --- addons/document/document.py | 10 ++++++++-- addons/document/document_view.xml | 13 +++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/addons/document/document.py b/addons/document/document.py index 3ae783f49e7..cbc20edc044 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -36,7 +36,6 @@ DMS_ROOT_PATH = tools.config.get('document_path', os.path.join(tools.config['roo class document_file(osv.osv): _inherit = 'ir.attachment' - _rec_name = 'datas_fname' def _attach_parent_id(self, cr, uid, ids=None, context=None): @@ -149,7 +148,14 @@ class document_file(osv.osv): _sql_constraints = [ # filename_uniq is not possible in pure SQL ] - def _check_duplication(self, cr, uid, vals, ids=None, op='create'): + + def onchange_file(self, cr, uid, ids, datas_fname=False, context=None): + res = {'value':{}} + if datas_fname: + res['value'].update({'name': datas_fname}) + return res + + def _check_duplication(self, cr, uid, vals, ids=[], op='create'): name = vals.get('name', False) parent_id = vals.get('parent_id', False) res_model = vals.get('res_model', False) diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 8d1ff0850b3..54776c4d36e 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -228,9 +228,11 @@ + + + - @@ -339,15 +341,6 @@ - - ir.attachment.view.inherit - ir.attachment - - - - - - process.node.form From 60f3b375bbeb598e2ebfc24c340f357b177921f5 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 3 Oct 2012 15:20:03 +0530 Subject: [PATCH 074/186] [IMP] make changes into thehr_expense module bzr revid: rma@tinyerp.com-20121003095003-98n5tb4tcscn0o07 --- addons/hr_expense/__openerp__.py | 2 +- addons/hr_expense/hr_expense.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index 058bf361d50..4b273a9cc81 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -46,7 +46,7 @@ This module also uses analytic accounting and is compatible with the invoice on 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'], - 'depends': ['hr', 'account_voucher','procurement'], + 'depends': ['hr', 'account_voucher'], 'data': [ 'security/ir.model.access.csv', 'hr_expense_data.xml', diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 91dc44fed61..61b091d1d51 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -243,7 +243,7 @@ class product_product(osv.osv): data_obj = self.pool.get('ir.model.data') cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense') categ_id = data_obj.browse(cr, uid, cat_id).res_id - res = {'value' : {'type':'service','procure_method':'make_to_stock','supply_method':'buy','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }} + res = {'value' : {'type':'service','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }} return res product_product() From 18742c545d3ea3ef57cfb4a64b599ebc3b8c6f3e Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Wed, 3 Oct 2012 15:39:10 +0530 Subject: [PATCH 075/186] [IMP] make changes into project module bzr revid: rma@tinyerp.com-20121003100910-96m1dczfdovlky6j --- addons/project/__openerp__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index 5f549a719b5..85e33be777a 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -39,7 +39,6 @@ 'base_setup', 'base_status', 'product', - 'procurement', 'analytic', 'board', 'mail', From b8578a099c462e74762bb8f8b3b0c45c6837a33a Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 3 Oct 2012 16:43:35 +0530 Subject: [PATCH 076/186] [FIX]product:string inproved bzr revid: kbh@tinyerp.com-20121003111335-ozvs174mhekgy9ax --- addons/product/product_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 8c19aee026f..5b3af54fd7b 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -135,7 +135,7 @@ - + @@ -197,7 +197,7 @@ - + From a4da52f7f0fb96db30bf40806bc278647b3cb20b Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 3 Oct 2012 16:57:46 +0530 Subject: [PATCH 077/186] [FIX]hr_expense : remove purchase_ok bzr revid: mma@tinyerp.com-20121003112746-sw2ycbrysn65hfjz --- addons/hr_expense/hr_expense.py | 2 +- addons/product/product.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 61b091d1d51..487e4f58782 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -243,7 +243,7 @@ class product_product(osv.osv): data_obj = self.pool.get('ir.model.data') cat_id = data_obj._get_id(cr, uid, 'hr_expense', 'cat_expense') categ_id = data_obj.browse(cr, uid, cat_id).res_id - res = {'value' : {'type':'service','purchase_ok':True,'sale_ok' :False,'categ_id':categ_id }} + res = {'value' : {'type':'service','sale_ok' :False,'categ_id':categ_id }} return res product_product() diff --git a/addons/product/product.py b/addons/product/product.py index 6bf26a45d24..11a81c23b73 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -350,7 +350,6 @@ class product_template(osv.osv): 'standard_price': lambda *a: 0.0, 'sale_ok': lambda *a: 1, 'produce_delay': lambda *a: 1, - 'purchase_ok': lambda *a: 1, 'uom_id': _get_uom_id, 'uom_po_id': _get_uom_id, 'uos_coeff' : lambda *a: 1.0, From be42204adf876f675af5e7466b0d57efbb840d6c Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 3 Oct 2012 17:08:46 +0530 Subject: [PATCH 078/186] [FIX]product : remove lemda from defaults bzr revid: mma@tinyerp.com-20121003113846-mjjtghoxdu8h2nq8 --- addons/procurement/procurement.py | 4 ++-- addons/product/product.py | 16 ++++++++-------- addons/purchase/purchase.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index afa4eb2af0b..3d5e166b082 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -649,8 +649,8 @@ class product_template(osv.osv): 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."), } _defaults = { - 'procure_method': lambda *a: 'make_to_stock', - 'supply_method': lambda *a: 'buy', + 'procure_method': 'make_to_stock', + 'supply_method': 'buy', } product_template() diff --git a/addons/product/product.py b/addons/product/product.py index 11a81c23b73..d23cd37ae69 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -345,17 +345,17 @@ class product_template(osv.osv): _defaults = { 'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'product.template', context=c), - 'list_price': lambda *a: 1, - 'cost_method': lambda *a: 'standard', - 'standard_price': lambda *a: 0.0, - 'sale_ok': lambda *a: 1, - 'produce_delay': lambda *a: 1, + 'list_price': 1, + 'cost_method': 'standard', + 'standard_price': 0.0, + 'sale_ok': 1, + 'produce_delay': 1, 'uom_id': _get_uom_id, 'uom_po_id': _get_uom_id, - 'uos_coeff' : lambda *a: 1.0, - 'mes_type' : lambda *a: 'fixed', + 'uos_coeff' : 1.0, + 'mes_type' : 'fixed', 'categ_id' : _default_category, - 'type' : lambda *a: 'consu', + 'type' : 'consu', } def _check_uom(self, cursor, user, ids, context=None): diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 6643394b148..abb45ae0909 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -1102,7 +1102,7 @@ class product_template(osv.osv): 'purchase_ok': fields.boolean('Can be Purchased', help="Determine if the product is visible in the list of products within a selection from a purchase order line."), } _defaults = { - 'purchase_ok': lambda *a: 1, + 'purchase_ok': 1, } product_template() From cfb01972363037e7ffcc40d90812acaa19314b2c Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 3 Oct 2012 17:12:08 +0530 Subject: [PATCH 079/186] [FIX]product : remove lemda from defaults bzr revid: mma@tinyerp.com-20121003114208-p6p0xvecuc1vfb0e --- addons/stock/product.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/product.py b/addons/stock/product.py index e93258b56cd..94252f80439 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -520,7 +520,7 @@ class product_template(osv.osv): } _defaults = { - 'sale_delay': lambda *a: 7, + 'sale_delay': 7, } product_template() From cc331b802c0e7c37e4168dbd144c8590c1d27af1 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 3 Oct 2012 17:13:28 +0530 Subject: [PATCH 080/186] [FIX]product : remove sale_dealy from product.template bzr revid: mma@tinyerp.com-20121003114328-9ufkrn1d84vyny5q --- addons/product/product.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/product/product.py b/addons/product/product.py index d23cd37ae69..42f7d003079 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -281,7 +281,6 @@ class product_template(osv.osv): 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."), - 'sale_delay': fields.float('Customer Lead Time', help="This is the average delay in days between the confirmation of the customer order and the delivery of the finished products. It's the time you promise to your customers."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."), 'rental': fields.boolean('Can be Rent'), 'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"), From 8169ad64cffae017db28b3cc4c03c712a34711f9 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 3 Oct 2012 17:56:37 +0530 Subject: [PATCH 081/186] [IMP] display applicant's name above the subject in kanban of application bzr revid: fka@tinyerp.com-20121003122637-74o8xxuxoxav876x --- addons/hr_recruitment/hr_recruitment_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 08e5f31a2d2..ccc91da2b0e 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -289,6 +289,7 @@
+


Mobile:
From 7c9ad497897f41ff20823740f671e7d9cc5238b8 Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Wed, 3 Oct 2012 18:19:11 +0530 Subject: [PATCH 082/186] [IMP] in Payslips: change journal_id label bzr revid: fka@tinyerp.com-20121003124911-o792xmzwj6tswt0e --- addons/hr_payroll_account/hr_payroll_account.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_payroll_account/hr_payroll_account.py b/addons/hr_payroll_account/hr_payroll_account.py index 184f9a06867..94df47f6e44 100644 --- a/addons/hr_payroll_account/hr_payroll_account.py +++ b/addons/hr_payroll_account/hr_payroll_account.py @@ -36,7 +36,7 @@ class hr_payslip(osv.osv): _columns = { 'period_id': fields.many2one('account.period', 'Force Period',states={'draft': [('readonly', False)]}, readonly=True, domain=[('state','<>','done')], help="Keep empty to use the period of the validation(Payslip) date."), - 'journal_id': fields.many2one('account.journal', 'Expense Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True), + 'journal_id': fields.many2one('account.journal', 'Salary Journal',states={'draft': [('readonly', False)]}, readonly=True, required=True), 'move_id': fields.many2one('account.move', 'Accounting Entry', readonly=True), } @@ -215,7 +215,7 @@ class hr_payslip_run(osv.osv): _inherit = 'hr.payslip.run' _description = 'Payslip Run' _columns = { - 'journal_id': fields.many2one('account.journal', 'Expense Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True), + 'journal_id': fields.many2one('account.journal', 'Salary Journal', states={'draft': [('readonly', False)]}, readonly=True, required=True), } def _get_default_journal(self, cr, uid, context=None): From 98d979529d021383867be7086467018ceba23d50 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 3 Oct 2012 18:44:14 +0530 Subject: [PATCH 083/186] [IMP]event_sale : improve view bzr revid: mma@tinyerp.com-20121003131414-v6e0srgum29xdyjx --- addons/event_sale/event_sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml index 174f82f9b6b..ab7568d704e 100644 --- a/addons/event_sale/event_sale_view.xml +++ b/addons/event_sale/event_sale_view.xml @@ -4,7 +4,7 @@ event.product product.product - +
From 4858fff4ca67af7e59956750d85b1f7e042d8da1 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Wed, 3 Oct 2012 18:45:43 +0530 Subject: [PATCH 084/186] [FIX]stock:err of attrs when select any field from group by in search view bzr revid: kbh@tinyerp.com-20121003131543-01aszl4xgujw8sac --- addons/stock/stock_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index f5320a963c7..f66f24ae551 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -1119,7 +1119,7 @@ stock.move - + From 6c908a4b221e7c809c0e6d852cf8bf108064e8be Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Wed, 3 Oct 2012 18:52:00 +0530 Subject: [PATCH 085/186] [IMP]event_sale : improve templates view bzr revid: mma@tinyerp.com-20121003132200-bxk7i0thj3prqymp --- addons/product/product_view.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 32d6711d386..14571fbcc55 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -709,11 +709,19 @@ + + + + + + + + From 082f696ef47eceb19e3ce8d82d10440aee80004f Mon Sep 17 00:00:00 2001 From: Tejas Tank Date: Thu, 4 Oct 2012 11:41:32 +0530 Subject: [PATCH 086/186] UOM, List view: remove the ratio column. bzr revid: tta@openerp.com-20121004061132-0p5o9qcfpo0xyvzh --- addons/product/product_view.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 8c19aee026f..2509abfec4e 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -449,7 +449,6 @@ - From dbb18562a5eb549c9fbe2aaee0a456e382acd727 Mon Sep 17 00:00:00 2001 From: "Khushboo Bhatt (Open ERP)" Date: Thu, 4 Oct 2012 14:12:53 +0530 Subject: [PATCH 087/186] [FIX]from product's view if we click on Bill of Materials view it opens bill of materials view which is showing BoM of this product as a component too bzr revid: kbh@tinyerp.com-20121004084253-hc1nibjcdkamocni --- addons/mrp/mrp_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index abf0f823e5c..c00582dbcc4 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -1037,6 +1037,7 @@ {'default_product_id': active_id, 'search_default_product_id': active_id} Bill of Materials + [('bom_id','=',False)] mrp.bom From 98ddbdd75167bf3a495c369d7dfa5a72b9f88c7a Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Thu, 4 Oct 2012 14:58:30 +0530 Subject: [PATCH 088/186] [FIX]purchase : improve with xpath bzr revid: mma@tinyerp.com-20121004092830-0boj28i0rgcf4pum --- addons/purchase/purchase_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 66c66e024bd..7ca3fb1055c 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -644,12 +644,12 @@ product.product - + - - + + - + From d57703fa87a48146846e93fb2dac85a831cf8fe7 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Thu, 4 Oct 2012 15:33:06 +0530 Subject: [PATCH 089/186] [FIX]product : improve tooltip bzr revid: mma@tinyerp.com-20121004100306-k82sewubhw508cgz --- addons/procurement/procurement.py | 2 +- addons/product/product.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 3d5e166b082..159c4983063 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -644,7 +644,7 @@ stock_warehouse_orderpoint() class product_template(osv.osv): _inherit="product.template" _columns = { - 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."), + 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."), 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."), 'supply_method': fields.selection([('produce','Manufacture'),('buy','Buy')], 'Supply Method', required=True, help="Produce will generate production order or tasks, according to the product type. Buy will trigger purchase orders when requested."), } diff --git a/addons/product/product.py b/addons/product/product.py index 42f7d003079..5ee1701532c 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -280,7 +280,7 @@ class product_template(osv.osv): 'description': fields.text('Description',translate=True), 'description_purchase': fields.text('Purchase Description',translate=True), 'description_sale': fields.text('Sale Description',translate=True), - 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock."), + 'type': fields.selection([('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."), 'produce_delay': fields.float('Manufacturing Lead Time', help="Average delay in days to produce this product. This is only for the production order and, if it is a multi-level bill of material, it's only for the level of this product. Different lead times will be summed for all levels and purchase orders."), 'rental': fields.boolean('Can be Rent'), 'categ_id': fields.many2one('product.category','Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"), From c24d52183e1fc1bc98526425ce7c78e3a18c7db4 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Thu, 4 Oct 2012 16:11:10 +0530 Subject: [PATCH 090/186] [IMP] improve the button style in event kanban view bzr revid: rma@tinyerp.com-20121004104110-cy7koe2xiqt9xlde --- addons/event/event_view.xml | 5 +++-- addons/event/static/src/css/event.css | 8 ++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 22da0ca5596..9abfa1ddd14 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -271,13 +271,14 @@ - - diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css index 8602ea24d53..670683b0745 100644 --- a/addons/event/static/src/css/event.css +++ b/addons/event/static/src/css/event.css @@ -42,4 +42,12 @@ width:256px; border: 1px solid #eeeeee; } +.unsubscribe, .unsubscribe_button:hover span { + display: none; + background-color: #DC5F59 + } +.unsubscribe_button:hover .unsubscribe { + display: inline; + background-color: #DC5F59; + } From 1d2ba2dca3638f2bf54d9d89449142efe92c531d Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Thu, 4 Oct 2012 19:02:41 +0530 Subject: [PATCH 091/186] [IMP]Sale : improve flow when no product in sale order line and invoice based on delivery at the time invoice is created for that line bzr revid: mma@tinyerp.com-20121004133241-v4tcf80gwpocbsry --- addons/sale/sale.py | 4 ++-- addons/sale_stock/stock.py | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index c47bf1357c8..547729da5ee 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -735,13 +735,13 @@ class sale_order_line(osv.osv): if (line.order_id.invoice_quantity=='order'): if line.product_uos: return line.product_uos_qty or 0.0 - return line.product_uom_qty + return line.product_uom_qty def _get_line_uom(self, cr, uid, line, context=None): if (line.order_id.invoice_quantity=='order'): if line.product_uos: return line.product_uos.id - return line.product_uom.id + return line.product_uom.id def _prepare_order_line_invoice_line(self, cr, uid, line, account_id=False, context=None): """Prepare the dict of values to create the new invoice line for a diff --git a/addons/sale_stock/stock.py b/addons/sale_stock/stock.py index c4e505a80e8..7d505a672d2 100644 --- a/addons/sale_stock/stock.py +++ b/addons/sale_stock/stock.py @@ -183,6 +183,16 @@ class stock_picking(osv.osv): 'invoiced': True, 'invoice_lines': [(6, 0, [invoice_line_id])], }) + if not sale_line.product_id: + vals = order_line_obj._prepare_order_line_invoice_line(cursor, user, sale_line, False, context) + if vals: + vals['invoice_id'] = invoices[result[picking.id]].id + invoice_line_id = invoice_line_obj.create(cursor, user, vals, context=context) + order_line_obj.write(cursor, user, [sale_line.id], { + 'invoiced': True, + 'invoice_lines': [(6, 0, [invoice_line_id])], + }) + return result # Redefinition of the new field in order to update the model stock.picking.out in the orm From 71777e5380bfcc7b9b6f862cdbe44bd3b27c7f2f Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 5 Oct 2012 12:11:59 +0530 Subject: [PATCH 092/186] [FIX]product : improve procurment help message and update views bzr revid: mma@tinyerp.com-20121005064159-nxevkdhc058c2u5k --- addons/procurement/procurement_view.xml | 44 ++++++++++++------------- addons/product/product_view.xml | 25 ++------------ addons/purchase/purchase_view.xml | 8 +++++ addons/stock/product_view.xml | 2 +- 4 files changed, 33 insertions(+), 46 deletions(-) diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 8c3ae9a2336..67747e2f1ad 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -307,28 +307,28 @@ - - -

- When you sell this service, nothing special will be trigered - to deliver the customer, as you set the procurement method as - 'Make to Stock'. -

-

- When you sell this product, OpenERP will use the available - inventory for the delivery order. -

- If there are not enough quantities available, the delivery order - will wait for new products. To fulfill the inventory, you should - create others rules like orderpoints. -

-

- When you sell this product, a delivery order will be created. - OpenERP will consider that the required quantities are always - available as it's a consumable (as a result of this, the quantity - on hand may become negative). -

- + + +

+ When you sell this service, nothing special will be trigered + to deliver the customer, as you set the procurement method as + 'Make to Stock'. +

+

+ When you sell this product, OpenERP will use the available + inventory for the delivery order. +

+ If there are not enough quantities available, the delivery order + will wait for new products. To fulfill the inventory, you should + create others rules like orderpoints. +

+

+ When you sell this product, a delivery order will be created. + OpenERP will consider that the required quantities are always + available as it's a consumable (as a result of this, the quantity + on hand may become negative). +

+ diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 14571fbcc55..9f38ef443e3 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -100,32 +100,11 @@ - + - -

- When you sell this service, nothing special will be trigered - to deliver the customer, as you set the procurement method as - 'Make to Stock'. -

-

- When you sell this product, OpenERP will use the available - inventory for the delivery order. -

- If there are not enough quantities available, the delivery order - will wait for new products. To fulfill the inventory, you should - create others rules like orderpoints. -

-

- When you sell this product, a delivery order will be created. - OpenERP will consider that the required quantities are always - available as it's a consumable (as a result of this, the quantity - on hand may become negative). -

- - + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 7ca3fb1055c..8e7096c19d1 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -597,6 +597,14 @@ + + + + + product.normal.form.procurement.help.inherit + product.product + +

When you sell this service to a customer, a draft purchase order diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index aaa16844b9e..9c44b18cee4 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -66,7 +66,7 @@ product.product - +

From f7f4f923ce74f4c30f0bf972648aa6efc7f62b85 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 5 Oct 2012 12:20:50 +0530 Subject: [PATCH 093/186] [FIX]product : improve group bzr revid: mma@tinyerp.com-20121005065050-fchjbkc1wbipxfux --- addons/procurement/procurement_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 67747e2f1ad..53b3b600479 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -308,7 +308,7 @@ - +

When you sell this service, nothing special will be trigered to deliver the customer, as you set the procurement method as From f265677f0fa1ec65fc4f45e36b57bad436a19a1b Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 5 Oct 2012 12:44:28 +0530 Subject: [PATCH 094/186] [FIX]product : removed unused speces bzr revid: mma@tinyerp.com-20121005071428-pfj0lhepwiof3wr7 --- addons/procurement/procurement_demo.xml | 65 +++++++++++++------------ addons/procurement/procurement_view.xml | 2 + 2 files changed, 36 insertions(+), 31 deletions(-) diff --git a/addons/procurement/procurement_demo.xml b/addons/procurement/procurement_demo.xml index e28927815e3..608eb56f3ba 100644 --- a/addons/procurement/procurement_demo.xml +++ b/addons/procurement/procurement_demo.xml @@ -1,20 +1,23 @@ + make_to_order produce + make_to_order produce + product make_to_order produce - + product make_to_order @@ -26,32 +29,32 @@ make_to_order produce - + product - + product - + product - + product make_to_order - + product - + product - + product make_to_order @@ -102,100 +105,100 @@ product - + product - + product - + product - + product - + product make_to_order produce - + product - + product - + product - + product - + product - + product make_to_order - + product - + product - + product - + product make_to_order - + product - + product - + make_to_order produce - + product - + product - + product - + product - + \ No newline at end of file diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index 53b3b600479..f75a2c7f01a 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -332,6 +332,7 @@ + product.template.procurement product.template @@ -343,5 +344,6 @@ + From 7202b8f7efbc76e2a40b1a4a8d7a95ed0d2ce573 Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Fri, 5 Oct 2012 12:45:01 +0530 Subject: [PATCH 095/186] [IMP] Sale : value of cost price field added as demo data file in sale_margin bzr revid: rpr@tinyerp.com-20121005071501-241az5fxdq96cmow --- addons/sale_margin/__openerp__.py | 2 +- addons/sale_margin/sale_margin_demo.xml | 46 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 addons/sale_margin/sale_margin_demo.xml diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py index 9b393b6c5ad..bb2f78f409c 100644 --- a/addons/sale_margin/__openerp__.py +++ b/addons/sale_margin/__openerp__.py @@ -32,7 +32,7 @@ Price and Cost Price. 'author':'OpenERP SA', 'images':['images/sale_margin.jpeg'], 'depends':['sale_stock'], - 'demo':[], + 'demo':['sale_margin_demo.xml'], 'test': ['test/sale_margin.yml'], 'data':['security/ir.model.access.csv','sale_margin_view.xml'], 'auto_install': False, diff --git a/addons/sale_margin/sale_margin_demo.xml b/addons/sale_margin/sale_margin_demo.xml new file mode 100644 index 00000000000..a41f05304a4 --- /dev/null +++ b/addons/sale_margin/sale_margin_demo.xml @@ -0,0 +1,46 @@ + + + + + + 2870.00 + + + + 126.00 + + + + 60.00 + + + + 390.00 + + + + 21.60 + + + + 4258.00 + + + + 2870.00 + + + + 155.00 + + + + 35.00 + + + + 13.00 + + + + From 1fbadf892af5ca5d7c68900e8516b8a3391baef7 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 5 Oct 2012 12:58:25 +0530 Subject: [PATCH 096/186] [FIX]product : improve filter product bzr revid: mma@tinyerp.com-20121005072825-m232k236scnicrev --- addons/procurement/procurement_view.xml | 35 ++++++++++++++++--------- addons/product/product_view.xml | 2 +- addons/purchase/purchase_view.xml | 2 +- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index f75a2c7f01a..dcaa5e8d543 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -294,6 +294,29 @@ stock.warehouse.orderpoint + + product.template.procurement + product.template + + + + + + + + + + + product.search.procurment.form + product.product + + + + + + + + product.product.procurement product.product @@ -333,17 +356,5 @@ - - product.template.procurement - product.template - - - - - - - - - diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 9f38ef443e3..cc068d16a76 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -10,7 +10,7 @@ - + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 8e7096c19d1..d71e34dbc10 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -623,7 +623,7 @@ - product.search.stock.form + product.search.purchase.form product.product From f86e21cf2104a20efd22bdee232bc9ecd0cd4e78 Mon Sep 17 00:00:00 2001 From: "Mayur Maheshwari (OpenERP)" Date: Fri, 5 Oct 2012 13:03:00 +0530 Subject: [PATCH 097/186] [FIX]product : add space bzr revid: mma@tinyerp.com-20121005073300-12vrs2uzn5wkdiid --- addons/procurement/procurement.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py index 159c4983063..6d36cb5b71c 100644 --- a/addons/procurement/procurement.py +++ b/addons/procurement/procurement.py @@ -641,8 +641,10 @@ class stock_warehouse_orderpoint(osv.osv): return super(stock_warehouse_orderpoint, self).copy(cr, uid, id, default, context=context) stock_warehouse_orderpoint() + class product_template(osv.osv): _inherit="product.template" + _columns = { 'type': fields.selection([('product','Stockable Product'),('consu', 'Consumable'),('service','Service')], 'Product Type', required=True, help="Will change the way procurements are processed. Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."), 'procure_method': fields.selection([('make_to_stock','Make to Stock'),('make_to_order','Make to Order')], 'Procurement Method', required=True, help="'Make to Stock': When needed, take from the stock or wait until re-supplying. 'Make to Order': When needed, purchase or produce for the procurement request."), @@ -652,6 +654,7 @@ class product_template(osv.osv): 'procure_method': 'make_to_stock', 'supply_method': 'buy', } + product_template() class product_product(osv.osv): From ffac8ab0c66f5536d31d5aa8ccdbef785f9e71d7 Mon Sep 17 00:00:00 2001 From: "Randhir Mayatra (OpenERP)" Date: Fri, 5 Oct 2012 14:10:00 +0530 Subject: [PATCH 098/186] [IMP] improve the price list view in purchase bzr revid: rma@tinyerp.com-20121005084000-fqu4va5h024ckehs --- addons/stock/product_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index a7dff7fcc0d..ecb8074a307 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -86,7 +86,7 @@

From 45eb7b676bc1caf8cabbf849d70501b958c78130 Mon Sep 17 00:00:00 2001 From: Jigar Amin Date: Fri, 5 Oct 2012 14:37:40 +0530 Subject: [PATCH 099/186] [FIX] crm : Oppoertunity to Meeting state field id Depricated not needed anymore. bzr revid: jam@tinyerp.com-20121005090740-jgun1jodxng11owe --- addons/crm/crm_lead.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index cfa30a48b7b..ff03beda550 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -776,7 +776,6 @@ class crm_lead(base_stage, format_address, osv.osv): 'default_user_id': uid, 'default_section_id': opportunity.section_id and opportunity.section_id.id or False, 'default_email_from': opportunity.email_from, - 'default_state': 'needs-action', 'default_name': opportunity.name, } return res From 3eb167026792879d058aad9d00071cf0ee270724 Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Fri, 5 Oct 2012 17:56:42 +0530 Subject: [PATCH 100/186] [IMP] Sale : onchange removed from sale_view bzr revid: rpr@tinyerp.com-20121005122642-rf692y75mdjpr26k --- addons/sale/res_config_view.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml index e684fc4b1c3..daf396d302b 100644 --- a/addons/sale/res_config_view.xml +++ b/addons/sale/res_config_view.xml @@ -12,6 +12,10 @@