diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 704eb79ab65..13288c6262f 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -61,9 +61,9 @@ "project/project_report.xml", "product_view.xml", "account_assert_test.xml", + "process/statement_process.xml", "process/customer_invoice_process.xml", "process/supplier_invoice_process.xml", - "process/statement_process.xml", ], "translations" : { "fr": "i18n/french_fr.csv" diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml index c3fedd1826e..7af469d142f 100755 --- a/addons/account/process/customer_invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -8,6 +8,7 @@ + @@ -61,13 +62,14 @@ - + + - + @@ -101,6 +103,19 @@ + + + + + + + + + + + + + @@ -102,36 +91,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml index 613aaaa4005..d20548f7eef 100755 --- a/addons/account/process/supplier_invoice_process.xml +++ b/addons/account/process/supplier_invoice_process.xml @@ -8,6 +8,7 @@ + @@ -51,10 +52,11 @@ - + + diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml index 8f653a90e2f..182eb70ca0e 100755 --- a/addons/base_contact/process/base_contact_process.xml +++ b/addons/base_contact/process/base_contact_process.xml @@ -9,6 +9,7 @@ + - - - - - diff --git a/addons/base_module_quality/method_test/method_test.py b/addons/base_module_quality/method_test/method_test.py index 1da2e06ad97..3d7f2650fad 100644 --- a/addons/base_module_quality/method_test/method_test.py +++ b/addons/base_module_quality/method_test/method_test.py @@ -38,6 +38,7 @@ class quality_test(base_module_quality.abstract_quality_check): # #""" self.bool_installed_only = True + self.ponderation = 1.0 return None def run_test(self, cr, uid, module_path, module_state): @@ -84,7 +85,7 @@ class quality_test(base_module_quality.abstract_quality_check): This test checks if the module classes are raising exception when calling basic methods or no. -""" + "Score: " + str(self.score) + "/10\n" +""" #+ "Score: " + str(self.score) + "/10\n" else: summary =""" \n===Method Test===: diff --git a/addons/base_module_quality/pylint_test/pylint_test.py b/addons/base_module_quality/pylint_test/pylint_test.py index 333f73f50dc..2620fa3e9cc 100644 --- a/addons/base_module_quality/pylint_test/pylint_test.py +++ b/addons/base_module_quality/pylint_test/pylint_test.py @@ -38,6 +38,7 @@ class quality_test(base_module_quality.abstract_quality_check): # #""" self.bool_installed_only = False + self.ponderation = 1.0 return None def run_test(self, cr, uid, module_path, module_state): @@ -82,7 +83,7 @@ class quality_test(base_module_quality.abstract_quality_check): This test checks if the module satisfy the current coding standard used by OpenERP. -""" + "Score: " + str(self.score) + "/10\n" +""" #+ "Score: " + str(self.score) + "/10\n" else: summary =""" \n===Pylint Test===: diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py index 248a500fa9c..4e6fb43a2b1 100644 --- a/addons/base_module_quality/speed_test/speed_test.py +++ b/addons/base_module_quality/speed_test/speed_test.py @@ -42,6 +42,7 @@ class quality_test(base_module_quality.abstract_quality_check): # #""" self.bool_installed_only = True + self.ponderation = 1.0 return None def run_test(self, cr, uid, module_path, module_state): pool = pooler.get_pool(cr.dbname) @@ -101,9 +102,9 @@ class quality_test(base_module_quality.abstract_quality_check): summary = """ ===Speed Test===: - This test checks the speed of the module. +This test checks the speed of the module. -"""+ "Score: " + str(self.score) + "/10\n" +"""#+ "Score: " + str(self.score) + "/10\n" else: summary =""" \n===Speed Test===: diff --git a/addons/base_module_quality/wizard/module_quality_check.py b/addons/base_module_quality/wizard/module_quality_check.py index c0640d9a078..3bf863764ac 100644 --- a/addons/base_module_quality/wizard/module_quality_check.py +++ b/addons/base_module_quality/wizard/module_quality_check.py @@ -66,6 +66,9 @@ class wiz_quality_check(osv.osv_memory): list_folders = os.listdir(config['addons_path']+'/base_module_quality/') module_name = module_data[0].name abstract_obj = base_module_quality.abstract_quality_check() + score_sum = 0.0 + ponderation_sum = 0.0 + final_score = "" for test in abstract_obj.tests: ad = tools.config['addons_path'] if module_data[0].name == 'base': @@ -73,14 +76,20 @@ class wiz_quality_check(osv.osv_memory): module_path = os.path.join(ad, module_data[0].name) val = test.quality_test() val.run_test(cr, uid, str(module_path), str(module_data[0].state)) - string_ret += val.result['summary'] - string_detail += val.result['detail'] + string_ret += val.result['summary'] #summary tab + string_ret += "Score: " + str(val.score) + "/10\n" #val.score = val.score * val.ponderation ??? + string_detail += val.result['detail'] # detail tab + score_sum += (val.add_quatation(val.score, 10) * val.ponderation) + ponderation_sum += val.ponderation + final_score = str(score_sum / ponderation_sum * 100) + "%" + string_ret += "\n\nPonderation Result for module:" + final_score self.string_detail = string_detail - return string_ret + return "" def _check_detail(self, cr, uid, data, context={}): return self.string_detail + # def _general_info(self, cr, uid, data, context={}): # return self.general_info @@ -98,16 +107,27 @@ class wiz_quality_check(osv.osv_memory): #~ 'result': {'type':'form', 'arch':form_check, 'fields':fields_check, 'state':[('end','Cancel'),('do','Do Test')]} #~ }, _columns = { - 'general_info': fields.text('General Info', readonly="1",), - 'detail' : fields.text('Detail', readonly="1",), - 'verbose_detail' : fields.text('Verbose Detail', readonly="1",) +# 'general_info': fields.text('General Info', readonly="1",), +# 'detail' : fields.text('Detail', readonly="0",), + 'verbose_detail' : fields.one2many('quality.check.detail', 'quality_check', 'Verbose Detail', readonly="0",) } _defaults = { - 'general_info': _check, - 'detail': _check_detail +# 'general_info': _check, +# 'detail': _check_detail + 'verbose_detail': _check, } wiz_quality_check() +class quality_check_detail(osv.osv_memory): + _name = 'quality.check.detail' + _rec_name = 'quality_check' + _columns = { + 'quality_check': fields.many2one('wizard.quality.check', 'Quality'), + 'general_info': fields.text('General Info', readonly="1",), + 'detail' : fields.text('Detail', readonly="1",), + } +quality_check_detail() + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_configuration/process/crm_configuration_process.xml b/addons/crm_configuration/process/crm_configuration_process.xml index 1cb82e4f67e..89ca44ecf54 100755 --- a/addons/crm_configuration/process/crm_configuration_process.xml +++ b/addons/crm_configuration/process/crm_configuration_process.xml @@ -8,6 +8,7 @@ + @@ -17,7 +18,7 @@ - + @@ -37,7 +38,7 @@ - + diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml index 42c9fd022ab..d1fb9b951aa 100755 --- a/addons/hr/process/hr_process.xml +++ b/addons/hr/process/hr_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml index f333fdf5715..dfc9c04774b 100755 --- a/addons/hr_expense/process/hr_expense_process.xml +++ b/addons/hr_expense/process/hr_expense_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml index e78b140b6a7..91a236932d2 100755 --- a/addons/hr_holidays/process/hr_holidays_process.xml +++ b/addons/hr_holidays/process/hr_holidays_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml index 64c325d5cd5..aee609b5120 100755 --- a/addons/hr_timesheet/process/hr_timesheet_process.xml +++ b/addons/hr_timesheet/process/hr_timesheet_process.xml @@ -8,6 +8,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 a664be5e1ee..c29de87a601 100755 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml index 3ebe7c6cf6c..bd8d7b7414d 100755 --- a/addons/membership/process/membership_process.xml +++ b/addons/membership/process/membership_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index a1c2429f917..79d33a8e98d 100755 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -8,13 +8,38 @@ + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -115,6 +140,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/mrp/process/service_product_process.xml b/addons/mrp/process/service_product_process.xml index abaa418331e..e7aacaaf044 100644 --- a/addons/mrp/process/service_product_process.xml +++ b/addons/mrp/process/service_product_process.xml @@ -8,6 +8,7 @@ + @@ -15,17 +16,6 @@ Process Node --> - - - - - - - - - - - @@ -41,7 +31,7 @@ - + @@ -64,24 +54,6 @@ Process Transition --> - - - - - - - - - - - - - - - - - - diff --git a/addons/mrp/process/stockable_product_process.xml b/addons/mrp/process/stockable_product_process.xml index 9c885d51942..92da99f635e 100644 --- a/addons/mrp/process/stockable_product_process.xml +++ b/addons/mrp/process/stockable_product_process.xml @@ -8,6 +8,7 @@ + @@ -15,17 +16,6 @@ Process Node --> - - - - - - - - - - - @@ -75,24 +65,6 @@ Process Transition --> - - - - - - - - - - - - - - - - - - diff --git a/addons/mrp_operations/__terp__.py b/addons/mrp_operations/__terp__.py index 9132b252552..f523fc11487 100755 --- a/addons/mrp_operations/__terp__.py +++ b/addons/mrp_operations/__terp__.py @@ -55,7 +55,8 @@ "demo_xml" : ["mrp_operation_data.xml"], "update_xml" : [ "security/ir.model.access.csv", - "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml" + "mrp_operations_workflow.xml","mrp_operations_view.xml","mrp_operations_report.xml", + "process/mrp_operation_process.xml" ], "active": False, "installable": True diff --git a/addons/mrp_operations/mrp_operations.py b/addons/mrp_operations/mrp_operations.py index 72316aca8bd..0de73bad7e5 100755 --- a/addons/mrp_operations/mrp_operations.py +++ b/addons/mrp_operations/mrp_operations.py @@ -47,14 +47,14 @@ class mrp_production_workcenter_line(osv.osv): 'date_planned': fields.related('production_id', 'date_planned', type='datetime', string='Date Planned'), 'date_start': fields.datetime('Start Date'), 'date_finnished': fields.datetime('End Date'), - 'delay': fields.float('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True), + 'delay': fields.char('Delay',size=128,help="This is delay between operation start and stop in this workcenter",readonly=True), 'product':fields.related('production_id','product_id',type='many2one',relation='product.product',string='Product'), 'qty':fields.related('production_id','product_qty',type='float',string='Qty'), 'uom':fields.related('production_id','product_uom',type='many2one',relation='product.uom',string='UOM'), } _defaults = { 'state': lambda *a: 'draft', - 'delay': lambda *a: 0.0 + 'delay': lambda *a: '0 Days 0 hrs and 0 mins' } def modify_production_order_state(self,cr,uid,ids,action): diff --git a/addons/mrp_operations/process/mrp_operation_process.xml b/addons/mrp_operations/process/mrp_operation_process.xml new file mode 100644 index 00000000000..013a629d3a7 --- /dev/null +++ b/addons/mrp_operations/process/mrp_operation_process.xml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py index 18f37db8806..d11313bd4f0 100644 --- a/addons/point_of_sale/pos.py +++ b/addons/point_of_sale/pos.py @@ -822,7 +822,7 @@ class pos_order_line(osv.osv): product_id = self.pool.get('product.product').search(cr, uid, [('ean13','=', ean)]) if not product_id: - return false + return False # search price product product = self.pool.get('product.product').read(cr, uid, product_id) diff --git a/addons/process/process.py b/addons/process/process.py index 94bbd6daaa1..ab4bf724da0 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -71,7 +71,6 @@ class process_process(osv.osv): res = pool.get('process.process').browse(cr, uid, res, context) for process in res: result.append((process.id, process.name)) - return result # else search process nodes @@ -85,7 +84,7 @@ class process_process(osv.osv): return result def graph_get(self, cr, uid, id, res_model, res_id, scale, context): - + pool = pooler.get_pool(cr.dbname) process = pool.get('process.process').browse(cr, uid, [id])[0] diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 4ff800ad0cc..c3564e09b1d 100755 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 8dfc3a340d3..f713baad82e 100755 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 38a2fce7460..8893d0b9df8 100755 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 46e13d1d6d2..5c98b95dd48 100755 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -8,6 +8,7 @@ + diff --git a/addons/wiki/__terp__.py b/addons/wiki/__terp__.py index 2729cc25a51..547fe8d70e0 100644 --- a/addons/wiki/__terp__.py +++ b/addons/wiki/__terp__.py @@ -1,7 +1,7 @@ { "name" : "Document Management - Wiki", "version" : "1.0", - "author" : "Tiny", + "author" : "Tiny & Axelor", "description": """ The base module to manage documents(wiki)