From a061c2adc6f56f64917b231cb91115982f301cee Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 31 May 2010 14:31:28 +0530 Subject: [PATCH 01/10] [Fix]: Improve the mrp report bzr revid: sbh@tinyerp.com-20100531090128-9pydtk6uvr2h3689 --- addons/mrp/report/order.rml | 4 ++-- addons/sale/report/order.rml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/mrp/report/order.rml b/addons/mrp/report/order.rml index af55afce91b..200ca5bb76e 100644 --- a/addons/mrp/report/order.rml +++ b/addons/mrp/report/order.rml @@ -265,10 +265,10 @@ [[ formatLang(o.date_planned, date_time = True) ]] - [[ o.sale_ref or ' ' ]] + [[ o.sale_ref or removeParentNode('para')]] - [[ o.sale_name or '' ]] + [[ o.sale_name or removeParentNode('para') ]] diff --git a/addons/sale/report/order.rml b/addons/sale/report/order.rml index 1b1256cee19..46ce9b5e738 100644 --- a/addons/sale/report/order.rml +++ b/addons/sale/report/order.rml @@ -204,7 +204,7 @@ [[ o.client_order_ref ]] - [[ formatLang(o.date_order,date = True) ]] + [[ formatLang(o.date_order,date=True) ]] [[ o.user_id.name ]] From d213c49382ea795220d9287dce112f16388f6dc2 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 31 May 2010 16:56:59 +0530 Subject: [PATCH 02/10] [IMP] point_of_sale: Improve the view and remove the unsused code bzr revid: sbh@tinyerp.com-20100531112659-wxd2xuzzv2sum9d9 --- addons/point_of_sale/pos_view.xml | 47 +++++++++---------------------- 1 file changed, 13 insertions(+), 34 deletions(-) diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml index dbbd3a6b1f8..aa4c7c3f410 100644 --- a/addons/point_of_sale/pos_view.xml +++ b/addons/point_of_sale/pos_view.xml @@ -119,14 +119,7 @@ - - Point of Sale - ir.actions.act_window - pos.order - form - - [['date_order','>=',time.strftime('%Y-%m-%d')]] - + Sales pos.order @@ -153,6 +146,8 @@ + + @@ -169,6 +164,16 @@ + + Point of Sale + ir.actions.act_window + pos.order + form + tree,form + {"search_default_user_id":uid} + + + @@ -190,30 +195,7 @@ - - Sales to Invoice - ir.actions.act_window - pos.order - form - tree,form - - [('state','!=', 'invoiced')] - {"search_default_user_id":uid} - - - - - - Accepted Sales - ir.actions.act_window - pos.order - form - tree,form - [('state','=', 'paid')] - {"search_default_user_id":uid} - - Point of Sale ir.actions.act_window @@ -867,9 +849,6 @@ id="menu_action_all_sales_tree3" action="action_pos_order_tree3" sequence="1" groups="base.group_extended"/> - - Date: Mon, 31 May 2010 17:01:23 +0530 Subject: [PATCH 03/10] [IMP] point_of_sale: Add the partner_id in tree view bzr revid: sbh@tinyerp.com-20100531113123-338runphirokm32j --- addons/point_of_sale/pos_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/point_of_sale/pos_view.xml b/addons/point_of_sale/pos_view.xml index aa4c7c3f410..cef07e9f187 100644 --- a/addons/point_of_sale/pos_view.xml +++ b/addons/point_of_sale/pos_view.xml @@ -131,6 +131,7 @@ + From 2f22f72c6a3e139313d89c857dbfd4494b993c90 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Mon, 31 May 2010 17:20:55 +0530 Subject: [PATCH 04/10] [IMP] point_of_sale:Improve the copy method, set statement_ids False bzr revid: sbh@tinyerp.com-20100531115055-nohsl4r13xcb39hh --- addons/point_of_sale/pos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py index 5d4df5a5f10..d66cbbbf1fd 100644 --- a/addons/point_of_sale/pos.py +++ b/addons/point_of_sale/pos.py @@ -226,7 +226,6 @@ class pos_order(osv.osv): else: return False def copy(self, cr, uid, id, default=None, context={}): - if not default: default = {} default.update({ @@ -236,6 +235,7 @@ class pos_order(osv.osv): 'invoice_id': False, 'account_move': False, 'picking_id': False, + 'statement_ids':False, 'nb_print': 0, 'pickings': [] }) From a339ef21cf1cb231343535451fb63d56adf8d8b3 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 9 Jun 2010 12:08:21 +0530 Subject: [PATCH 05/10] Product-Backlog-475: Move the field in stock bzr revid: sbh@tinyerp.com-20100609063821-c4d0pisnp00ek71s --- addons/product/product.py | 10 ---------- addons/product/product_data.xml | 7 +------ addons/product/product_view.xml | 1 - addons/stock/product.py | 10 ++++++++++ addons/stock/product_view.xml | 2 ++ addons/stock/stock_demo.xml | 8 +++++++- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index 52d643940f5..f577437cedb 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -209,13 +209,6 @@ class product_category(osv.osv): 'child_id': fields.one2many('product.category', 'parent_id', string='Child Categories'), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of product categories."), 'type': fields.selection([('view','View'), ('normal','Normal')], 'Category Type'), - 'property_stock_variation': fields.property( - 'account.account', - type='many2one', - relation='account.account', - string="Stock variation Account", - method=True, - view_load=True, help="This account will be used in product when valuation type is real-time valuation ",), } @@ -465,9 +458,6 @@ class product_product(osv.osv): 'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')), 'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Sale Price')), 'pricelist_id': fields.dummy(string='Pricelist',relation='product.pricelist', type='many2one'), - 'valuation':fields.selection([('manual_periodic','Manual Periodic Valuation'), - ('real_time','Real Time valuation'), - ('','')],'Valuation',help="Decide if the system must automatically creates account moves based on stock moves"), } def onchange_uom(self, cursor, user, ids, uom_id,uom_po_id): diff --git a/addons/product/product_data.xml b/addons/product/product_data.xml index c1635152fad..4763c191817 100644 --- a/addons/product/product_data.xml +++ b/addons/product/product_data.xml @@ -145,11 +145,6 @@ parameter) will see those record just disappear. Stock Weight 2 - - property_stock_variation - - - - + diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 44250e51bf5..8fbe2edbe08 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -148,7 +148,6 @@ - diff --git a/addons/stock/product.py b/addons/stock/product.py index 5336143befb..5c9a87a1f23 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -312,6 +312,9 @@ class product_product(osv.osv): 'track_incoming': fields.boolean('Track Incoming Lots', help="Forces to use a tracking lot during receptions"), 'track_outgoing': fields.boolean('Track Outgoing Lots', help="Forces to use a tracking lot during deliveries"), 'location_id': fields.dummy(string='Location', relation='stock.location', type='many2one', domain=[('usage','=','internal')]), + 'valuation':fields.selection([('manual_periodic','Manual Periodic Valuation'), + ('real_time','Real Time valuation'), + ('','')],'Valuation',help="Decide if the system must automatically creates account moves based on stock moves"), } def fields_view_get(self, cr, uid, view_id=None, view_type='form', context=None, toolbar=False, submenu=False): res = super(product_product,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu) @@ -417,6 +420,13 @@ class product_category(osv.osv): type='many2one', relation='account.account', string='Stock Output Account', method=True, view_load=True, help='This account will be used to value the output stock'), + 'property_stock_variation': fields.property( + 'account.account', + type='many2one', + relation='account.account', + string="Stock variation Account", + method=True, + view_load=True, help="This account will be used in product when valuation type is real-time valuation ",), } product_category() diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 02c60968e04..0800731d1c7 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -27,6 +27,7 @@ + @@ -61,6 +62,7 @@ + From 14c6bb4f110e51f5d5d2e30ff68cba5174f48212 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 9 Jun 2010 12:21:56 +0530 Subject: [PATCH 07/10] [IMP]product: Remove the property_stock_variation field bzr revid: sbh@tinyerp.com-20100609065156-1p0axo6mzyi5mliy --- 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 8fbe2edbe08..254fe737526 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -216,7 +216,6 @@ - From a7c4270f9af47a38aebbd8172311cedb03ab2ef2 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 9 Jun 2010 12:30:56 +0530 Subject: [PATCH 08/10] base_report_desinger: Improve the message bzr revid: sbh@tinyerp.com-20100609070056-pjv2e29q33783ty9 --- addons/base_report_designer/wizard/base_openoffice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base_report_designer/wizard/base_openoffice.py b/addons/base_report_designer/wizard/base_openoffice.py index 054e027dbab..7886b7cf028 100644 --- a/addons/base_report_designer/wizard/base_openoffice.py +++ b/addons/base_report_designer/wizard/base_openoffice.py @@ -41,7 +41,7 @@ class base_openoffice(osv.osv_memory): def process_pdf_file(self, cr, uid, ids, context): """ - Default Attach Thunderbird Plug-in Installation File. + Default Attach Plug-in Installation File. """ data = {} pdf_file = open(config['addons_path'] + "/base_report_designer/report_desinger/doc/OpenOffice.pdf", 'r') From e72918c9430d6ee42036bfa3178fbdc3c8f0beff Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 9 Jun 2010 14:53:10 +0530 Subject: [PATCH 09/10] stock: Improve the view of stock bzr revid: sbh@tinyerp.com-20100609092310-o4w4d4nfrs55zm0n --- addons/stock/product_view.xml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 323af5ec75c..8d457d61775 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -65,7 +65,6 @@ - - + + + product.valuation.form.inherit + product.product + form + + + + + + + From 02d7be5c1ccd60b43a647a8644d830a86a11eaa9 Mon Sep 17 00:00:00 2001 From: "sbh (Open ERP)" Date: Wed, 9 Jun 2010 14:56:42 +0530 Subject: [PATCH 10/10] stock: Fix the name of tag bzr revid: sbh@tinyerp.com-20100609092642-j8oxl4c8o1yqm3d3 --- 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 8d457d61775..c0c5b1a491e 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -133,7 +133,7 @@ form - +