diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index 14aabed86ad..ab6ad97b180 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -1460,6 +1460,7 @@ class account_invoice_line(osv.osv): result = {} res = self.pool.get('product.product').browse(cr, uid, product, context=context) + result['name'] = res.partner_ref if type in ('out_invoice','out_refund'): a = res.property_account_income.id if not a: @@ -1474,19 +1475,21 @@ class account_invoice_line(osv.osv): if type in ('out_invoice', 'out_refund'): taxes = res.taxes_id and res.taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False) + if res.description_sale: + result['name'] += '\n'+res.description_sale else: taxes = res.supplier_taxes_id and res.supplier_taxes_id or (a and self.pool.get('account.account').browse(cr, uid, a, context=context).tax_ids or False) + if res.description_purchase: + result['name'] += '\n'+res.description_purchase + tax_id = fpos_obj.map_tax(cr, uid, fpos, taxes) if type in ('in_invoice', 'in_refund'): result.update( {'price_unit': price_unit or res.standard_price,'invoice_line_tax_id': tax_id} ) else: result.update({'price_unit': res.list_price, 'invoice_line_tax_id': tax_id}) - result['name'] = res.partner_ref result['uos_id'] = uom_id or res.uom_id.id - if res.description: - result['name'] += '\n'+res.description domain = {'uos_id':[('category_id','=',res.uom_id.category_id.id)]} diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index ce9a09def08..3940c1e5357 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -313,8 +313,8 @@ TSAJ sale - - + + @@ -323,8 +323,8 @@ TSCNJ sale_refund - - + + @@ -334,8 +334,8 @@ TEXJ purchase - - + + @@ -344,8 +344,8 @@ TECNJ purchase_refund - - + + @@ -355,8 +355,8 @@ TBNK bank - - + + @@ -365,8 +365,8 @@ TCHK bank - - + + @@ -374,9 +374,9 @@ Cash Journal - (test) TCSH cash - - - + + + - - + + @@ -403,8 +403,8 @@ TOEJ situation - - + + @@ -413,8 +413,8 @@ USD Bank Journal - (test) TUBK bank - - + + SJ - San José - + San José + A Alajuela - + H Heredia - + C Cartago - + P Puntarenas - + G Guanacaste - + L - Limón - + Limón + @@ -66,13 +65,13 @@ - - + + - - + + @@ -85,9 +84,9 @@ OpenERP Partner create_date - + - + \ No newline at end of file diff --git a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml index 141981a21d6..f6eb8a1d905 100644 --- a/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml +++ b/addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml @@ -1,11 +1,10 @@ - Dummy Action dummy - + @@ -40,10 +39,10 @@ - Hello,

-

Thanks for the genuine interest you have shown in OpenERP.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>Thanks for the genuine interest you have shown in OpenERP.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> For OpenERP OnDemand Free Trial 2010 @@ -53,11 +52,11 @@ - Hello,

-

We have very good offer that might suit you. - We suggest you subscribe to the OpenERP Discovery Day on May 2010.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>We have very good offer that might suit you. + We suggest you subscribe to the OpenERP Discovery Day on May 2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> For OpenERP Discovery Day on May 2010 @@ -68,10 +67,10 @@ - Hello,

-

Thanks for showing interest and for subscribing to the OpenERP Discovery Day.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>Thanks for showing interest and for subscribing to the OpenERP Discovery Day.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> For OpenERP Discovery Day @@ -82,10 +81,10 @@ - Hello,

-

Thanks for showing interest and buying the OpenERP book.

+ <p>Hello,</p> + <p>Thanks for showing interest and buying the OpenERP book.</p> If any further information required kindly revert back. -

Regards,OpenERP Team,

]]> + <p>Regards,OpenERP Team,</p> For OpenERP book @@ -95,11 +94,11 @@ - Hello,

-

We have very good offer that might suit you. - For our gold partners,We are arranging free technical training on june,2010.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>We have very good offer that might suit you. + For our gold partners,We are arranging free technical training on june,2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> technical training to gold partners @@ -110,11 +109,11 @@ - Hello,

-

We have very good offer that might suit you. - For our silver partners,We are paid technical training on june,2010.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>We have very good offer that might suit you. + For our silver partners,We are paid technical training on june,2010.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> training to silver partners @@ -125,11 +124,11 @@ - Hello,

-

We have very good offer that might suit you. - For our silver partners, we are offering Gold partnership.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>We have very good offer that might suit you. + For our silver partners, we are offering Gold partnership.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> gold partnership to silver partners @@ -140,11 +139,11 @@ - Hello,

-

Thanks for showing interest and for subscribing to technical training.

