From 56d6d3235d98f8889df5c86538a85adb4c1a89cb Mon Sep 17 00:00:00 2001 From: Priyesh Date: Tue, 23 Sep 2008 18:28:32 +0530 Subject: [PATCH 01/16] made sale_process.xml for sales workflow in sale module bzr revid: solanki.priyesh@gmail.com-20080923125832-5ly7v74to7202t1t --- addons/process/__terp__.py | 1 + addons/sale/process/sale_process.xml | 243 +++++++++++++++++++++++++++ 2 files changed, 244 insertions(+) create mode 100644 addons/sale/process/sale_process.xml diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index f8cbf4ad927..80008ca6181 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -14,6 +14,7 @@ This module allows you to manage your process for the end-users. "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', + '../sale/process/sale_process.xml' ], "active": False, "installable": True diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml new file mode 100644 index 00000000000..6865fa8a57b --- /dev/null +++ b/addons/sale/process/sale_process.xml @@ -0,0 +1,243 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 457ada6dff32509b78495d22c4d9e60da40232d3 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 26 Sep 2008 20:18:14 +0530 Subject: [PATCH 02/16] Demo of all process bzr revid: solanki.priyesh@gmail.com-20080926144814-4lyid0srfi35ff1d --- addons/account/process/invoice_process.xml | 214 ++++++++++++++++++ addons/account/process/statement_process.xml | 135 +++++++++++ .../process/hr_timesheet_process.xml | 135 +++++++++++ .../process/hr_timesheet_sheet_process.xml | 154 +++++++++++++ addons/process/__terp__.py | 13 +- addons/product/process/product_process.xml | 141 ++++++++++++ addons/project/process/task_process.xml | 177 +++++++++++++++ addons/purchase/process/purchase_process.xml | 155 +++++++++++++ 8 files changed, 1123 insertions(+), 1 deletion(-) create mode 100644 addons/account/process/invoice_process.xml create mode 100644 addons/account/process/statement_process.xml create mode 100644 addons/hr_timesheet/process/hr_timesheet_process.xml create mode 100644 addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml create mode 100644 addons/product/process/product_process.xml create mode 100644 addons/project/process/task_process.xml create mode 100644 addons/purchase/process/purchase_process.xml diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml new file mode 100644 index 00000000000..7e8e3ef7c7a --- /dev/null +++ b/addons/account/process/invoice_process.xml @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml new file mode 100644 index 00000000000..10365e76df0 --- /dev/null +++ b/addons/account/process/statement_process.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml new file mode 100644 index 00000000000..9af5f1453a3 --- /dev/null +++ b/addons/hr_timesheet/process/hr_timesheet_process.xml @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml new file mode 100644 index 00000000000..8ba8e0392d9 --- /dev/null +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -0,0 +1,154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index 80008ca6181..b692a8f3c8e 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -10,7 +10,18 @@ This module allows you to manage your process for the end-users. """, "depends" : ["base", "sale"], "init_xml" : [], - "demo_xml" : ['process_demo.xml'], +# "demo_xml" : ['process_demo.xml'], + "demo_xml" : [ + '../sale/process/sale_process.xml', + '../hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml', + '../account/process/invoice_process.xml', + '../account/process/statement_process.xml', + '../project/process/task_process.xml', + '../hr_timesheet/process/hr_timesheet_process.xml', + '../purchase/process/purchase_process.xml', + '../product/process/product_process.xml', + ] + "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml new file mode 100644 index 00000000000..73d28808133 --- /dev/null +++ b/addons/product/process/product_process.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml new file mode 100644 index 00000000000..9f5da3b2de0 --- /dev/null +++ b/addons/project/process/task_process.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml new file mode 100644 index 00000000000..05a1857cbe3 --- /dev/null +++ b/addons/purchase/process/purchase_process.xml @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 5c02f5e44e62870e1df882e629baaf5e9056f18b Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 29 Sep 2008 12:44:10 +0530 Subject: [PATCH 03/16] demo for procurement flow bzr revid: solanki.priyesh@gmail.com-20080929071410-xc0t6oqb2tvvcv8f --- addons/mrp/process/procurement_process.xml | 275 +++++++++++++++++++++ addons/process/__terp__.py | 1 + 2 files changed, 276 insertions(+) create mode 100644 addons/mrp/process/procurement_process.xml diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml new file mode 100644 index 00000000000..73e12053143 --- /dev/null +++ b/addons/mrp/process/procurement_process.xml @@ -0,0 +1,275 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index b692a8f3c8e..2dbab4d079c 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -20,6 +20,7 @@ This module allows you to manage your process for the end-users. '../hr_timesheet/process/hr_timesheet_process.xml', '../purchase/process/purchase_process.xml', '../product/process/product_process.xml', + '../mrp/process/procurement_process.xml', ] "update_xml" : [ From ce6f095b2d8bac105e7e17c2cb0f90d42875f517 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 29 Sep 2008 14:10:56 +0530 Subject: [PATCH 04/16] modified terp files bzr revid: solanki.priyesh@gmail.com-20080929084056-35wl5hygi2b5ny30 --- addons/account/__terp__.py | 4 +++- addons/hr_timesheet/__terp__.py | 3 ++- addons/hr_timesheet_sheet/__terp__.py | 5 +++-- addons/mrp/__terp__.py | 3 ++- addons/process/__terp__.py | 14 +------------- addons/product/__terp__.py | 5 +++-- addons/project/__terp__.py | 3 ++- addons/purchase/__terp__.py | 3 ++- addons/sale/__terp__.py | 3 ++- 9 files changed, 20 insertions(+), 23 deletions(-) diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 2051c8dc501..bed1cc2a0b6 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -29,7 +29,7 @@ { "name" : "Accounting and financial management", "version" : "1.0", - "depends" : ["product", "base"], + "depends" : ["product", "base", "process"], "author" : "Tiny", "description": """Financial and accounting module that covers: General accounting @@ -66,6 +66,8 @@ "project/project_report.xml", "product_view.xml", "account_assert_test.xml", + "process/invoice_process.xml" + "process/statement_process.xml" ], "translations" : { "fr": "i18n/french_fr.csv" diff --git a/addons/hr_timesheet/__terp__.py b/addons/hr_timesheet/__terp__.py index 1004f06d903..fd84f3fb051 100644 --- a/addons/hr_timesheet/__terp__.py +++ b/addons/hr_timesheet/__terp__.py @@ -43,7 +43,7 @@ Lots of reporting on time and employee tracking are provided. It is completly integrated with the cost accounting module. It allows you to set up a management by affair. """, - "depends" : ["account", "hr", "base", "hr_attendance"], + "depends" : ["account", "hr", "base", "hr_attendance", "process"], "init_xml" : ["hr_timesheet_data.xml"], "demo_xml" : ["hr_timesheet_demo.xml",], "update_xml" : [ @@ -51,6 +51,7 @@ to set up a management by affair. "hr_timesheet_view.xml", "hr_timesheet_report.xml", "hr_timesheet_wizard.xml", + "process/hr_timesheet_process.xml" ], "active": False, "installable": True diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py index 4c307a5af33..19419f71dd1 100644 --- a/addons/hr_timesheet_sheet/__terp__.py +++ b/addons/hr_timesheet_sheet/__terp__.py @@ -51,13 +51,14 @@ The validation can be configured in te company: * Period size (day, week, month, year) * Maximal difference between timesheet and attendances """, - "depends" : ["hr_timesheet", "hr_timesheet_invoice"], + "depends" : ["hr_timesheet", "hr_timesheet_invoice", "process"], "init_xml" : [], "demo_xml" : ["hr_timesheet_sheet_demo.xml",], "update_xml" : [ "security/ir.model.access.csv", "hr_timesheet_sheet_view.xml", - "hr_timesheet_workflow.xml" + "hr_timesheet_workflow.xml", + "process/hr_timesheet_sheet_process.xml" ], "active": False, "installable": True diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index 8fa15f145fd..ea672858ebc 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -32,7 +32,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_mrp.html", "category" : "Generic Modules/Production", - "depends" : ["stock", "hr", "purchase", "product"], + "depends" : ["stock", "hr", "purchase", "product", "process"], "description": """ This is the base module to manage the manufacturing process in Tiny ERP. @@ -70,6 +70,7 @@ "mrp_wizard.xml", "mrp_report.xml", "company_view.xml", + "process/procurement_process.xml" ], "active": False, "installable": True diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index 2dbab4d079c..80008ca6181 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -10,19 +10,7 @@ This module allows you to manage your process for the end-users. """, "depends" : ["base", "sale"], "init_xml" : [], -# "demo_xml" : ['process_demo.xml'], - "demo_xml" : [ - '../sale/process/sale_process.xml', - '../hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml', - '../account/process/invoice_process.xml', - '../account/process/statement_process.xml', - '../project/process/task_process.xml', - '../hr_timesheet/process/hr_timesheet_process.xml', - '../purchase/process/purchase_process.xml', - '../product/process/product_process.xml', - '../mrp/process/procurement_process.xml', - ] - + "demo_xml" : ['process_demo.xml'], "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py index 34cd432b10e..c9e52f9b7e5 100644 --- a/addons/product/__terp__.py +++ b/addons/product/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "category" : "Generic Modules/Inventory Control", - "depends" : ["base"], + "depends" : ["base", "process"], "init_xml" : [], "demo_xml" : ["product_demo.xml"], "description": """ @@ -57,7 +57,8 @@ "security/ir.model.access.csv", "product_data.xml","product_report.xml", "product_view.xml", "pricelist_view.xml", - "partner_view.xml", "product_wizard.xml"], + "partner_view.xml", "product_wizard.xml", + "process/product_process.xml"], "active": False, "installable": True } diff --git a/addons/project/__terp__.py b/addons/project/__terp__.py index cbef75ca0e3..d153de14336 100644 --- a/addons/project/__terp__.py +++ b/addons/project/__terp__.py @@ -32,7 +32,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_project.html", "category" : "Generic Modules/Projects & Services", - "depends" : ["product", "account", "hr"], + "depends" : ["product", "account", "hr", "process"], "description": "Project management module that track multi-level projects, tasks, works done on tasks, eso. It is able to render planning, order tasks, eso.", "init_xml" : [], "demo_xml" : ["project_demo.xml"], @@ -43,6 +43,7 @@ "project_wizard.xml", "project_view.xml", "project_report.xml", + "process/task_process.xml" ], "active": False, "installable": True diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py index d5d50f6d5f8..ec218e520c5 100644 --- a/addons/purchase/__terp__.py +++ b/addons/purchase/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com/module_purchase.html", - "depends" : ["base", "account", "stock"], + "depends" : ["base", "account", "stock", "process"], "category" : "Generic Modules/Sales & Purchases", "init_xml" : [], "demo_xml" : ["purchase_demo.xml", @@ -48,6 +48,7 @@ "purchase_wizard.xml", "stock_view.xml", "partner_view.xml" + "process/purchase_process.xml" ], "active": False, "installable": True diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py index d5bc58a98ae..6dbd080b853 100644 --- a/addons/sale/__terp__.py +++ b/addons/sale/__terp__.py @@ -31,7 +31,7 @@ "version" : "1.0", "author" : "Tiny", "website" : "http://tinyerp.com/module_sale.html", - "depends" : ["product", "stock", "mrp"], + "depends" : ["product", "stock", "mrp", "process"], "category" : "Generic Modules/Sales & Purchases", "init_xml" : [], "demo_xml" : ["sale_demo.xml"], @@ -62,6 +62,7 @@ "sale_report.xml", "sale_wizard.xml", "stock_view.xml", + "process/sale_process.xml" ], "active": False, "installable": True From f56900c5686b03fb5b10b2dbae8df5d1f76eb0c3 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Tue, 30 Sep 2008 19:01:00 +0530 Subject: [PATCH 05/16] modified files for demo of process bzr revid: solanki.priyesh@gmail.com-20080930133100-fwqoguvrwpy41poc --- addons/.pydevproject | 6 + addons/account/__terp__.py | 2 +- addons/account/process/invoice_process.xml | 40 ------ .../process/hr_timesheet_process.xml | 119 ------------------ addons/hr_timesheet_project/__terp__.py | 4 +- .../process/hr_timesheet_project_process.xml | 75 +++++++++++ addons/hr_timesheet_sheet/__terp__.py | 2 +- .../process/hr_timesheet_sheet_process.xml | 108 +++++++++++++--- addons/mrp/__terp__.py | 2 +- addons/mrp/process/procurement_process.xml | 109 ++++++++++------ addons/process/__terp__.py | 7 +- addons/product/__terp__.py | 3 +- addons/product/process/product_process.xml | 47 ------- addons/project/process/task_process.xml | 63 +--------- addons/project_mrp/__terp__.py | 6 +- .../process/project_mrp_process.xml | 84 +++++++++++++ addons/purchase/__terp__.py | 2 +- addons/purchase/process/purchase_process.xml | 32 ++--- addons/sale/__terp__.py | 2 +- addons/sale/process/sale_process.xml | 77 ++++++++---- addons/scrum/__terp__.py | 3 +- addons/scrum/process/scrum_process.xml | 34 +++++ 22 files changed, 446 insertions(+), 381 deletions(-) create mode 100644 addons/.pydevproject create mode 100644 addons/hr_timesheet_project/process/hr_timesheet_project_process.xml create mode 100644 addons/project_mrp/process/project_mrp_process.xml create mode 100644 addons/scrum/process/scrum_process.xml diff --git a/addons/.pydevproject b/addons/.pydevproject new file mode 100644 index 00000000000..78259a9c3db --- /dev/null +++ b/addons/.pydevproject @@ -0,0 +1,6 @@ + + + + +python 2.4 + diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index bed1cc2a0b6..01d9f9e499f 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -66,7 +66,7 @@ "project/project_report.xml", "product_view.xml", "account_assert_test.xml", - "process/invoice_process.xml" + "process/invoice_process.xml", "process/statement_process.xml" ], "translations" : { diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 7e8e3ef7c7a..e38d3d8b288 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -16,28 +16,6 @@ Process Node --> - - - - - - - - - - - - - - - - - - - - - - @@ -129,24 +107,6 @@ Process Transition --> - - - - - - - - - - - - - - - - - - diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml index 9af5f1453a3..157ffc09deb 100644 --- a/addons/hr_timesheet/process/hr_timesheet_process.xml +++ b/addons/hr_timesheet/process/hr_timesheet_process.xml @@ -12,124 +12,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/hr_timesheet_project/__terp__.py b/addons/hr_timesheet_project/__terp__.py index bc2db6c0d8c..06922784d56 100644 --- a/addons/hr_timesheet_project/__terp__.py +++ b/addons/hr_timesheet_project/__terp__.py @@ -33,8 +33,8 @@ "category" : "Generic Modules/Human Resources", "description": """Auto-complete timesheet based on tasks made on the project management module.""", "website" : "http://tinyerp.com/module_hr.html", - "depends" : ["project", "hr_timesheet"], - "update_xml" : ["hr_timesheet_project_view.xml"], + "depends" : ["project", "hr_timesheet_sheet"], + "update_xml" : ["hr_timesheet_project_view.xml", "process/hr_timesheet_project_process.xml"], "active": False, "installable": True } diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml new file mode 100644 index 00000000000..5c96a0c8239 --- /dev/null +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_sheet/__terp__.py b/addons/hr_timesheet_sheet/__terp__.py index 19419f71dd1..f09a7d63978 100644 --- a/addons/hr_timesheet_sheet/__terp__.py +++ b/addons/hr_timesheet_sheet/__terp__.py @@ -58,7 +58,7 @@ The validation can be configured in te company: "security/ir.model.access.csv", "hr_timesheet_sheet_view.xml", "hr_timesheet_workflow.xml", - "process/hr_timesheet_sheet_process.xml" + "process/hr_timesheet_sheet_process.xml", ], "active": False, "installable": True 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 8ba8e0392d9..2e59204aa30 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -15,18 +15,63 @@ - - - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -96,15 +141,6 @@ Process Transition --> - - - - - - - - - @@ -149,6 +185,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index ea672858ebc..3f4b301fe11 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -70,7 +70,7 @@ "mrp_wizard.xml", "mrp_report.xml", "company_view.xml", - "process/procurement_process.xml" + "process/procurement_process.xml", ], "active": False, "installable": True diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 73e12053143..f0eae8dd157 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -15,6 +15,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27,17 +58,6 @@ - - - - - - - - - - - @@ -93,17 +113,6 @@ - - - - - - - - - - - @@ -172,15 +181,6 @@ - - - - - - - - - @@ -217,15 +217,6 @@ - - - - - - - - - @@ -270,6 +261,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index 80008ca6181..ca48fada8a6 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -8,14 +8,13 @@ "description": """ This module allows you to manage your process for the end-users. """, - "depends" : ["base", "sale"], + "depends" : ["base"], "init_xml" : [], - "demo_xml" : ['process_demo.xml'], + "demo_xml" : [], "update_xml" : [ "security/ir.model.access.csv", 'process_view.xml', - '../sale/process/sale_process.xml' - ], + ], "active": False, "installable": True } diff --git a/addons/product/__terp__.py b/addons/product/__terp__.py index c9e52f9b7e5..0328b8d03e9 100644 --- a/addons/product/__terp__.py +++ b/addons/product/__terp__.py @@ -58,7 +58,8 @@ "product_data.xml","product_report.xml", "product_view.xml", "pricelist_view.xml", "partner_view.xml", "product_wizard.xml", - "process/product_process.xml"], + "process/product_process.xml" + ], "active": False, "installable": True } diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 73d28808133..987f86331ae 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -27,26 +27,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -83,24 +63,6 @@ Process Transition --> - - - - - - - - - - - - - - - - - - @@ -110,15 +72,6 @@ - - - - - - - - - diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 9f5da3b2de0..4fef858fa8e 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -16,17 +16,6 @@ Process Node --> - - - - - - - - - - - @@ -38,17 +27,6 @@ - - - - - - - - - - - @@ -94,31 +72,10 @@ - - - - - - - - - - - - - - - - - - - - - @@ -128,15 +85,6 @@ - - - - - - - - - @@ -163,15 +111,6 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/addons/project_mrp/__terp__.py b/addons/project_mrp/__terp__.py index 208b879cef7..e83b5e832db 100644 --- a/addons/project_mrp/__terp__.py +++ b/addons/project_mrp/__terp__.py @@ -5,7 +5,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_project.html", "category" : "Generic Modules/Projects & Services", - "depends" : ["project", 'mrp'], + "depends" : ["project", 'mrp', "sale"], "description": """ This module is used to automatically create tasks base on different procurements: sales order, manufacturing order, ... @@ -15,7 +15,9 @@ order on services products. """, "init_xml" : [], "demo_xml" : [], - "update_xml": ["project_workflow.xml"], + "update_xml": ["project_workflow.xml", + "process/project_mrp_process.xml" + ], "active": False, "installable": True } diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml new file mode 100644 index 00000000000..c8bd1738314 --- /dev/null +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/__terp__.py b/addons/purchase/__terp__.py index ec218e520c5..0c24b8df2f4 100644 --- a/addons/purchase/__terp__.py +++ b/addons/purchase/__terp__.py @@ -47,7 +47,7 @@ "purchase_report.xml", "purchase_wizard.xml", "stock_view.xml", - "partner_view.xml" + "partner_view.xml", "process/purchase_process.xml" ], "active": False, diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 05a1857cbe3..ce69d273c01 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -16,14 +16,14 @@ Process Node --> - - - + + + - - - - + + + + @@ -96,15 +96,6 @@ - - - - - - - - - @@ -150,6 +141,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/addons/sale/__terp__.py b/addons/sale/__terp__.py index 6dbd080b853..fd9e2440794 100644 --- a/addons/sale/__terp__.py +++ b/addons/sale/__terp__.py @@ -62,7 +62,7 @@ "sale_report.xml", "sale_wizard.xml", "stock_view.xml", - "process/sale_process.xml" + "process/sale_process.xml", ], "active": False, "installable": True diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 6865fa8a57b..217172d46e2 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -1,11 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -62,24 +93,6 @@ - - - - - - - - - - - - - - - - - - @@ -90,6 +103,10 @@ + + @@ -97,6 +114,10 @@ + + @@ -211,12 +232,22 @@ - + + - - - - + + + + + + + + + + + + + diff --git a/addons/scrum/__terp__.py b/addons/scrum/__terp__.py index 7be9cb422be..dfb466307c0 100644 --- a/addons/scrum/__terp__.py +++ b/addons/scrum/__terp__.py @@ -30,7 +30,7 @@ "name" : "Scrum, Agile Development Method", "version": "1.0", "author" : "Tiny", - "depends" : ["project"], + "depends" : ["project", "process"], "category" : "Enterprise Specific Modules/Information Technology", "init_xml" : [], "description": """ @@ -61,6 +61,7 @@ "scrum_view.xml", "scrum_report.xml", "scrum_wizard.xml", + "process/scrum_process.xml", ], "active": False, "installable": True diff --git a/addons/scrum/process/scrum_process.xml b/addons/scrum/process/scrum_process.xml new file mode 100644 index 00000000000..9fbaec3964b --- /dev/null +++ b/addons/scrum/process/scrum_process.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From df723755044ac4af0ee4e989e99ecc166cacac6e Mon Sep 17 00:00:00 2001 From: Naresh Choksy Date: Tue, 7 Oct 2008 17:18:28 +0530 Subject: [PATCH 06/16] changed tag to bzr revid: nch@tinyerp.com-20081007114828-92lmkwru2s5dc1yq --- addons/base_contact/base_contact_demo.xml | 4 ++-- addons/base_module_record/base_module_record.py | 2 +- addons/document/custom_report.xml | 4 ++-- addons/document/custom_view.xml | 4 ++-- addons/document/document_data.xml | 4 ++-- addons/document/document_demo.xml | 4 ++-- addons/document/document_view.xml | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/base_contact/base_contact_demo.xml b/addons/base_contact/base_contact_demo.xml index 6efa01a7267..00104813896 100644 --- a/addons/base_contact/base_contact_demo.xml +++ b/addons/base_contact/base_contact_demo.xml @@ -1,5 +1,5 @@ - + @@ -323,4 +323,4 @@ 1 - + diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 1a623b2dbb5..17ff37645f6 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -172,7 +172,7 @@ class base_module_record(osv.osv): # Create the minidom document self.ids = {} doc = minidom.Document() - terp = doc.createElement("terp") + terp = doc.createElement("openerp") doc.appendChild(terp) for rec in self.recording_data: if rec[0]=='workflow': diff --git a/addons/document/custom_report.xml b/addons/document/custom_report.xml index 02cf10e6a4a..ebfe70e4c50 100644 --- a/addons/document/custom_report.xml +++ b/addons/document/custom_report.xml @@ -1,6 +1,6 @@ - + - + diff --git a/addons/document/custom_view.xml b/addons/document/custom_view.xml index 4909336c498..61d95f9aa27 100644 --- a/addons/document/custom_view.xml +++ b/addons/document/custom_view.xml @@ -1,4 +1,4 @@ - + grcompta @@ -8,5 +8,5 @@ - + diff --git a/addons/document/document_data.xml b/addons/document/document_data.xml index 98793851804..9953d07dd92 100644 --- a/addons/document/document_data.xml +++ b/addons/document/document_data.xml @@ -1,6 +1,6 @@ - + - + diff --git a/addons/document/document_demo.xml b/addons/document/document_demo.xml index 3de248ffa28..94c52923556 100644 --- a/addons/document/document_demo.xml +++ b/addons/document/document_demo.xml @@ -1,5 +1,5 @@ - + @@ -90,4 +90,4 @@ - + diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index 5ae50b2f539..4e5a0b717ba 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -1,4 +1,4 @@ - + @@ -237,5 +237,5 @@ - + From 18e039d48e379795b5fc1dcb83100d690366f980 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Tue, 7 Oct 2008 18:02:24 +0530 Subject: [PATCH 07/16] modified files for demo of process bzr revid: solanki.priyesh@gmail.com-20081007123224-7up0s7vwe196ispa --- addons/account/account_view.xml | 2 +- addons/account/process/invoice_process.xml | 48 +++++------ addons/account/process/statement_process.xml | 32 +++---- addons/crm_configuration/__terp__.py | 10 ++- addons/crm_configuration/crm_config_view.xml | 2 +- addons/hr/__terp__.py | 3 +- addons/hr_contract/__terp__.py | 2 +- addons/hr_holidays/__terp__.py | 3 +- .../process/hr_timesheet_project_process.xml | 18 ++-- .../process/hr_timesheet_sheet_process.xml | 62 +++++++------- addons/mrp/process/procurement_process.xml | 84 +++++++++---------- addons/product/process/product_process.xml | 26 +++--- addons/profile_service/profile_service.xml | 2 +- addons/project/process/task_process.xml | 28 +++---- .../process/project_mrp_process.xml | 18 ++-- addons/purchase/process/purchase_process.xml | 38 ++++----- addons/sale/process/sale_process.xml | 46 +++++----- addons/sale/sale_view.xml | 2 +- addons/scrum/process/scrum_process.xml | 6 +- 19 files changed, 219 insertions(+), 213 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 62cb55b13e4..1dbe58e6db2 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -1362,7 +1362,7 @@ - + Account Configure Wizard Define Fiscal Years and Select Charts of Account diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index e38d3d8b288..95877564ae0 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -15,12 +15,12 @@ - + - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -112,8 +112,8 @@ - - + + @@ -121,8 +121,8 @@ - - + + @@ -130,8 +130,8 @@ - - + + @@ -139,8 +139,8 @@ - - + + @@ -148,8 +148,8 @@ - - + + @@ -157,8 +157,8 @@ - - + + @@ -166,9 +166,9 @@ - - + + - \ No newline at end of file + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 10365e76df0..b84dc63e3d3 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -91,8 +91,8 @@ - - + + @@ -100,8 +100,8 @@ - - + + @@ -109,8 +109,8 @@ - - + + @@ -118,8 +118,8 @@ - - + + @@ -127,8 +127,8 @@ - - + + diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py index 45503709487..ae144ad04c2 100644 --- a/addons/crm_configuration/__terp__.py +++ b/addons/crm_configuration/__terp__.py @@ -9,7 +9,7 @@ people to intelligently and efficiently manage tasks, issues, and requests. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification.""", - "depends" : ["crm","report_crm"], + "depends" : ["crm","report_crm", "process"], "init_xml" : [ "crm_config_view.xml", "crm_bugs_view.xml", @@ -34,8 +34,12 @@ "crm_jobs_data.xml", "crm_meeting_data.xml", "crm_lead_data.xml", - "crm_opportunity_data.xml", - + "crm_opportunity_data.xml", + "crm_bugs_menu.xml", "crm_fund_menu.xml", + "crm_jobs_menu.xml", "crm_opportunity_menu.xml", + "crm_helpdesk_menu.xml", "crm_lead_menu.xml", + "crm_meeting_menu.xml", + "process/crm_configuration_process.xml" ], "active": False, "installable": True diff --git a/addons/crm_configuration/crm_config_view.xml b/addons/crm_configuration/crm_config_view.xml index 20dc8ed42c5..78ef4180eee 100644 --- a/addons/crm_configuration/crm_config_view.xml +++ b/addons/crm_configuration/crm_config_view.xml @@ -38,7 +38,7 @@ - + Create Menu for CRM Case Section This Configuration step use to create Menu for Case Sections diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py index fb8873e5fc7..e36ed98c564 100644 --- a/addons/hr/__terp__.py +++ b/addons/hr/__terp__.py @@ -40,7 +40,7 @@ Different reports are also provided, mainly for attendance statistics. """, - "depends" : ["base"], + "depends" : ["base", "process"], "init_xml" : [], "demo_xml" : [ "hr_demo.xml", @@ -52,6 +52,7 @@ "hr_view.xml", "hr_wizard.xml", "hr_department_view.xml", +# "process/hr_process.xml" ], "active": False, "installable": True diff --git a/addons/hr_contract/__terp__.py b/addons/hr_contract/__terp__.py index c07e6c55a5a..a03f8140f72 100644 --- a/addons/hr_contract/__terp__.py +++ b/addons/hr_contract/__terp__.py @@ -46,7 +46,7 @@ "demo_xml" : [], "update_xml" : [ "security/hr_contract_security.xml", - "security/ir.model.access.csv", +# "security/ir.model.access.csv", "hr_contract_view.xml", ], "active": False, diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index dd4d6d796a5..6f3188d6acf 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -24,7 +24,7 @@ Administration \ Users \ Users for example, you maybe will do it for the user 'admin'. """, - "depends" : ["hr","crm_configuration"], + "depends" : ["hr","crm_configuration", "process"], "init_xml" : [], "update_xml" : [ "security/ir.model.access.csv", @@ -32,6 +32,7 @@ "hr_view.xml", "hr_holidays_report.xml", "hr_holidays_wizard.xml", +# "process/hr_holidays_process.xml" ], # "demo_xml" : ["hr_bel_holidays_2008.xml",], "demo_xml" : [], 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 5c96a0c8239..f3617ad9520 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -48,8 +48,8 @@ - - + + @@ -57,8 +57,8 @@ - - + + @@ -66,8 +66,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 2e59204aa30..1351426e186 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -146,8 +146,8 @@ - - + + @@ -155,8 +155,8 @@ - - + + @@ -164,8 +164,8 @@ - - + + @@ -173,8 +173,8 @@ - - + + @@ -182,8 +182,8 @@ - - + + @@ -191,17 +191,17 @@ - - + + - - - - + + + + @@ -209,8 +209,8 @@ - - + + @@ -218,8 +218,8 @@ - - + + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index f0eae8dd157..cf677195342 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -20,7 +20,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -161,7 +161,7 @@ - + @@ -177,8 +177,8 @@ - - + + @@ -186,8 +186,8 @@ - - + + @@ -195,8 +195,8 @@ - - + + @@ -204,8 +204,8 @@ - - + + @@ -213,8 +213,8 @@ - - + + @@ -222,8 +222,8 @@ - - + + @@ -231,8 +231,8 @@ - - + + @@ -240,8 +240,8 @@ - - + + @@ -249,8 +249,8 @@ - - + + @@ -258,8 +258,8 @@ - - + + @@ -267,8 +267,8 @@ - - + + @@ -276,8 +276,8 @@ - - + + @@ -285,8 +285,8 @@ - - + + @@ -294,8 +294,8 @@ - - + + diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 987f86331ae..d66ba12e875 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -15,12 +15,12 @@ - + - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -68,8 +68,8 @@ - - + + @@ -77,8 +77,8 @@ - - + + @@ -86,9 +86,9 @@ - - + + - + - \ No newline at end of file + diff --git a/addons/profile_service/profile_service.xml b/addons/profile_service/profile_service.xml index 50e90f4c1d1..830dc59f4dd 100644 --- a/addons/profile_service/profile_service.xml +++ b/addons/profile_service/profile_service.xml @@ -42,7 +42,7 @@ new - Service Profile : Install Extra modules A few modules are proposed according to the 'service profile' you selected. You will be able to install them or more modules later through the Administration menu. diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 4fef858fa8e..9bfc8c97964 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,8 +64,8 @@ - - + + @@ -81,8 +81,8 @@ - - + + @@ -90,8 +90,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + @@ -108,8 +108,8 @@ - - + + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index c8bd1738314..56096ac6029 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -58,8 +58,8 @@ - - + + @@ -67,8 +67,8 @@ - - + + @@ -76,8 +76,8 @@ - - + + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index ce69d273c01..c5ef5203635 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -102,8 +102,8 @@ - - + + @@ -111,8 +111,8 @@ - - + + @@ -120,8 +120,8 @@ - - + + @@ -129,8 +129,8 @@ - - + + @@ -138,8 +138,8 @@ - - + + @@ -147,8 +147,8 @@ - - + + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 217172d46e2..318530a99f0 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -13,14 +13,14 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -123,8 +123,8 @@ - - + + @@ -145,8 +145,8 @@ - - + + @@ -174,8 +174,8 @@ - - + + @@ -202,8 +202,8 @@ - - + + @@ -228,8 +228,8 @@ - - + + @@ -237,8 +237,8 @@ - - + + @@ -246,8 +246,8 @@ - - + + diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 68cf27bddf5..9d173ec09f9 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -475,7 +475,7 @@ - + Select the default picking policy for Sale Order This Configuration step use to set default picking policy when make sale order diff --git a/addons/scrum/process/scrum_process.xml b/addons/scrum/process/scrum_process.xml index 9fbaec3964b..a5a36296507 100644 --- a/addons/scrum/process/scrum_process.xml +++ b/addons/scrum/process/scrum_process.xml @@ -10,7 +10,7 @@ - + @@ -26,8 +26,8 @@ - - + + From 7725c67a76aa869ce4f35d421af2fdfddb7ab609 Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 8 Oct 2008 10:59:16 +0530 Subject: [PATCH 08/16] event bug fix bzr revid: mra@tinyerp.com-20081008052916-6cnvyt3ao9alfznl --- addons/event/event.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 407c86a4d93..ffddaa8574d 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -137,7 +137,7 @@ class event(osv.osv): #change the description of the registration linked to this event if 'mail_auto_confirm' in vals: if vals['mail_auto_confirm']: - if 'mail_confirm' not in vals: + if 'mail_confirm' not in vals: for eve in self.browse(cr, uid, ids): vals['mail_confirm'] = eve.mail_confirm else: @@ -288,8 +288,9 @@ class event_registration(osv.osv): data['badge_title'] = contact_id.title if partner: partner_addresses = self.pool.get('res.partner.address').search(cr, uid, [('partner_id','=',partner)]) - job_id = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)])[0] - data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_id).email + job_ids = self.pool.get('res.partner.job').search(cr, uid, [('contact_id','=',contact),('address_id','in',partner_addresses)]) + if job_ids: + data['email_from'] = self.pool.get('res.partner.job').browse(cr, uid, job_ids[0]).email d = self.onchange_badge_name(cr, uid, ids,data['badge_name']) data.update(d['value']) From e89fc6e6e17acd99e665feffe2f99355af7d9f32 Mon Sep 17 00:00:00 2001 From: Mantavya Gajjar Date: Wed, 8 Oct 2008 11:23:37 +0530 Subject: [PATCH 09/16] test changes bzr revid: mga@mga-laptop-20081008055337-64aha44zk1pdldtf --- addons/idea/__terp__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/idea/__terp__.py b/addons/idea/__terp__.py index be8b9d8b776..d31ea7441e4 100644 --- a/addons/idea/__terp__.py +++ b/addons/idea/__terp__.py @@ -1,4 +1,5 @@ # -*- encoding: utf-8 -*- + { "name" : "Idea Manager", "version" : "0.1", From 39725af1b7d7513a9375c56253bb8c31996ea6d7 Mon Sep 17 00:00:00 2001 From: Amit Mendapara Date: Wed, 8 Oct 2008 12:12:11 +0530 Subject: [PATCH 10/16] Minor finxings. bzr revid: ame@tinyerp.com-20081008064211-sn4rhbbfkxdiqsd0 --- addons/account/process/invoice_process.xml | 16 +++++------ addons/account/process/statement_process.xml | 12 ++++---- addons/hr/__terp__.py | 1 - .../process/hr_timesheet_project_process.xml | 6 ++-- .../process/hr_timesheet_sheet_process.xml | 22 +++++++-------- addons/mrp/process/procurement_process.xml | 28 +++++++++---------- addons/product/process/product_process.xml | 8 +++--- addons/project/process/task_process.xml | 10 +++---- .../process/project_mrp_process.xml | 6 ++-- addons/purchase/process/purchase_process.xml | 14 +++++----- addons/sale/process/sale_process.xml | 16 +++++------ addons/scrum/process/scrum_process.xml | 2 +- 12 files changed, 70 insertions(+), 71 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 5b975dc9007..a487b0b67d6 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -63,7 +63,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -96,7 +96,7 @@ - + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index bae7e0032a6..92cb92bbada 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py index 993f7584c0f..7da1af96772 100644 --- a/addons/hr/__terp__.py +++ b/addons/hr/__terp__.py @@ -52,7 +52,6 @@ "hr_view.xml", "hr_wizard.xml", "hr_department_view.xml", - "process/hr_process.xml" ], "active": False, "installable": True 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 7f0dc17bbf6..d5125963263 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -32,7 +32,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 636212e8afd..92cd0569cec 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -119,7 +119,7 @@ - + @@ -130,7 +130,7 @@ - + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 2a60dad3f75..556974e5eab 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -20,7 +20,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -40,7 +40,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -117,7 +117,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -139,7 +139,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -161,7 +161,7 @@ - + diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 3f876e95b7b..79e5020af61 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -52,7 +52,7 @@ - + diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index d109a56ad47..295f0bf5d9a 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 4adb33ae9eb..98d6d708bc4 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 3e393daf9bb..2f190222063 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index b72c45e7141..613b792e156 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -97,7 +97,7 @@ - + diff --git a/addons/scrum/process/scrum_process.xml b/addons/scrum/process/scrum_process.xml index 52821e11432..61b0deac846 100644 --- a/addons/scrum/process/scrum_process.xml +++ b/addons/scrum/process/scrum_process.xml @@ -10,7 +10,7 @@ - + From 2602acfc182b4877ea1ccb68f64153bf6db65f04 Mon Sep 17 00:00:00 2001 From: Amit Mendapara Date: Wed, 8 Oct 2008 12:34:49 +0530 Subject: [PATCH 11/16] cleanup bzr revid: ame@tinyerp.com-20081008070449-d9smir37x3msk1yn --- addons/.project | 17 ----------------- addons/.project.moved | 17 ----------------- addons/.pydevproject | 6 ------ addons/.pydevproject.moved | 6 ------ 4 files changed, 46 deletions(-) delete mode 100644 addons/.project delete mode 100644 addons/.project.moved delete mode 100644 addons/.pydevproject delete mode 100644 addons/.pydevproject.moved diff --git a/addons/.project b/addons/.project deleted file mode 100644 index 5a28b1de850..00000000000 --- a/addons/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - addons - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/addons/.project.moved b/addons/.project.moved deleted file mode 100644 index 45b85705360..00000000000 --- a/addons/.project.moved +++ /dev/null @@ -1,17 +0,0 @@ - - - new-report-apa - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/addons/.pydevproject b/addons/.pydevproject deleted file mode 100644 index 78259a9c3db..00000000000 --- a/addons/.pydevproject +++ /dev/null @@ -1,6 +0,0 @@ - - - - -python 2.4 - diff --git a/addons/.pydevproject.moved b/addons/.pydevproject.moved deleted file mode 100644 index 78259a9c3db..00000000000 --- a/addons/.pydevproject.moved +++ /dev/null @@ -1,6 +0,0 @@ - - - - -python 2.4 - From 0c3444f8d9239da67f05b277971a12c397688dd4 Mon Sep 17 00:00:00 2001 From: Amit Mendapara Date: Wed, 8 Oct 2008 12:46:10 +0530 Subject: [PATCH 12/16] module recorder, minor changes. bzr revid: ame@tinyerp.com-20081008071610-zmd17chu10x75qvs --- addons/base_module_record/base_module_record.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 1a623b2dbb5..3f2af50d2d7 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -172,7 +172,7 @@ class base_module_record(osv.osv): # Create the minidom document self.ids = {} doc = minidom.Document() - terp = doc.createElement("terp") + terp = doc.createElement("openerp") doc.appendChild(terp) for rec in self.recording_data: if rec[0]=='workflow': @@ -199,8 +199,7 @@ class base_module_record(osv.osv): data.appendChild(res) elif rec[0]=='assert': pass - res = doc.toprettyxml(indent="\t") - return doc.toprettyxml(indent="\t").encode('utf8') + return doc.toprettyxml(indent=" ").encode('utf8') base_module_record() def fnct_call(fnct): From 78f2befc3b44b62513a39849055594420854c0c3 Mon Sep 17 00:00:00 2001 From: Amit Mendapara Date: Wed, 8 Oct 2008 12:48:27 +0530 Subject: [PATCH 13/16] Tab to Space bzr revid: ame@tinyerp.com-20081008071827-rw2c0bpz8ufk6res --- addons/account/process/invoice_process.xml | 340 +++++----- addons/account/process/statement_process.xml | 262 ++++---- .../process/hr_timesheet_process.xml | 24 +- .../process/hr_timesheet_project_process.xml | 142 ++--- .../process/hr_timesheet_sheet_process.xml | 436 ++++++------- addons/mrp/process/procurement_process.xml | 596 +++++++++--------- addons/product/process/product_process.xml | 180 +++--- addons/project/process/task_process.xml | 222 +++---- .../process/project_mrp_process.xml | 162 ++--- addons/purchase/process/purchase_process.xml | 300 ++++----- addons/sale/process/sale_process.xml | 510 +++++++-------- addons/scrum/process/scrum_process.xml | 62 +- 12 files changed, 1618 insertions(+), 1618 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index a487b0b67d6..5fb1c522be1 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -1,174 +1,174 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 92cb92bbada..57cfe332531 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -1,135 +1,135 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet/process/hr_timesheet_process.xml b/addons/hr_timesheet/process/hr_timesheet_process.xml index 157ffc09deb..2df39b8a78c 100644 --- a/addons/hr_timesheet/process/hr_timesheet_process.xml +++ b/addons/hr_timesheet/process/hr_timesheet_process.xml @@ -1,16 +1,16 @@ - - - - + + + + - - - - - - + + + + + + \ 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 d5125963263..d514b14bf17 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -1,75 +1,75 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - \ No newline at end of file + \ No newline at end of file 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 92cd0569cec..24374c2a810 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -1,226 +1,226 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 556974e5eab..583de318410 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -1,302 +1,302 @@ - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 79e5020af61..9b675a11a84 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -1,94 +1,94 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 295f0bf5d9a..6be52bd3490 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -1,116 +1,116 @@ - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 98d6d708bc4..0c856b7a96d 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -1,84 +1,84 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 2f190222063..d100c4a772c 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -1,155 +1,155 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + \ No newline at end of file diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 613b792e156..e6b7c1a3c52 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -1,274 +1,274 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/scrum/process/scrum_process.xml b/addons/scrum/process/scrum_process.xml index 61b0deac846..344669f06c0 100644 --- a/addons/scrum/process/scrum_process.xml +++ b/addons/scrum/process/scrum_process.xml @@ -1,34 +1,34 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 01a51159e40f3fc3ada2a60da50e5d28b0fda849 Mon Sep 17 00:00:00 2001 From: Naresh Choksy Date: Wed, 8 Oct 2008 15:08:21 +0530 Subject: [PATCH 14/16] Defined a graph view on: * Analytic Accounts * General Accounts With: X: Account y: Computed Balance bzr revid: nch@tinyerp.com-20081008093821-jtertt29ykc05ggt --- addons/account/account_view.xml | 14 ++++- addons/account/project/project_view.xml | 16 +++++- .../account_analytic_analysis_menu.xml | 55 +++++++++++-------- 3 files changed, 60 insertions(+), 25 deletions(-) diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 3f0ce0fde85..89c19a436d0 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -141,7 +141,7 @@ List of Accounts account.account form - tree,form + tree,form,graph @@ -166,6 +166,7 @@ Chart of Accounts account.account tree + form [('parent_id','=',False)] @@ -1629,6 +1630,17 @@ + + account.account.graph + account.account + graph + + + + + + + diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 45a4307a6c9..ccc8fb420e7 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -73,6 +73,7 @@ ir.actions.act_window account.analytic.account form + tree,graph @@ -84,6 +85,7 @@ account.analytic.account [('parent_id','=',False)] tree + form,graph New Analytic Account account.analytic.account form - form,tree + form,tree,graph @@ -356,5 +358,17 @@ + + analytic.accounts.graph + account.analytic.account + graph + + + + + + + + diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index c57a0cdba70..ebe0d4638bb 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -1,18 +1,19 @@ - + - + My managed accounts account.analytic.account form + tree,graph [('user_id','=',uid)] - + - + Uninvoiced entries of my accounts account.analytic.line @@ -20,85 +21,93 @@ tree,form [('invoice_id','=',False),('to_invoice','!=',False),('account_id.user_id','=',uid)] - + - + My Open Managed Accounts account.analytic.account form + tree,graph [('user_id','=',uid),('state','=','open')] - + - + My Pending Managed Accounts account.analytic.account form + tree,graph [('user_id','=',uid),('state','=','pending')] - + - - + + Overpassed accounts account.analytic.account form + tree,graph [('date','<=',time.strftime('%Y-%m-%d')),('state','=','open')] - + - + All Analytic Accounts account.analytic.account form + tree,graph [] - + - + Draft Analytic Accounts account.analytic.account form + tree,graph [('state','=','draft')] - + - + Open Analytic Accounts account.analytic.account form + tree,graph [('state','=','open')] - + - + Pending Analytic Accounts account.analytic.account form + tree,graph [('state','=','pending')] - + - + Simplified View Analytic Accounts account.analytic.account form + tree,graph [] - + - + From f8404bca20d3f59bed34866fb1e5c66fe9aedfcf Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 8 Oct 2008 15:36:01 +0530 Subject: [PATCH 15/16] I can see that there is no value in the column Debit-Solved bzr revid: patelamit2003@gmail.com-20081008100601-lrjlp1ptal4rm7o5 --- .../project/report/analytic_balance.rml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/account/project/report/analytic_balance.rml b/addons/account/project/report/analytic_balance.rml index 77d52c2526c..0ac4aeb9245 100644 --- a/addons/account/project/report/analytic_balance.rml +++ b/addons/account/project/report/analytic_balance.rml @@ -128,16 +128,16 @@ - [[ sum_debit(objects,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ sum_debit(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ sum_credit(objects,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ sum_credit(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ sum_balance(objects,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ sum_balance(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ sum_quantity(objects,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ sum_quantity(objects,data['form']['date1'],data['form']['date2']) or '0.0' ]] @@ -153,16 +153,16 @@ [[ o.complete_name ]] - [[ move_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ move_sum_debit(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ move_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ move_sum_credit(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ move_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ move_sum_balance(o.id,data['form']['date1'],data['form']['date2']) or '0.0' ]] - [[ move_sum_quantity(o.id,data['form']['date1'],data['form']['date2']) or 0.0 ]] + [[ move_sum_quantity(o.id,data['form']['date1'],data['form']['date2']) or '0.0']] @@ -174,16 +174,16 @@ [[ move_g['name'] ]] - [[ move_g['debit'] ]] + [[ move_g['debit'] or '0.0']] - [[ move_g['credit'] ]] + [[ move_g['credit'] or '0.0']] - [[ move_g['balance'] ]] + [[ move_g['balance'] or '0.0']] - [[ (move_g['quantity'] or 0.0) ]] + [[ (move_g['quantity'] or '0.0') ]] From 63dbd0cf2410810d34a92975b782f34ee5d766b1 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Wed, 8 Oct 2008 16:05:15 +0530 Subject: [PATCH 16/16] Analytic check report completed...(Viral Rami) bzr revid: patelamit2003@gmail.com-20081008103515-b40a1ho4ykfzrfou --- .../account/project/report/analytic_check.py | 48 ++- .../account/project/report/analytic_check.rml | 290 +++++++++--------- 2 files changed, 179 insertions(+), 159 deletions(-) diff --git a/addons/account/project/report/analytic_check.py b/addons/account/project/report/analytic_check.py index c9f87de2302..1cfd9ab54fa 100644 --- a/addons/account/project/report/analytic_check.py +++ b/addons/account/project/report/analytic_check.py @@ -49,11 +49,12 @@ class account_analytic_analytic_check(report_sxw.rml_parse): 'delta_debit': self._delta_deb, 'delta_credit': self._delta_cred, }) - def _lines_p(self, date1, date2): res = [] acc_obj = self.pool.get('account.account') - for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code', 'sign']): + # print"3333333acc_obj3333333",acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code','user_type']) + + for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code']): self.cr.execute("SELECT sum(debit), sum(credit) \ FROM account_move_line \ WHERE date>=%s AND date<=%s AND state<>'draft' AND account_id = %d", (date1, date2, a['id'])) @@ -63,12 +64,12 @@ class account_analytic_analytic_check(report_sxw.rml_parse): self.cr.execute("SELECT abs(sum(amount)) AS balance \ FROM account_analytic_line \ - WHERE date>=%s AND date<=%s AND amount*%d>0 AND general_account_id = %d", (date1, date2, a['sign'], a['id'])) + WHERE date>=%s AND date<=%s AND amount>0 AND general_account_id = %d", (date1, date2, a['id'])) (ad,) = self.cr.fetchone() ad = ad or 0.0 self.cr.execute("SELECT abs(sum(amount)) AS balance \ FROM account_analytic_line \ - WHERE date>=%s AND date<=%s AND amount*%d<0 AND general_account_id = %d", (date1, date2, a['sign'], a['id'])) + WHERE date>=%s AND date<=%s AND amount<0 AND general_account_id = %d", (date1, date2, a['id'])) (ac,) = self.cr.fetchone() ac = ac or 0.0 @@ -83,8 +84,44 @@ class account_analytic_analytic_check(report_sxw.rml_parse): self.sum_gen_cred += gc self.sum_ana_deb += ad self.sum_ana_cred += ac + return res +# def _lines_p(self, date1, date2): +# res = [] +# acc_obj = self.pool.get('account.account') +# for a in acc_obj.read(self.cr, self.uid, self.ids, ['name', 'code','sign']): +# self.cr.execute("SELECT sum(debit), sum(credit) \ +# FROM account_move_line \ +# WHERE date>=%s AND date<=%s AND state<>'draft' AND account_id = %d", (date1, date2, a['id'])) +# (gd, gc) = self.cr.fetchone() +# gd = gd or 0.0 +# gc = gc or 0.0 +# +# self.cr.execute("SELECT abs(sum(amount)) AS balance \ +# FROM account_analytic_line \ +# WHERE date>=%s AND date<=%s AND amount*%d>0 AND general_account_id = %d", (date1, date2, a['sign'], a['id'])) +# (ad,) = self.cr.fetchone() +# ad = ad or 0.0 +# self.cr.execute("SELECT abs(sum(amount)) AS balance \ +# FROM account_analytic_line \ +# WHERE date>=%s AND date<=%s AND amount*%d<0 AND general_account_id = %d", (date1, date2, a['sign'], a['id'])) +# (ac,) = self.cr.fetchone() +# ac = ac or 0.0 +# +# res.append({'code': a['code'], 'name': a['name'], +# 'gen_debit': gd, +# 'gen_credit': gc, +# 'ana_debit': ad, +# 'ana_credit': ac, +# 'delta_debit': gd - ad, +# 'delta_credit': gc - ac,}) +# self.sum_gen_deb += gd +# self.sum_gen_cred += gc +# self.sum_ana_deb += ad +# self.sum_ana_cred += ac +# return res + def _gen_deb(self, date1, date2): return self.sum_gen_deb @@ -99,7 +136,7 @@ class account_analytic_analytic_check(report_sxw.rml_parse): def _delta_deb(self, date1, date2): return (self._gen_deb(date1,date2)-self._ana_deb(date1,date2)) - + def _delta_cred(self, date1, date2): return (self._gen_cred(date1,date2)-self._ana_cred(date1,date2)) @@ -107,4 +144,3 @@ report_sxw.report_sxw('report.account.analytic.account.analytic.check', 'account # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - diff --git a/addons/account/project/report/analytic_check.rml b/addons/account/project/report/analytic_check.rml index f1172fd1dfd..991d8e38c55 100644 --- a/addons/account/project/report/analytic_check.rml +++ b/addons/account/project/report/analytic_check.rml @@ -3,6 +3,36 @@ @@ -10,45 +40,36 @@ - + - - - - - - + + + + + - - - - - - + - + - + + + + + + + - - - - - - - - - - - - + + + @@ -58,149 +79,112 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + Code - Analytic Check + Account Name - - - + General Debit + + + General Credit + + + Analytic Debit + + + Analytic Credit + + + Delta Debit + + + Delta Credit - [[ company.name ]] + [[ (lines_p(data['form']['date1'],data['form']['date2']),'acc') == False or removeParentNode('para') ]] + Total + + + + [[ '%.2f' % general_debit(data['form']['date1'],data['form']['date2']) ]] - Periods from [[ data['form']['date1'] ]] - to [[ data['form']['date2'] ]] + [[ '%.2f' % general_credit(data['form']['date1'],data['form']['date2']) ]] - Currency: [[ company.currency_id.name ]] + [[ '%.2f' % analytic_debit(data['form']['date1'],data['form']['date2']) ]] + + + [[ '%.2f' % analytic_credit(data['form']['date1'],data['form']['date2']) ]] + + + [[ '%.2f' % delta_debit(data['form']['date1'],data['form']['date2']) ]] + + + [[ '%.2f' % delta_credit(data['form']['date1'],data['form']['date2']) ]] + + + + + [[ repeatIn(lines_p(data['form']['date1'],data['form']['date2']),'acc') ]] [[ acc['code'] ]] + + + [[ acc['name'] ]] + + + [[ '%.2f' % acc['gen_debit'] ]] + + + [[ '%.2f' % acc['gen_credit'] ]] + + + [[ '%.2f' % acc['ana_debit'] ]] + + + [[ '%.2f' % acc['ana_credit'] ]] + + + [[ '%.2f' % acc['delta_debit'] ]] + + + [[ '%.2f' % acc['delta_credit'] ]] - - - - Printing date: [[ time.strftime('%Y-%m-%d') ]] at [[ time.strftime('%H:%M:%S') ]] - - - - - - - Code - - - Account Name - - - - General - - Debit - - - - General - - Credit - - - - Analytic - - Debit - - - - Analytic - - Credit - - - Delta - Debit - - - Delta - Credit - - - - - - - - - - [[ repeatIn(lines_p(data['form']['date1'],data['form']['date2']),'acc') ]] - [[ acc['code'] ]] - - - [[ acc['name'] ]] - - - [[ '%.2f' % acc['gen_debit'] ]] - - - [[ '%.2f' % acc['gen_credit'] ]] - - - [[ '%.2f' % acc['ana_debit'] ]] - - - [[ '%.2f' % acc['ana_credit'] ]] - - - [[ '%.2f' % acc['delta_debit'] ]] - - - [[ '%.2f' % acc['delta_credit'] ]] - - - - - - - - - - Total - - - [[ '%.2f' % general_debit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % general_credit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % analytic_debit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % analytic_credit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % delta_debit(data['form']['date1'],data['form']['date2']) ]] - - - [[ '%.2f' % delta_credit(data['form']['date1'],data['form']['date2']) ]] - - - - - - - - + \ No newline at end of file