From 1b7e4c4a29eda213613df932c01dafd5a51dd8d6 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 27 Oct 2008 19:18:43 +0530 Subject: [PATCH 1/6] Membership and Base_contact flow bzr revid: solanki.priyesh@gmail.com-20081027134843-v5n9csw5822r2x4d --- addons/base_contact/__terp__.py | 5 +- addons/base_contact/base_contact_view.xml | 104 ++++++------- .../process/base_contact_process.xml | 91 ++++++++++++ addons/membership/__terp__.py | 5 +- .../membership/process/membership_process.xml | 139 ++++++++++++++++++ .../membership/security/ir.model.access.csv | 2 +- 6 files changed, 291 insertions(+), 55 deletions(-) create mode 100644 addons/base_contact/process/base_contact_process.xml create mode 100644 addons/membership/process/membership_process.xml diff --git a/addons/base_contact/__terp__.py b/addons/base_contact/__terp__.py index a267a7631c0..c6000afda58 100644 --- a/addons/base_contact/__terp__.py +++ b/addons/base_contact/__terp__.py @@ -20,12 +20,13 @@ 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/base_contact_view.xml b/addons/base_contact/base_contact_view.xml index 5cc819d8dea..0ae8fda9eda 100644 --- a/addons/base_contact/base_contact_view.xml +++ b/addons/base_contact/base_contact_view.xml @@ -27,40 +27,40 @@ - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + +
- - + + @@ -105,14 +105,14 @@ - +
- + @@ -240,7 +240,7 @@ - + res.partner.job.tree res.partner.job @@ -253,6 +253,7 @@ + @@ -273,26 +274,29 @@ + + + - - - Functions - ir.actions.act_window - res.partner.job - form - - - - + + + Functions + ir.actions.act_window + res.partner.job + form + + + + 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 00000000000..c446e91b104 --- /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/membership/__terp__.py b/addons/membership/__terp__.py index 2d5ded07229..f6fe8217fe8 100644 --- a/addons/membership/__terp__.py +++ b/addons/membership/__terp__.py @@ -5,7 +5,7 @@ "author" : "Tiny", "category" : "Generic Modules/Association", "depends" : [ - "base", "product", "account", + "base", "product", "account", "process" ], "demo_xml" : [ #"demo_data.xml", @@ -16,7 +16,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 00000000000..5e4b9e0703b --- /dev/null +++ b/addons/membership/process/membership_process.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/membership/security/ir.model.access.csv b/addons/membership/security/ir.model.access.csv index 5b34e98dec5..de35a7c8adc 100644 --- a/addons/membership/security/ir.model.access.csv +++ b/addons/membership/security/ir.model.access.csv @@ -1,5 +1,5 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_membership_membership_line_partner_manager","membership.membership_line partner_manager","model_membership_membership_line","base.group_partner_manager",1,1,1,1 -"access_membership_membership_line","membership.membership_line","model_membership_membership_line","base.group_user",1,0,0,0 +"access_membership_membership_line","membership.membership_line","model_membership_membership_line",,1,0,0,0 "access_report_partner_member_year","report.partner_member.year","model_report_partner_member_year","base.group_partner_manager",1,0,0,0 "access_report_partner_member_year_new","report.partner_member.year_new","model_report_partner_member_year_new","base.group_partner_manager",1,0,0,0 From 8a657d79cb168c272354a67b100ca154c1b5b8e4 Mon Sep 17 00:00:00 2001 From: Xavier ALT Date: Thu, 30 Oct 2008 16:42:26 +0100 Subject: [PATCH 2/6] Bugfix: Search inactive (active = False) elements will always fail Even if args contain ['active','=',0], _where_calc function add an active test, leading to 'where active = True and active = False' SQL queries. bzr revid: x.alt@ajm.lu-20081030154226-7yd1xvqleisqksld --- bin/osv/orm.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/bin/osv/orm.py b/bin/osv/orm.py index fed44126277..9572053b844 100644 --- a/bin/osv/orm.py +++ b/bin/osv/orm.py @@ -2354,7 +2354,12 @@ class orm(orm_template): # records unless they were explicitely asked for if 'active' in self._columns and (active_test and context.get('active_test', True)): if args: - args.insert(0, ('active', '=', 1)) + active_in_args = False + for a in args: + if a[0] == 'active': + active_in_args = True + if not active_in_args: + args.insert(0, ('active', '=', 1)) else: args = [('active', '=', 1)] From d0a6e7f4e14335b0fd620d520000cf99603feb05 Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 7 Nov 2008 10:38:10 +0530 Subject: [PATCH 3/6] but the filter we have "With Balance != 0" or "With Movements", is still returning the same result in the printed pdf==Solved bzr revid: patelamit2003@gmail.com-20081107050810-5t45a7cz3xvy3x5h --- addons/account/report/account_balance.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index d26c116a9e6..a0aef896250 100755 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -169,10 +169,10 @@ class account_balance(report_sxw.rml_parse): if form['display_account'] == 'bal_mouvement': - if res['credit'] >= 0 or res['debit'] >= 0 or res['balance'] >= 0 : + if res['credit'] > 0 or res['debit'] > 0 or res['balance'] > 0 : result_acc.append(res) elif form['display_account'] == 'bal_solde': - if res['balance'] >= 0: + if res['balance'] > 0: result_acc.append(res) else: result_acc.append(res) From 6efc2e19848d9927678593ee0a6c00f77c4d528d Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 7 Nov 2008 11:13:01 +0530 Subject: [PATCH 4/6] all processes bzr revid: solanki.priyesh@gmail.com-20081107054301-fau34hqk3wwfyrcw --- addons/account/__terp__.py | 3 +- ...ocess.xml => customer_invoice_process.xml} | 15 +- addons/account/process/statement_process.xml | 81 ++-- .../process/supplier_invoice_process.xml | 175 ++++++++ .../process/crm_configuration_process.xml | 73 +-- addons/document/__terp__.py | 3 +- addons/document/process/document_process.xml | 25 -- addons/hr/process/hr_process.xml | 16 +- addons/hr_expense/__terp__.py | 1 + .../hr_expense/process/hr_expense_process.xml | 187 ++++++++ .../process/hr_holidays_process.xml | 162 ++++++- addons/mrp/process/procurement_process.xml | 226 +++++----- addons/process/__init__.py | 33 +- addons/process/__terp__.py | 20 + addons/process/i18n/fr_FR.po | 416 ++++++++++-------- addons/process/process.py | 32 +- addons/process/process_view.xml | 4 +- addons/product/process/product_process.xml | 48 +- .../process/project_mrp_process.xml | 33 +- addons/purchase/process/purchase_process.xml | 70 ++- addons/sale/process/sale_process.xml | 49 ++- addons/sale_crm/process/sale_crm_process.xml | 56 ++- addons/stock/__terp__.py | 1 + addons/stock/process/stock_process.xml | 47 ++ 24 files changed, 1201 insertions(+), 575 deletions(-) rename addons/account/process/{invoice_process.xml => customer_invoice_process.xml} (95%) create mode 100644 addons/account/process/supplier_invoice_process.xml delete mode 100644 addons/document/process/document_process.xml create mode 100644 addons/hr_expense/process/hr_expense_process.xml create mode 100644 addons/stock/process/stock_process.xml diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index e8f25d84ad4..cf48c8079a2 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -66,7 +66,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/invoice_process.xml b/addons/account/process/customer_invoice_process.xml similarity index 95% rename from addons/account/process/invoice_process.xml rename to addons/account/process/customer_invoice_process.xml index 9d39c9e8be8..35878c77fd3 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/customer_invoice_process.xml @@ -7,9 +7,9 @@ --> - + - + @@ -88,7 +87,7 @@ - + @@ -125,7 +124,7 @@ - + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 3ee13ace8d5..89710174453 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 00000000000..e43ee096ebc --- /dev/null +++ b/addons/account/process/supplier_invoice_process.xml @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ 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 b7fa5202017..2218610390e 100644 --- a/addons/crm_configuration/process/crm_configuration_process.xml +++ b/addons/crm_configuration/process/crm_configuration_process.xml @@ -21,31 +21,41 @@ - + + + + + + + + + + + - + - - - + + + - - + + - + @@ -53,8 +63,8 @@ - - + + @@ -82,31 +92,40 @@ - + - - - + + + + + + + + + + + + - + - - - - - - - - - - - + + - + + + + + + + + + + diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py index aafdbebdb1a..0f38c6df756 100644 --- a/addons/document/__terp__.py +++ b/addons/document/__terp__.py @@ -12,13 +12,12 @@ * User Authentification * Document Indexation """, - "depends" : ["base", "process", "hr"], + "depends" : ["base"], "init_xml" : ["document_data.xml"], "update_xml" : [ "document_view.xml", "security/document_security.xml", "security/ir.model.access.csv", - "process/document_process.xml" ], "demo_xml" : ["document_demo.xml"], "active": False, diff --git a/addons/document/process/document_process.xml b/addons/document/process/document_process.xml deleted file mode 100644 index 3c37c793ab4..00000000000 --- a/addons/document/process/document_process.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/hr/process/hr_process.xml b/addons/hr/process/hr_process.xml index bfb0ad21f2a..bd9ababbede 100644 --- a/addons/hr/process/hr_process.xml +++ b/addons/hr/process/hr_process.xml @@ -21,7 +21,7 @@ - + @@ -56,11 +56,20 @@ - + - + + + + + + + + + + @@ -78,7 +87,6 @@ - \ No newline at end of file diff --git a/addons/hr_expense/__terp__.py b/addons/hr_expense/__terp__.py index d9949372e72..64740a396b8 100644 --- a/addons/hr_expense/__terp__.py +++ b/addons/hr_expense/__terp__.py @@ -55,6 +55,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 00000000000..5a00f2dc646 --- /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 4cbddc9c423..2cdb83885ab 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/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 866ad784349..d05eb28eaef 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/process/__init__.py b/addons/process/__init__.py index 092ca748429..0d315663f98 100644 --- a/addons/process/__init__.py +++ b/addons/process/__init__.py @@ -1,29 +1,22 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved. -# Fabien Pinckaers +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved +# $Id$ # -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software -# Service Company +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # ############################################################################## diff --git a/addons/process/__terp__.py b/addons/process/__terp__.py index ca48fada8a6..5fc719ddc5d 100644 --- a/addons/process/__terp__.py +++ b/addons/process/__terp__.py @@ -1,4 +1,24 @@ # -*- encoding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved +# $Id$ +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +############################################################################## { "name" : "Enterprise Process", "version" : "1.0", diff --git a/addons/process/i18n/fr_FR.po b/addons/process/i18n/fr_FR.po index efb2294f76e..d1fe70d6378 100644 --- a/addons/process/i18n/fr_FR.po +++ b/addons/process/i18n/fr_FR.po @@ -1,232 +1,290 @@ -# French translation for openobject-addons -# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008 -# This file is distributed under the same license as the openobject-addons package. -# FIRST AUTHOR , 2008. +# Translation of OpenERP Server. +# This file containt the translation of the following modules: +# * process # msgid "" msgstr "" -"Project-Id-Version: openobject-addons\n" -"Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2008-09-05 13:34+0000\n" -"PO-Revision-Date: 2008-10-13 14:46+0000\n" -"Last-Translator: Olivier Laurent \n" -"Language-Team: French \n" +"Project-Id-Version: OpenERP Server 4.3.99\n" +"Report-Msgid-Bugs-To: support@openerp.com\n" +"POT-Creation-Date: 2008-11-02 20:23:25+0000\n" +"PO-Revision-Date: 2008-11-02 20:23:25+0000\n" +"Last-Translator: <>\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2008-10-13 14:56+0000\n" -"X-Generator: Launchpad (build Unknown)\n" +"Content-Transfer-Encoding: \n" +"Plural-Forms: \n" -#. module: processus -#: constraint:ir.model:0 -msgid "" -"The Object name must start with x_ and not contain any special character !" +#. module: process +#: view:process.process:0 +#: view:process.node:0 +msgid "Process Node" msgstr "" -"Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères " -"spéciaux !" -#. module: processus -#: model:ir.ui.menu,name:processus.menu_processus -msgid "Enterprise Processus" -msgstr "Processus d'entreprise" +#. module: process +#: constraint:ir.model:0 +msgid "The Object name must start with x_ and not contain any special character !" +msgstr "Le nom de l'objet doit commencer avec x_ et ne pas contenir de charactères spéciaux !" -#. module: processus -#: field:processus.node,menu_id:0 +#. module: process +#: view:process.process:0 +#: view:process.node:0 +#: view:process.transition:0 +msgid "Roles from Workflow" +msgstr "" + +#. module: process +#: field:process.node,menu_id:0 msgid "Related Menu" -msgstr "Menu Relatif" +msgstr "" -#. module: processus -#: field:processus.transition,action_ids:0 +#. module: process +#: field:process.transition,action_ids:0 +#: view:process.process:0 +#: view:process.node:0 msgid "Buttons" -msgstr "Boutons" +msgstr "" -#. module: processus -#: selection:processus.node,kind:0 +#. module: process +#: selection:process.node,kind:0 msgid "State" -msgstr "État" +msgstr "" -#. module: processus -#: field:processus.transition,node_to_id:0 -msgid "Destination Node" -msgstr "Noeud de Destination" +#. module: process +#: view:process.process:0 +#: view:process.node:0 +#: view:process.transition:0 +msgid "Details" +msgstr "" -#. module: processus -#: field:processus.node,flow_start:0 -msgid "Starting Flow" -msgstr "Flux de Départ" +#. module: process +#: field:process.node,help_url:0 +msgid "Help URL" +msgstr "" -#. module: processus -#: field:processus.processus,node_ids:0 -#: view:processus.processus:0 +#. module: process +#: model:ir.actions.act_window,name:process.action_process_node_form +#: model:ir.model,name:process.model_process_node +#: model:ir.ui.menu,name:process.menu_process_node_form +#: view:process.process:0 +#: view:process.node:0 +msgid "Process Nodes" +msgstr "" + +#. module: process +#: field:process.process,node_ids:0 +#: view:process.process:0 msgid "Nodes" -msgstr "Nœuds" +msgstr "" -#. module: processus -#: field:processus.transition.action,state:0 -msgid "Type" -msgstr "Type" +#. module: process +#: field:process.node,condition_ids:0 +#: view:process.process:0 +#: view:process.node:0 +msgid "Conditions" +msgstr "" -#. module: processus -#: selection:processus.transition.action,state:0 +#. module: process +#: field:process.condition,node_id:0 +msgid "Node" +msgstr "" + +#. module: process +#: selection:process.transition.action,state:0 msgid "Workflow Trigger" -msgstr "Déclenchement du Flux d'Entreprise" +msgstr "" -#. module: processus -#: field:processus.transition,note:0 -#: view:processus.node:0 -#: view:processus.transition:0 +#. module: process +#: field:process.transition,note:0 msgid "Description" -msgstr "Description" +msgstr "" -#. module: processus -#: field:processus.node,model_id:0 +#. module: process +#: model:ir.model,name:process.model_process_transition_action +msgid "Process Transitions Actions" +msgstr "" + +#. module: process +#: field:process.condition,model_id:0 +#: field:process.node,model_id:0 msgid "Object" -msgstr "Objet" +msgstr "" -#. module: processus -#: field:processus.transition,transition_ids:0 +#. module: process +#: field:process.transition,source_node_id:0 +msgid "Source Node" +msgstr "" + +#. module: process +#: field:process.transition,transition_ids:0 msgid "Workflow Transitions" -msgstr "Transitions du Flux de Travail" +msgstr "" -#. module: processus -#: field:processus.node,kind:0 -msgid "Kind of Node" -msgstr "Type de Noeud" +#. module: process +#: field:process.process,active:0 +msgid "Active" +msgstr "" -#. module: processus -#: field:processus.transition.action,action:0 -msgid "Action ID" -msgstr "ID de l'Action" - -#. module: processus -#: field:processus.node,model_states:0 +#. module: process +#: field:process.node,model_states:0 msgid "States Expression" msgstr "" -#. module: processus -#: view:processus.node:0 -msgid "Outgoing Transitions" -msgstr "Transitions sortantes" +#. module: process +#: model:ir.model,name:process.model_process_condition +#: view:process.process:0 +#: view:process.node:0 +msgid "Condition" +msgstr "" -#. module: processus -#: selection:processus.transition.action,state:0 +#. module: process +#: selection:process.transition.action,state:0 msgid "Dummy" -msgstr "Factice" +msgstr "" -#. module: processus +#. module: process #: constraint:ir.ui.view:0 msgid "Invalid XML for View Architecture!" msgstr "XML non valide pour l'architecture de la vue" -#. module: processus -#: field:processus.node,transition_in:0 -msgid "Starting Transitions" -msgstr "Transitions de Départ" - -#. module: processus -#: field:processus.node,note:0 -#: field:processus.processus,note:0 -msgid "Notes" -msgstr "Notes" - -#. module: processus -#: field:processus.transition.action,transition_id:0 -msgid "Transition" -msgstr "Transition" - -#. module: processus -#: selection:processus.node,kind:0 -msgid "Subflow" -msgstr "Sous-flux" - -#. module: processus -#: model:ir.actions.act_window,name:processus.action_processus_node_form -#: model:ir.ui.menu,name:processus.menu_partner_address_form -#: view:processus.node:0 -msgid "Processus Node" -msgstr "Noeud de Processus" - -#. module: processus -#: model:ir.actions.report.xml,name:processus.report_processus -msgid "Print Processus" -msgstr "Imprimer Processus" - -#. module: processus -#: selection:processus.transition.action,state:0 -msgid "Action" -msgstr "Action" - -#. module: processus -#: selection:processus.node,kind:0 -msgid "Router" +#. module: process +#: field:process.condition,name:0 +#: field:process.node,name:0 +#: field:process.process,name:0 +#: field:process.transition.action,name:0 +#: field:process.transition,name:0 +msgid "Name" msgstr "" -#. module: processus -#: view:processus.node:0 -msgid "Node Description" -msgstr "Description du Noeud" +#. module: process +#: field:process.transition,role_ids:0 +msgid "Roles" +msgstr "" -#. module: processus -#: field:processus.transition.action,name:0 -#: field:processus.transition,name:0 -#: view:processus.node:0 -#: view:processus.transition:0 -msgid "Transitions" -msgstr "Transitions" +#. module: process +#: field:process.node,transition_in:0 +msgid "Starting Transitions" +msgstr "" -#. module: processus -#: field:processus.node,transition_out:0 -msgid "Ending Transitions" -msgstr "Transitions finales" +#. module: process +#: field:process.node,note:0 +#: field:process.process,note:0 +#: view:process.transition:0 +msgid "Notes" +msgstr "" -#. module: processus -#: model:ir.model,name:processus.model_processus_processus -#: field:processus.node,name:0 -#: field:processus.node,processus_id:0 -#: field:processus.processus,name:0 -#: model:ir.ui.menu,name:processus.menu_processus_form -#: view:processus.processus:0 -msgid "Processus" -msgstr "Processus" +#. module: process +#: field:process.transition.action,transition_id:0 +#: view:process.process:0 +#: view:process.node:0 +msgid "Transition" +msgstr "" -#. module: processus -#: view:processus.transition:0 -msgid "Actions" -msgstr "Actions" +#. module: process +#: view:process.process:0 +#: view:process.node:0 +#: view:process.transition:0 +msgid "Roles Required" +msgstr "" -#. module: processus -#: field:processus.transition,node_from_id:0 -msgid "Origin Node" -msgstr "Noeud d'Origine" +#. module: process +#: selection:process.node,kind:0 +#: field:process.node,subflow_id:0 +msgid "Subflow" +msgstr "" -#. module: processus -#: model:ir.model,name:processus.model_processus_transition_action -msgid "Processus Transitions Actions" -msgstr "Actions des Transitions du Processus" - -#. module: processus -#: view:processus.node:0 +#. module: process +#: view:process.process:0 +#: view:process.node:0 msgid "Extra Information" -msgstr "Information supplémentaire" +msgstr "" -#. module: processus -#: model:ir.actions.act_window,name:processus.action_transition_open -#: model:ir.model,name:processus.model_processus_transition -#: model:ir.ui.menu,name:processus.menu_action_transition_open -msgid "Processus Transitions" -msgstr "Transitions du Processus" +#. module: process +#: field:process.transition.action,action:0 +msgid "Action ID" +msgstr "" -#. module: processus -#: model:ir.model,name:processus.model_processus_node -msgid "Processus Nodes" -msgstr "Noeuds de Processus" +#. module: process +#: selection:process.transition.action,state:0 +msgid "Action" +msgstr "" -#. module: processus -#: selection:processus.transition.action,state:0 +#. module: process +#: field:process.node,flow_start:0 +msgid "Starting Flow" +msgstr "" + +#. module: process +#: field:process.condition,model_states:0 +msgid "Expression" +msgstr "" + +#. module: process +#: field:process.transition.action,state:0 +msgid "Type" +msgstr "" + +#. module: process +#: view:process.transition:0 +msgid "Process Transition" +msgstr "" + +#. module: process +#: field:process.node,transition_out:0 +msgid "Ending Transitions" +msgstr "" + +#. module: process +#: model:ir.actions.act_window,name:process.action_process_transition_form +#: model:ir.model,name:process.model_process_transition +#: model:ir.ui.menu,name:process.menu_process_transition_form +msgid "Process Transitions" +msgstr "" + +#. module: process +#: model:ir.ui.menu,name:process.menu_process +msgid "Enterprise Process" +msgstr "" + +#. module: process +#: view:process.process:0 +#: view:process.node:0 +#: view:process.transition:0 +msgid "Actions" +msgstr "" + +#. module: process +#: model:ir.model,name:process.model_process_process +#: field:process.node,process_id:0 +#: model:ir.ui.menu,name:process.menu_process_form +#: view:process.process:0 +msgid "Process" +msgstr "" + +#. module: process +#: field:process.transition,target_node_id:0 +msgid "Target Node" +msgstr "" + +#. module: process +#: field:process.node,kind:0 +msgid "Kind of Node" +msgstr "" + +#. module: process +#: view:process.process:0 +#: view:process.node:0 +msgid "Outgoing Transitions" +msgstr "" + +#. module: process +#: view:process.process:0 +#: view:process.node:0 +msgid "Transitions" +msgstr "" + +#. module: process +#: selection:process.transition.action,state:0 msgid "Object Method" -msgstr "Méthode de l'objet" +msgstr "" -#. module: processus -#: field:processus.processus,active:0 -msgid "Active" -msgstr "Actif" diff --git a/addons/process/process.py b/addons/process/process.py index e4eff890061..ff6e6378d83 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -1,28 +1,22 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# Copyright (c) 2005-TODAY TINY SPRL. (http://tiny.be) All Rights Reserved. +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved +# $Id$ # -# WARNING: This program as such is intended to be used by professional -# programmers who take the whole responsability of assessing all potential -# consequences resulting from its eventual inadequacies and bugs -# End users who are looking for a ready-to-use solution with commercial -# garantees and support are strongly adviced to contract a Free Software -# Service Company +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# This program is Free Software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . # ############################################################################## diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml index cee536def7d..3f294ef0302 100644 --- a/addons/process/process_view.xml +++ b/addons/process/process_view.xml @@ -39,7 +39,7 @@ - + @@ -169,7 +169,7 @@ - + diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index d7e985eca7d..1264cf09f33 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_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 125d325f223..3d08bd11394 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,35 +33,24 @@ - - + + - - - - - - - - - - + - - - - + + + + @@ -79,7 +68,7 @@ - + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 23891fda515..0d17b36dc06 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 d91109ae331..231d1900ff7 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -44,30 +44,41 @@ - - + + - + - - + + + + + + + + + + + + + - - + + @@ -78,7 +89,7 @@ - + @@ -88,8 +99,8 @@ - - + + @@ -100,8 +111,8 @@ - - + + @@ -143,13 +154,21 @@ + + + + + + + + - + @@ -174,10 +193,10 @@ - + - + diff --git a/addons/sale_crm/process/sale_crm_process.xml b/addons/sale_crm/process/sale_crm_process.xml index 6aaa146b250..307b1cfd618 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 fbcb5e32b6b..a1e79d74cce 100644 --- a/addons/stock/__terp__.py +++ b/addons/stock/__terp__.py @@ -49,6 +49,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 00000000000..aef4e3b89aa --- /dev/null +++ b/addons/stock/process/stock_process.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From db54aa529009f505283fc4c714cac6760b0fe6c0 Mon Sep 17 00:00:00 2001 From: "hda@tinyerp.com" <> Date: Fri, 7 Nov 2008 11:25:29 +0530 Subject: [PATCH 5/6] bugfix for process bzr revid: hda@tinyerp.com-20081107055529-ezzxxshuve42bh21 --- .../process/hr_timesheet_project_process.xml | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) 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 edcb92038d5..0a94f6a2b5d 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -1,11 +1,11 @@ - - - + --> + @@ -16,7 +16,7 @@ - + @@ -27,9 +27,9 @@ - + - + @@ -38,11 +38,11 @@ - - - + @@ -51,7 +51,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -69,7 +69,7 @@ - + - + From b4ae45eb70a90892cf5996e240d4e31313c5cbfc Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Mon, 10 Nov 2008 18:58:28 +0100 Subject: [PATCH 6/6] bugfix bzr revid: fp@tinyerp.com-20081110175828-fjcxla4ygbwgru2v --- bin/addons/base/ir/ir.xml | 46 ++++++++++++++----- bin/addons/base/ir/ir_attachment.py | 17 ++++++- .../module/report/ir_module_reference.rml | 10 ++-- 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/bin/addons/base/ir/ir.xml b/bin/addons/base/ir/ir.xml index 1d1168e8e3f..cab66157303 100644 --- a/bin/addons/base/ir/ir.xml +++ b/bin/addons/base/ir/ir.xml @@ -485,14 +485,37 @@ form
- - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
@@ -503,8 +526,9 @@ - - + + + @@ -514,7 +538,7 @@ ir.actions.act_window ir.attachment form - + diff --git a/bin/addons/base/ir/ir_attachment.py b/bin/addons/base/ir/ir_attachment.py index e9b23ff3fa3..ccc07c37781 100644 --- a/bin/addons/base/ir/ir_attachment.py +++ b/bin/addons/base/ir/ir_attachment.py @@ -96,16 +96,29 @@ class ir_attachment(osv.osv): self.pool.get('ir.model.access').unregister_cache_clearing_method(self._name, 'clear_cache') return super(ir_attachment, self).__del__() + def _get_preview(self, cr, uid, ids, name, arg, context=None): + result = {} + for i in self.browse(cr, uid, ids, context=context or {}): + result[i.id] = False + for format in ('png','PNG','jpg','JPG'): + if (i.datas_fname or '').endswith(format): + result[i.id]= i.datas + return result + _name = 'ir.attachment' _columns = { 'name': fields.char('Attachment Name',size=64, required=True), 'datas': fields.binary('Data'), - 'datas_fname': fields.char('Data Filename',size=64), + 'preview': fields.function(_get_preview, type='binary', string='Image Preview', method=True), + 'datas_fname': fields.char('Filename',size=64), 'description': fields.text('Description'), # Not required due to the document module ! 'res_model': fields.char('Resource Object',size=64, readonly=True), 'res_id': fields.integer('Resource ID', readonly=True), - 'link': fields.char('Link', size=256) + 'link': fields.char('Link', size=256), + + 'create_date': fields.datetime('Date Created', readonly=True), + 'create_uid': fields.many2one('res.users', 'Creator', readonly=True), } ir_attachment() diff --git a/bin/addons/base/module/report/ir_module_reference.rml b/bin/addons/base/module/report/ir_module_reference.rml index 156abdba246..a7a25263d81 100644 --- a/bin/addons/base/module/report/ir_module_reference.rml +++ b/bin/addons/base/module/report/ir_module_reference.rml @@ -69,7 +69,7 @@ - + @@ -102,14 +102,14 @@
[[ repeatIn(objects, 'module') ]] - + Module: [[ module.name ]] - + 
Name: [[ objdoc(module.shortdesc) ]]
@@ -130,7 +130,7 @@ 
[[ module.description ]]
[[ repeatIn(findobj(module.name) ,'object') ]] - + Object: [[ object.name ]] @@ -138,7 +138,7 @@ - + [[ repeatIn(findflds(object.model), 'field') ]] [[ field[0] ]]