- If any further information required kindly revert back.I really appreciate your co-operation on this.

-

If any further information is required, do not hesitate to reply to this message.

-

Regards,OpenERP Team,

]]> + <p>Hello,</p> + <p>Thanks for showing interest and for subscribing to technical training.</p> + If any further information required kindly revert back.I really appreciate your co-operation on this.</p> + <p>If any further information is required, do not hesitate to reply to this message.</p> + <p>Regards,OpenERP Team,</p> subscribing to technical training @@ -171,7 +170,7 @@ Propose a 1 month free trial for an OnDemand offer - + report @@ -180,27 +179,27 @@ Thanks for showing interest - + Propose to subscribe to the OpenERP Discovery Day on May 2010 - + Thanks for subscribing to the OpenERP Discovery Day - + Propose to buy the OpenERP Book - + report @@ -209,81 +208,81 @@ Thanks for buying the OpenERP book - + Propose a free technical training to Gold partners - + Propose paid training to Silver partners - + Propose gold partnership to silver partners - + Thanks for subscribing to technical training - + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + @@ -296,4 +295,4 @@ - + \ No newline at end of file diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml index d67ee864b34..b3ba426ff4a 100644 --- a/addons/membership/process/membership_process.xml +++ b/addons/membership/process/membership_process.xml @@ -87,16 +87,16 @@ - - + + - - + + @@ -110,25 +110,25 @@ - - + + - - + + - - + + - \ No newline at end of file + diff --git a/addons/mrp/html/index.html b/addons/mrp/html/index.html index d3e7a048490..5777eb5f147 100644 --- a/addons/mrp/html/index.html +++ b/addons/mrp/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index b827a2731c9..dd52268e2d1 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -131,96 +131,96 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml index 965f3f57d69..0005be6f48c 100644 --- a/addons/mrp/process/service_product_process.xml +++ b/addons/mrp/process/service_product_process.xml @@ -39,9 +39,9 @@ - - + + - \ No newline at end of file + diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml index e3fa1136822..a43a09313b8 100644 --- a/addons/mrp/process/stockable_product_process.xml +++ b/addons/mrp/process/stockable_product_process.xml @@ -69,16 +69,16 @@ - - + + - - + + diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml index 452434bbe92..d448b6a299a 100644 --- a/addons/mrp_operations/process/mrp_operation_process.xml +++ b/addons/mrp_operations/process/mrp_operation_process.xml @@ -75,32 +75,32 @@ - - + + - - + + - - + + - - + + diff --git a/addons/mrp_repair/security/mrp_repair_security.xml b/addons/mrp_repair/security/mrp_repair_security.xml index 0b34310fc4e..e94b675b57f 100644 --- a/addons/mrp_repair/security/mrp_repair_security.xml +++ b/addons/mrp_repair/security/mrp_repair_security.xml @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index 088aa35e915..c772a8fd67d 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -192,8 +192,8 @@ SAJ-OpenERP IN sale - - + + @@ -204,8 +204,8 @@ SCNJ-OpenERP IN sale_refund - - + + @@ -216,8 +216,8 @@ EXJ-OpenERP IN purchase - - + + @@ -228,8 +228,8 @@ ECNJ-OpenERP IN purchase_refund - - + + @@ -240,8 +240,8 @@ BNK-OpenERP IN bank - - + + @@ -252,8 +252,8 @@ CHK-OpenERP IN bank - - + + @@ -264,8 +264,8 @@ CSH-OpenERP IN cash - - + + @@ -277,8 +277,8 @@ SAJ-OpenERP US sale - - + + @@ -289,8 +289,8 @@ SCNJ-OpenERP US sale_refund - - + + @@ -301,8 +301,8 @@ EXJ-OpenERP US purchase - - + + @@ -313,8 +313,8 @@ ECNJ-OpenERP US purchase_refund - - + + @@ -325,8 +325,8 @@ BNK-OpenERP US bank - - + + @@ -337,8 +337,8 @@ CHK-OpenERP US bank - - + + @@ -349,8 +349,8 @@ CSH-OpenERP US cash - - + + @@ -363,8 +363,8 @@ SAJ-OpenERP BE sale - - + + @@ -375,8 +375,8 @@ SCNJ-OpenERP BE sale_refund - - + + @@ -387,8 +387,8 @@ EXJ-OpenERP BE purchase - - + + @@ -399,8 +399,8 @@ ECNJ-OpenERP BE purchase_refund - - + + @@ -411,8 +411,8 @@ BNK-OpenERP BE bank - - + + @@ -423,8 +423,8 @@ CHK-OpenERP BE bank - - + + @@ -435,8 +435,8 @@ CSH-OpenERP BE cash - - + + diff --git a/addons/note/html/index.html b/addons/note/html/index.html index 4e7db34df58..7ef37c646e9 100644 --- a/addons/note/html/index.html +++ b/addons/note/html/index.html @@ -7,7 +7,6 @@ -  
Online Demo
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/ir.rule.xml index b0c79561355..2c6e9f3bc7f 100644 --- a/addons/note/security/ir.rule.xml +++ b/addons/note/security/ir.rule.xml @@ -3,7 +3,7 @@ Only followers can access a sticky notes - + [('message_follower_ids','=',user.partner_id.id)] @@ -14,7 +14,7 @@ Each user have his stage name - + ['|',('user_id','=',False),('user_id','=',user.id)] diff --git a/addons/point_of_sale/html/index.html b/addons/point_of_sale/html/index.html index 41f935d8ad9..130806ddb11 100644 --- a/addons/point_of_sale/html/index.html +++ b/addons/point_of_sale/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
diff --git a/addons/procurement/stock_orderpoint.xml b/addons/procurement/stock_orderpoint.xml index 31c48046d64..67d610c65c9 100644 --- a/addons/procurement/stock_orderpoint.xml +++ b/addons/procurement/stock_orderpoint.xml @@ -1,4 +1,3 @@ - @@ -7,50 +6,50 @@ 25.0 5.0 - + - + 10.0 5.0 - + - + 12.0 5.0 - + - + 50.0 10.0 - + - + 15.0 5.0 - + - + 5.0 3.0 - + - + - + \ No newline at end of file diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 03ce904abad..652710fac94 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -43,8 +43,8 @@ - - + + diff --git a/addons/product/product.py b/addons/product/product.py index 518e455ddc1..656812bebbb 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -292,9 +292,14 @@ class product_template(osv.osv): _columns = { 'name': fields.char('Name', size=128, required=True, translate=True, select=True), 'product_manager': fields.many2one('res.users','Product Manager'), - 'description': fields.text('Description',translate=True), - 'description_purchase': fields.text('Purchase Description',translate=True), - 'description_sale': fields.text('Sale Description',translate=True), + 'description': fields.text('Description',translate=True, + help="A precise description of the Product, used only for internal information purposes."), + 'description_purchase': fields.text('Purchase Description',translate=True, + help="A description of the Product that you want to communicate to your suppliers. " + "This description will be copied to every Purchase Order, Reception and Supplier Invoice/Refund."), + 'description_sale': fields.text('Sale Description',translate=True, + help="A description of the Product that you want to communicate to your customers. " + "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"), '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. In the case of multi-level BOM, the manufacturing lead times of the components will be added."), 'rental': fields.boolean('Can be Rent'), diff --git a/addons/project/html/index.html b/addons/project/html/index.html index c1b6c3b966f..93f1be8a41d 100644 --- a/addons/project/html/index.html +++ b/addons/project/html/index.html @@ -7,7 +7,6 @@ -  
Online Demo
diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 4a73bfd00d1..9955fe1ffe1 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -68,24 +68,24 @@ - - + + - - + + - - + + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index e2195c6f61b..c25cd264538 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -50,24 +50,24 @@ - - + + - - + + - - + + diff --git a/addons/project_timesheet/process/project_timesheet_process.xml b/addons/project_timesheet/process/project_timesheet_process.xml index 1bff69b603e..17dd35dcad2 100644 --- a/addons/project_timesheet/process/project_timesheet_process.xml +++ b/addons/project_timesheet/process/project_timesheet_process.xml @@ -46,24 +46,24 @@ - - + + - - + + - - + + diff --git a/addons/purchase/html/index.html b/addons/purchase/html/index.html index 9134c1ab9d2..67b122ac557 100644 --- a/addons/purchase/html/index.html +++ b/addons/purchase/html/index.html @@ -9,7 +9,6 @@ -  
Online Demo
diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index c6b6805351a..7feb47690e0 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -154,16 +154,16 @@ - - + + - - + + @@ -171,24 +171,24 @@ - - + + - - + + - - + + @@ -196,32 +196,32 @@ - - + + - - + + - - + + - - + + diff --git a/addons/sale_stock/process/sale_stock_process.xml b/addons/sale_stock/process/sale_stock_process.xml index c10b34c8866..1ebebec7809 100644 --- a/addons/sale_stock/process/sale_stock_process.xml +++ b/addons/sale_stock/process/sale_stock_process.xml @@ -72,40 +72,40 @@ - - + + - - + + - - + + - - + + - - + +