From d7d204b65b7f570f806a1fdbbbb48dd73a5377af Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Tue, 12 Aug 2008 18:32:16 +0200 Subject: [PATCH 001/433] Exit properly when port is already used bzr revid: christophe.chauvet@syleam.fr-20080812163216-h9mcf053tl1101wx --- bin/netsvc.py | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/bin/netsvc.py b/bin/netsvc.py index e05d4ece6b9..10345c05b5f 100644 --- a/bin/netsvc.py +++ b/bin/netsvc.py @@ -266,9 +266,13 @@ class SimpleThreadedXMLRPCServer(SocketServer.ThreadingMixIn, SimpleXMLRPCServer.SimpleXMLRPCServer): def server_bind(self): - self.socket.setsockopt(socket.SOL_SOCKET, - socket.SO_REUSEADDR, 1) - SimpleXMLRPCServer.SimpleXMLRPCServer.server_bind(self) + try: + self.socket.setsockopt(socket.SOL_SOCKET, + socket.SO_REUSEADDR, 1) + SimpleXMLRPCServer.SimpleXMLRPCServer.server_bind(self) + except: + sys.stderr.write("ERROR: address already in use\n") + sys.exit(1) class HttpDaemon(threading.Thread): @@ -287,9 +291,14 @@ class HttpDaemon(threading.Thread): SecureXMLRPCServer.SecureXMLRPCServer): def server_bind(self): - self.socket.setsockopt(socket.SOL_SOCKET, - socket.SO_REUSEADDR, 1) - SecureXMLRPCServer.SecureXMLRPCServer.server_bind(self) + try: + self.socket.setsockopt(socket.SOL_SOCKET, + socket.SO_REUSEADDR, 1) + SecureXMLRPCServer.SecureXMLRPCServer.server_bind(self) + except: + sys.stderr.write("ERROR: address already in use\n") + sys.exit(1) + self.server = SecureThreadedXMLRPCServer((interface, port), SecureXMLRPCRequestHandler, 0) From 7fff0810f7fa9513caf986664441bd53aa1fa42c Mon Sep 17 00:00:00 2001 From: Christophe Chauvet Date: Wed, 13 Aug 2008 01:02:28 +0200 Subject: [PATCH 002/433] [server] * trap xpath and lxml import error and exit properly bzr revid: christophe.chauvet@syleam.fr-20080812230228-evi0q3la4hgyfq3v --- bin/osv/orm.py | 9 ++++++++- bin/tools/convert.py | 8 +++++++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index 0178c2d078a..6b478a3af9b 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -48,7 +48,6 @@ import time import types -from xml import dom, xpath import string import netsvc import re @@ -58,6 +57,14 @@ import pickle import fields import tools +import sys +try: + from xml import dom, xpath +except ImportError: + sys.stderr.write("ERROR: Import xpath module\n") + sys.stderr.write("ERROR: Try to install the old python-xml package\n") + sys.exit(2) + from tools.config import config regex_order = re.compile('^([a-zA-Z0-9_]+( desc)?( asc)?,?)+$', re.I) diff --git a/bin/tools/convert.py b/bin/tools/convert.py index 427467b909d..12b73f63a9a 100644 --- a/bin/tools/convert.py +++ b/bin/tools/convert.py @@ -41,7 +41,13 @@ import netsvc from config import config import logging -from lxml import etree +import sys +try: + from lxml import etree +except: + sys.stderr.write("ERROR: pythonic binding for the libxml2 and libxslt libraries is missing\n") + sys.stderr.write("ERROR: Try to install python-lxml package\n") + sys.exit(2) import pickle From 6228e0641bd81f45349dbeca3ab6583b080e5b87 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Wed, 8 Oct 2008 19:56:04 +0530 Subject: [PATCH 003/433] define actions in process bzr revid: solanki.priyesh@gmail.com-20081008142604-up8dif1m6ghngwqh --- addons/account/process/invoice_process.xml | 13 ++++- addons/account/process/statement_process.xml | 11 ++++ .../process/hr_timesheet_project_process.xml | 2 +- .../process/hr_timesheet_sheet_process.xml | 33 +++++++++++ addons/mrp/process/procurement_process.xml | 11 ++++ addons/project/process/task_process.xml | 39 +++++++++++++ addons/purchase/process/purchase_process.xml | 56 ++++++++++++++++++- addons/purchase/purchase.py | 2 +- 8 files changed, 163 insertions(+), 4 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 5fb1c522be1..66c5b6aef55 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -104,7 +104,7 @@ @@ -169,6 +169,17 @@ + + + + + + + + + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 57cfe332531..09caa7f72f2 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -130,6 +130,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml index d514b14bf17..0cc7032602d 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -58,7 +58,7 @@ - + diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 24374c2a810..3b818bd82ec 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -222,5 +222,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 583de318410..a6125811143 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -298,5 +298,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 6be52bd3490..03b8281072d 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -112,5 +112,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index d100c4a772c..96da7cbb8cd 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -105,7 +105,7 @@ - + @@ -150,6 +150,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 84074b0a0ae..440bc3859d3 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -231,7 +231,7 @@ class purchase_order(osv.osv): part,property_pref=['property_product_pricelist_purchase']).get('property_product_pricelist_purchase',False) return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist}} - def wkf_approve_order(self, cr, uid, ids): + def wkf_approve_order(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')}) return True From fe5356f7d57698d897e0a4d0cb2012aa123d3d97 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 10 Oct 2008 15:55:04 +0530 Subject: [PATCH 004/433] define actions in process bzr revid: solanki.priyesh@gmail.com-20081010102504-m47thbbqdv4kyrlw --- addons/account/process/invoice_process.xml | 4 +- addons/account/process/statement_process.xml | 2 +- .../process/hr_timesheet_sheet_process.xml | 8 +- addons/mrp/process/procurement_process.xml | 87 ++++++++- addons/product/process/product_process.xml | 2 +- addons/project/process/task_process.xml | 10 +- .../process/project_mrp_process.xml | 25 +++ addons/purchase/process/purchase_process.xml | 25 +-- addons/sale/process/sale_process.xml | 179 +++++++++--------- 9 files changed, 214 insertions(+), 128 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 66c5b6aef55..aeb2b786137 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -13,7 +13,7 @@ @@ -177,7 +177,7 @@ - + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 09caa7f72f2..3a153fab546 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -138,7 +138,7 @@ - + diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 3b818bd82ec..8033c06ee3f 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -229,28 +229,28 @@ - + - + - + - + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index a6125811143..136ae9a86ea 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -13,7 +13,7 @@ @@ -169,7 +169,7 @@ @@ -298,6 +298,24 @@ + + + + + + + + + + + + + + + + @@ -305,9 +323,72 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 9b675a11a84..d7e985eca7d 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -13,7 +13,7 @@ diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 03b8281072d..9ba6a39b9dc 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -119,35 +119,35 @@ - + - + - + - + - + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 0c856b7a96d..2dd89b84add 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -80,5 +80,30 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 96da7cbb8cd..56b3b8d1180 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -158,52 +158,37 @@ - + - + - + - + . - + - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index e6b7c1a3c52..829fcc61bf7 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -118,6 +118,18 @@ + + + + + + + + + + + + @@ -125,22 +137,9 @@ + - - - - - - - - - - - - - - @@ -148,28 +147,7 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -178,52 +156,15 @@ - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - @@ -249,25 +190,79 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + From 92ab49dee4ba559f55131caa5c924a9904d183f8 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 10 Oct 2008 18:13:41 +0530 Subject: [PATCH 005/433] define roles in process wherever necessary bzr revid: solanki.priyesh@gmail.com-20081010124341-g0ddcgjepuhp5131 --- addons/account/process/invoice_process.xml | 9 +++++++++ addons/account/process/statement_process.xml | 4 ++-- .../process/hr_timesheet_sheet_process.xml | 9 +++++++++ addons/mrp/process/procurement_process.xml | 13 ++++++++++++- .../project_mrp/process/project_mrp_process.xml | 1 + addons/purchase/process/purchase_process.xml | 16 +++++++++++++++- 6 files changed, 48 insertions(+), 4 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index aeb2b786137..37575e9b653 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -106,6 +106,14 @@ + + + + + + + + @@ -123,6 +131,7 @@ + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 3a153fab546..df5a544a293 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -85,8 +85,8 @@ - - + + diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 8033c06ee3f..f21378fee04 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -140,6 +140,14 @@ + + + + + + + + @@ -166,6 +174,7 @@ + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 136ae9a86ea..38fdbeecaea 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -170,7 +170,15 @@ + --> + + + + + + + + @@ -215,6 +223,7 @@ + @@ -251,6 +260,7 @@ + @@ -260,6 +270,7 @@ + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 2dd89b84add..b9c07b7bf6d 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -78,6 +78,7 @@ + - + + + + + + + + + + + + + @@ -104,6 +116,7 @@ + @@ -122,6 +135,7 @@ + From 30f8efb014c84afe20fbb51248a69a913bb9d93f Mon Sep 17 00:00:00 2001 From: Harshad Modi Date: Mon, 13 Oct 2008 11:52:33 +0530 Subject: [PATCH 006/433] fixed bug on duplicate picking bzr revid: hmo@tinyerp.com-20081013062233-ahwfg6mc7maimy3c --- addons/stock/stock.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index a981f21f674..f0c71c1199f 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -320,6 +320,8 @@ class stock_picking(osv.osv): _description = "Packing list" def _set_maximum_date(self, cr, uid, ids, name, value, arg, context): if not value: return False + if isinstance(ids, (int, long)): + ids=[ids] for pick in self.browse(cr, uid, ids, context): cr.execute("""update stock_move set date_planned=%s @@ -330,6 +332,8 @@ class stock_picking(osv.osv): def _set_minimum_date(self, cr, uid, ids, name, value, arg, context): if not value: return False + if isinstance(ids, (int, long)): + ids=[ids] for pick in self.browse(cr, uid, ids, context): cr.execute("""update stock_move set date_planned=%s From 310016d57b0620c34ed8565ca1c3396eedf8cc59 Mon Sep 17 00:00:00 2001 From: Jay Vora Date: Mon, 13 Oct 2008 12:35:50 +0530 Subject: [PATCH 007/433] bugfix:column violation bzr revid: jvo@tinyerp.com-20081013070550-bfdycl15y303p1x7 --- addons/l10n_be/account.report.report.csv | 42 ++++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/addons/l10n_be/account.report.report.csv b/addons/l10n_be/account.report.report.csv index 0ae4993b5de..069de01714f 100644 --- a/addons/l10n_be/account.report.report.csv +++ b/addons/l10n_be/account.report.report.csv @@ -1,21 +1,21 @@ -expression,note,parent_id,sequence,expression_status,style,type,code,name -0,,,,0,1,indicator,BILAN,Bilan -"report('BIMMO','BSTOCK','BREAL','BDISPO')",,BILAN,,0,2,fiscal,Actif,Actif -balance('2'),,Actif,,0,3,indicator,BIMMO,Valeurs immobilisées -balance('3'),,Actif,2,0,3,indicator,BSTOCK,Stocks -balance('4'),,Actif,3,0,3,indicator,BREAL,Réalisable -balance('5'),,Actif,4,0,3,fiscal,BDISPO,Disponible -report('BCAP') + report('BRESNET'),,BILAN,1,0,2,fiscal,PASSIF,Passif -balance('1'),,PASSIF,1,0,5,indicator,BCAP,Capitaux propores --balance('7')+balance('6'),,PASSIF,,0,3,fiscal,BRESNET,Résultat net -0,,,,0,1,fiscal,CRES,Compte des résultats -"report('CCHAR','CBENEF')",,CRES,,0,2,fiscal,CRESACTIF,Résultat Actif -balance('6'),,CRESACTIF,,0,2,fiscal,CCHAR,Total des charges -report('CRESPROD'),,CRES,,0,2,fiscal,CRESPASSIF,Résultat Passif --balance('7'),,CRESPASSIF,,0,2,fiscal,CRESPROD,Total des produits --balance('7')+balance('6'),,CRESACTIF,,0,2,fiscal,CBENEF,Résultat (Bénéfice) -0,,,,0,3,indicator,IIMMO,Immobilisations -"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.",IIMMO,,"balance('1')/balance(map(str(range(21,29)))) - 1",3,indicator,CIMMO,Couverture des immobilisations -0,,,,0,2,indicator,ITRE,Trésorerie -"balance('3','4','5') / balance('101','13','15','16','17','18')",Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme,ITRE,,"balance('3','4','5') / balance('101','13','15','16','17','18')",3,indicator,IFR,Indice du fond de roulement -"balance('4','5') / balance('101','13','15','16','17','18')",,ITRE,,"balance('4','5') / balance('101','13','15','16','17','18')",5,indicator,RTRE,Ratio de trésorerie +"expression","note","parent_id","sequence","badness_limit","goodness_limit","type","code","name" +0,,,,0,2,"indicator","BILAN","Bilan" +"report('BIMMO','BSTOCK','BREAL','BDISPO')",,"BILAN",,0,1,"fiscal","Actif","Actif" +"balance('2')",,"Actif",,5,45,"indicator","BIMMO","Valeurs immobilisées" +"balance('3')",,"Actif",2,3,12,"indicator","BSTOCK","Stocks" +"balance('4')",,"Actif",3,0,78,"indicator","BREAL","Réalisable" +"balance('5')",,"Actif",4,4,12,"fiscal","BDISPO","Disponible" +"report('BCAP') + report('BRESNET')",,"BILAN",1,0,2,"fiscal","PASSIF","Passif" +"balance('1')",,"PASSIF",1,0,3,"indicator","BCAP","Capitaux propores" +"-balance('7')+balance('6')",,"PASSIF",,0,5,"fiscal","BRESNET","Résultat net" +0,,,,1,9,"fiscal","CRES","Compte des résultats" +"report('CCHAR','CBENEF')",,"CRES",,1,8,"fiscal","CRESACTIF","Résultat Actif" +"balance('6')",,"CRESACTIF",,0,0,"fiscal","CCHAR","Total des charges" +"report('CRESPROD')",,"CRES",,3,12,"fiscal","CRESPASSIF","Résultat Passif" +"-balance('7')",,"CRESPASSIF",,2,4,"fiscal","CRESPROD","Total des produits" +"-balance('7')+balance('6')",,"CRESACTIF",,"2",8,"fiscal","CBENEF","Résultat (Bénéfice)" +0,,,,0,7,"indicator","IIMMO","Immobilisations" +"balance('1')/balance(map(str(range(21,29))))","Dans une entreprise normalement équilibrée, les valeurs immobilisées sont couvertes en premier lieu par les capitaux propres et, en second lieu, par tout ou partie du passif à long terme. Idéalement, ce ratio (rapport entre capitaux permanents et les valeurs immobilisées) doit être suppérieur à l'unité.","IIMMO",,0,9,"indicator","CIMMO","Couverture des immobilisations" +0,,,,0,0,"indicator","ITRE","Trésorerie" +"balance('3','4','5') / balance('101','13','15','16','17','18')","Détermine si l'entreprise a la possibilité de s'acquitter de ses dettes à court terme dans des conditions normales. Calculé comme suit: (Stocks + Réalisable + Disponible ) / Passif exigible à court terme","ITRE",,0,0,"indicator","IFR","Indice du fond de roulement" +"balance('4','5') / balance('101','13','15','16','17','18')",,"ITRE",,0,6,"indicator","RTRE","Ratio de trésorerie" From 2e3683a640cde94f5aee624f8b6bff237b128096 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Mon, 13 Oct 2008 12:59:51 +0530 Subject: [PATCH 008/433] Delivery Prob Solved: I can t get amounts in the columns unit price and price, net totaland total. bzr revid: patelamit2003@gmail.com-20081013072951-rg38ydvo0mso626e --- addons/sale/report/shipping.py | 11 +++++++++++ addons/sale/report/shipping.rml | 8 ++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/addons/sale/report/shipping.py b/addons/sale/report/shipping.py index 55949fdeec1..ecfaba91eba 100644 --- a/addons/sale/report/shipping.py +++ b/addons/sale/report/shipping.py @@ -16,6 +16,17 @@ class shipping(report_sxw.rml_parse): super(shipping, self).__init__(cr, uid, name, context) self.localcontext.update({ 'time': time, + 'sum_total': self._sum_total, }) + + def _sum_total(self,data): + print "======data=======",data['id'] + self.cr.execute("SELECT sum(pt.list_price*sm.product_qty) FROM stock_picking as sp "\ + "LEFT JOIN stock_move sm ON (sp.id = sm.picking_id) "\ + "LEFT JOIN product_product pp ON (sm.product_id = pp.id) "\ + "LEFT JOIN product_template pt ON (pp.product_tmpl_id = pt.id) "\ + "WHERE sm.picking_id = %d "%(data['id'])) + sum_total = self.cr.fetchone()[0] or 0.00 + return sum_total report_sxw.report_sxw('report.sale.shipping','stock.picking','addons/sale/report/shipping.rml',parser=shipping) diff --git a/addons/sale/report/shipping.rml b/addons/sale/report/shipping.rml index 35bc22beba9..9deafa95de1 100644 --- a/addons/sale/report/shipping.rml +++ b/addons/sale/report/shipping.rml @@ -241,10 +241,10 @@ [[ line.product_uom and line.product_uom.name ]] - [[ line.sale_line_id and line.sale_line_id.price_unit ]] + [[ '%.2f' %((line.sale_line_id and line.sale_line_id.price_unit) or (line.product_id.lst_price) or '0.00') ]] - [[ line.sale_line_id and line.sale_line_id.price_subtotal ]] + [[ '%.2f' %((line.sale_line_id and line.sale_line_id.price_subtotal) or (line.product_qty*line.product_id.lst_price) or '0.00') ]] @@ -263,7 +263,7 @@ Net Total : - [[ o.sale_id and o.sale_id.amount_untaxed ]] + [[ '%.2f' %(o.sale_id and o.sale_id.amount_untaxed or sum_total(o) or '0.00') ]] @@ -276,7 +276,7 @@ Total : - [[ o.sale_id and o.sale_id.amount_total ]] + [[ '%.2f' % (o.sale_id and o.sale_id.amount_total or sum_total(o) or '0.00') ]] From cef660021dd7446a53be3dc6f54d458265a7d359 Mon Sep 17 00:00:00 2001 From: Harshad Modi Date: Mon, 13 Oct 2008 13:11:24 +0530 Subject: [PATCH 009/433] better view of configuration wizard of document module bzr revid: hmo@tinyerp.com-20081013074124-hw990ydbctp36p71 --- addons/document/document.py | 6 +++--- addons/document/document_view.xml | 21 ++++++++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/addons/document/document.py b/addons/document/document.py index deb830a6d7c..dfcdffd1431 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -597,8 +597,8 @@ class document_file(osv.osv): return super(document_file, self).unlink(cr, uid, ids, context) document_file() -class auto_configuration(osv.osv_memory): - _name='auto.configuration' +class document_configuration_wizard(osv.osv_memory): + _name='document.configuration.wizard' _rec_name = 'Auto Directory configuration' _columns = { } @@ -687,4 +687,4 @@ class auto_configuration(osv.osv_memory): doc_obj.create(cr,uid,res) return True -auto_configuration() \ No newline at end of file +document_configuration_wizard() diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index dfc3cc4c85a..6e947f3f800 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -201,21 +201,31 @@ Auto Configure Directory - auto.configuration + document.configuration.wizard form
-