From 282147bca3dbf7b82b051070315041bf509390b5 Mon Sep 17 00:00:00 2001 From: Harshad Modi Date: Tue, 25 Nov 2008 18:57:44 +0530 Subject: [PATCH] pso's work on process data bzr revid: hmo@tinyerp.com-20081125132744-4mvhor10zzfrhly2 --- addons/account/__terp__.py | 3 +- .../account/process/customer_invoice_process.xml | 195 +++++++++++++++ addons/account/process/statement_process.xml | 81 +++---- .../account/process/supplier_invoice_process.xml | 175 ++++++++++++++ addons/base_contact/__terp__.py | 5 +- .../base_contact/process/base_contact_process.xml | 91 +++++++ .../process/crm_configuration_process.xml | 230 ++++++++++-------- addons/hr/process/hr_process.xml | 18 +- addons/hr_expense/__terp__.py | 1 + addons/hr_expense/process/hr_expense_process.xml | 187 +++++++++++++++ addons/hr_holidays/process/hr_holidays_process.xml | 162 +++++++++++-- addons/membership/__terp__.py | 3 +- addons/membership/process/membership_process.xml | 139 +++++++++++ addons/mrp/__terp__.py | 2 +- addons/mrp/process/procurement_process.xml | 220 +++++++++-------- addons/product/process/product_process.xml | 48 +--- addons/project/process/task_process.xml | 2 +- addons/project_mrp/process/project_mrp_process.xml | 33 +-- addons/purchase/process/purchase_process.xml | 70 ++++-- addons/sale/process/sale_process.xml | 249 +++++++++++--------- addons/sale_crm/process/sale_crm_process.xml | 56 ++++- addons/stock/__terp__.py | 1 + addons/stock/process/stock_process.xml | 47 ++++ 23 files changed, 1525 insertions(+), 493 deletions(-) create mode 100644 addons/account/process/customer_invoice_process.xml create mode 100644 addons/account/process/supplier_invoice_process.xml create mode 100644 addons/base_contact/process/base_contact_process.xml create mode 100644 addons/hr_expense/process/hr_expense_process.xml create mode 100644 addons/membership/process/membership_process.xml create mode 100644 addons/stock/process/stock_process.xml diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 40a4b2d..136731f 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -59,7 +59,8 @@ "project/project_report.xml", "product_view.xml", "account_assert_test.xml", - "process/invoice_process.xml", + "process/customer_invoice_process.xml", + "process/supplier_invoice_process.xml", "process/statement_process.xml", ], "translations" : { diff --git a/addons/account/process/customer_invoice_process.xml b/addons/account/process/customer_invoice_process.xml new file mode 100644 index 0000000..35878c7 --- /dev/null +++ b/addons/account/process/customer_invoice_process.xml @@ -0,0 +1,195 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 3ee13ac..8971017 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -26,6 +26,17 @@ + + + + + + + + + + + @@ -43,47 +54,24 @@ - + - - - - - - - - - - - - + - + - - - - - - - - - - - - - - @@ -95,6 +83,15 @@ + + + + + + + + + @@ -110,28 +107,10 @@ - - - - - - - - - - + - - - - - - - - - @@ -141,9 +120,11 @@ - + + + diff --git a/addons/account/process/supplier_invoice_process.xml b/addons/account/process/supplier_invoice_process.xml new file mode 100644 index 0000000..e43ee09 --- /dev/null +++ b/addons/account/process/supplier_invoice_process.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py index b8a419e..581dfe8 100644 --- a/addons/base_contact/__terp__.py +++ b/addons/base_contact/__terp__.py @@ -40,14 +40,15 @@ Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object. """, - "depends" : ["base"], + "depends" : ["base", "process"], "init_xml" : [], "demo_xml" : [ "base_contact_demo.xml" ], "update_xml" : [ "security/ir.model.access.csv", - 'base_contact_view.xml' + 'base_contact_view.xml', + "process/base_contact_process.xml" ], "active": False, "installable": True diff --git a/addons/base_contact/process/base_contact_process.xml b/addons/base_contact/process/base_contact_process.xml new file mode 100644 index 0000000..c446e91 --- /dev/null +++ b/addons/base_contact/process/base_contact_process.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/crm_configuration/process/crm_configuration_process.xml b/addons/crm_configuration/process/crm_configuration_process.xml index 8415552..2218610 100644 --- a/addons/crm_configuration/process/crm_configuration_process.xml +++ b/addons/crm_configuration/process/crm_configuration_process.xml @@ -1,106 +1,132 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + \ No newline at end of file diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml index 1afb90f..5984ed7 100644 --- a/addons/hr/process/hr_process.xml +++ b/addons/hr/process/hr_process.xml @@ -17,9 +17,11 @@ --> + - + @@ -54,11 +56,20 @@ - + - + + + + + + + + + + @@ -76,7 +87,6 @@ - diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py index 7787db5..1cb45d7 100644 --- a/addons/hr_expense/__terp__.py +++ b/addons/hr_expense/__terp__.py @@ -48,6 +48,7 @@ "hr_expense_workflow.xml", "hr_expense_view.xml", "hr_expense_report.xml", + "process/hr_expense_process.xml" ], "active": False, "installable": True diff --git a/addons/hr_expense/process/hr_expense_process.xml b/addons/hr_expense/process/hr_expense_process.xml new file mode 100644 index 0000000..5a00f2d --- /dev/null +++ b/addons/hr_expense/process/hr_expense_process.xml @@ -0,0 +1,187 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml index 4cbddc9..2cdb838 100644 --- a/addons/hr_holidays/process/hr_holidays_process.xml +++ b/addons/hr_holidays/process/hr_holidays_process.xml @@ -2,43 +2,177 @@ - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + + + + + + + + + + + + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/membership/__terp__.py b/addons/membership/__terp__.py index 16172f9..8e80e24 100644 --- a/addons/membership/__terp__.py +++ b/addons/membership/__terp__.py @@ -36,7 +36,8 @@ ], "update_xml" : [ "security/ir.model.access.csv", - "membership_view.xml","membership_wizard.xml" + "membership_view.xml","membership_wizard.xml", + "process/membership_process.xml" ], "active" : False, "installable" : True, diff --git a/addons/membership/process/membership_process.xml b/addons/membership/process/membership_process.xml new file mode 100644 index 0000000..5e4b9e0 --- /dev/null +++ b/addons/membership/process/membership_process.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/mrp/__terp__.py b/addons/mrp/__terp__.py index 98c8841..c76c822 100644 --- a/addons/mrp/__terp__.py +++ b/addons/mrp/__terp__.py @@ -25,7 +25,7 @@ "author" : "Tiny", "website" : "http://tinyerp.com/module_mrp.html", "category" : "Generic Modules/Production", - "depends" : ["stock", "hr", "purchase", "product", "process"], + "depends" : ["stock", "hr", "purchase", "product"], "description": """ This is the base module to manage the manufacturing process in Tiny ERP. diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 866ad78..d05eb28 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -15,6 +15,16 @@ Process Node --> + + + + + + + + + + @@ -25,26 +35,34 @@ + + + + + + + + + + - - + + - - - - - - - - - - + + + + + + + + @@ -80,40 +98,40 @@ - - - - - - - - - - - - + - - - - - - - - - - + + + + + + + + + + - - + + + + + + + + + + + + + @@ -126,7 +144,7 @@ - + @@ -152,8 +170,8 @@ - - + + @@ -164,14 +182,14 @@ - - + + - + @@ -183,6 +201,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -207,10 +252,10 @@ - + - + @@ -219,17 +264,7 @@ - - - - - - - - - - - + @@ -239,6 +274,15 @@ + + + + + + + + + @@ -247,22 +291,22 @@ - - + + - - - - + + + + - + - + @@ -273,19 +317,10 @@ - + - - - - - - - - - @@ -304,15 +339,6 @@ - - - - - - - - - @@ -335,34 +361,6 @@ Process Action --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -404,6 +402,6 @@ - + \ No newline at end of file diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index d7e985e..1264cf0 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -29,38 +29,16 @@ - - - - - - - - - - - + - - + + - - - - - - - - - - - - @@ -72,23 +50,5 @@ - - - - - - - - - - - - - - - - - - diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index f987ba0..c5179ff 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -39,7 +39,7 @@ - + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 125d325..3d08bd1 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -6,12 +6,12 @@ Process Node --> - + - - + + @@ -33,8 +33,8 @@ - - + + @@ -42,26 +42,15 @@ - - - - - - - - - - + - - - - + + + + @@ -79,7 +68,7 @@ - + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 23891fd..0d17b36 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -21,8 +21,8 @@ - - + + @@ -32,19 +32,30 @@ - - + + + + + + + + + + + + + - - + + @@ -54,8 +65,8 @@ - - + + @@ -65,8 +76,8 @@ - - + + @@ -77,8 +88,8 @@ - - + + @@ -88,14 +99,32 @@ - - + + - + + + + + + + + + + + + + + + + + @@ -122,6 +151,15 @@ + + + + + + + + + @@ -164,7 +202,7 @@ - + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 973c39e..231d190 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -1,161 +1,188 @@ - - - + - - + + - - - + - - - + + + - object.state=='draft' + - + - - - + + + - object.state in ('draft','waiting_date','manual','progress','shipping_except','invoice_except','done','cancel') + - + - - - + + + - object.state=='draft' - + + - - + + + - object.state in ('waiting_date','manual','progress') + + + + + + + + + + + + + - - + + + - object.state in ('assigned', 'confirmed') + + - - - + + + - object.state in ('done') + + - - - + + + + + - - - + + + + - - - object.order_policy=='postpaid' - + + - - - + - + - + - - + + - + - - + + + + + + + + + + - - + + - + - + - - + + - - + + @@ -163,103 +190,103 @@ - - + + - + - - + + - - + + - + - - + + - - - + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - + + + - - - + + + - + - - - + + + - - - - - + + + + + - + diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml index 6aaa146..307b1cf 100644 --- a/addons/sale_crm/process/sale_crm_process.xml +++ b/addons/sale_crm/process/sale_crm_process.xml @@ -2,25 +2,55 @@ - - - - - - + + + + + + + + - + - + + + + + + + + + + + + + + - - - - + + + + - + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/stock/__terp__.py b/addons/stock/__terp__.py index d4a1497..1937aad 100644 --- a/addons/stock/__terp__.py +++ b/addons/stock/__terp__.py @@ -42,6 +42,7 @@ "report_stock_view.xml", "security/stock_security.xml", "security/ir.model.access.csv", + "process/stock_process.xml" ], "active": False, "installable": True diff --git a/addons/stock/process/stock_process.xml b/addons/stock/process/stock_process.xml new file mode 100644 index 0000000..aef4e3b --- /dev/null +++ b/addons/stock/process/stock_process.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- 1.7.10.4