From 6228e0641bd81f45349dbeca3ab6583b080e5b87 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Wed, 8 Oct 2008 19:56:04 +0530 Subject: [PATCH 01/32] define actions in process bzr revid: solanki.priyesh@gmail.com-20081008142604-up8dif1m6ghngwqh --- addons/account/process/invoice_process.xml | 13 ++++- addons/account/process/statement_process.xml | 11 ++++ .../process/hr_timesheet_project_process.xml | 2 +- .../process/hr_timesheet_sheet_process.xml | 33 +++++++++++ addons/mrp/process/procurement_process.xml | 11 ++++ addons/project/process/task_process.xml | 39 +++++++++++++ addons/purchase/process/purchase_process.xml | 56 ++++++++++++++++++- addons/purchase/purchase.py | 2 +- 8 files changed, 163 insertions(+), 4 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 5fb1c522be1..66c5b6aef55 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -104,7 +104,7 @@ @@ -169,6 +169,17 @@ + + + + + + + + + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 57cfe332531..09caa7f72f2 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -130,6 +130,17 @@ + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml index d514b14bf17..0cc7032602d 100644 --- a/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml +++ b/addons/hr_timesheet_project/process/hr_timesheet_project_process.xml @@ -58,7 +58,7 @@ - + diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 24374c2a810..3b818bd82ec 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -222,5 +222,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 583de318410..a6125811143 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -298,5 +298,16 @@ + + + + + + + + + \ No newline at end of file diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 6be52bd3490..03b8281072d 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -112,5 +112,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index d100c4a772c..96da7cbb8cd 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -105,7 +105,7 @@ - + @@ -150,6 +150,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + . + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 84074b0a0ae..440bc3859d3 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -231,7 +231,7 @@ class purchase_order(osv.osv): part,property_pref=['property_product_pricelist_purchase']).get('property_product_pricelist_purchase',False) return {'value':{'partner_address_id': addr['default'], 'pricelist_id': pricelist}} - def wkf_approve_order(self, cr, uid, ids): + def wkf_approve_order(self, cr, uid, ids, context={}): self.write(cr, uid, ids, {'state': 'approved', 'date_approve': time.strftime('%Y-%m-%d')}) return True From fe5356f7d57698d897e0a4d0cb2012aa123d3d97 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 10 Oct 2008 15:55:04 +0530 Subject: [PATCH 02/32] define actions in process bzr revid: solanki.priyesh@gmail.com-20081010102504-m47thbbqdv4kyrlw --- addons/account/process/invoice_process.xml | 4 +- addons/account/process/statement_process.xml | 2 +- .../process/hr_timesheet_sheet_process.xml | 8 +- addons/mrp/process/procurement_process.xml | 87 ++++++++- addons/product/process/product_process.xml | 2 +- addons/project/process/task_process.xml | 10 +- .../process/project_mrp_process.xml | 25 +++ addons/purchase/process/purchase_process.xml | 25 +-- addons/sale/process/sale_process.xml | 179 +++++++++--------- 9 files changed, 214 insertions(+), 128 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 66c5b6aef55..aeb2b786137 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -13,7 +13,7 @@ @@ -177,7 +177,7 @@ - + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 09caa7f72f2..3a153fab546 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -138,7 +138,7 @@ - + diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 3b818bd82ec..8033c06ee3f 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -229,28 +229,28 @@ - + - + - + - + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index a6125811143..136ae9a86ea 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -13,7 +13,7 @@ @@ -169,7 +169,7 @@ @@ -298,6 +298,24 @@ + + + + + + + + + + + + + + + + @@ -305,9 +323,72 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/product/process/product_process.xml b/addons/product/process/product_process.xml index 9b675a11a84..d7e985eca7d 100644 --- a/addons/product/process/product_process.xml +++ b/addons/product/process/product_process.xml @@ -13,7 +13,7 @@ diff --git a/addons/project/process/task_process.xml b/addons/project/process/task_process.xml index 03b8281072d..9ba6a39b9dc 100644 --- a/addons/project/process/task_process.xml +++ b/addons/project/process/task_process.xml @@ -119,35 +119,35 @@ - + - + - + - + - + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 0c856b7a96d..2dd89b84add 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -80,5 +80,30 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 96da7cbb8cd..56b3b8d1180 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -158,52 +158,37 @@ - + - + - + - + . - + - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index e6b7c1a3c52..829fcc61bf7 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -118,6 +118,18 @@ + + + + + + + + + + + + @@ -125,22 +137,9 @@ + - - - - - - - - - - - - - - @@ -148,28 +147,7 @@ - - - - - - - - - - - - - - - - - - - - - - + @@ -178,52 +156,15 @@ - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - @@ -249,25 +190,79 @@ - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + From 92ab49dee4ba559f55131caa5c924a9904d183f8 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Fri, 10 Oct 2008 18:13:41 +0530 Subject: [PATCH 03/32] define roles in process wherever necessary bzr revid: solanki.priyesh@gmail.com-20081010124341-g0ddcgjepuhp5131 --- addons/account/process/invoice_process.xml | 9 +++++++++ addons/account/process/statement_process.xml | 4 ++-- .../process/hr_timesheet_sheet_process.xml | 9 +++++++++ addons/mrp/process/procurement_process.xml | 13 ++++++++++++- .../project_mrp/process/project_mrp_process.xml | 1 + addons/purchase/process/purchase_process.xml | 16 +++++++++++++++- 6 files changed, 48 insertions(+), 4 deletions(-) diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index aeb2b786137..37575e9b653 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -106,6 +106,14 @@ + + + + + + + + @@ -123,6 +131,7 @@ + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index 3a153fab546..df5a544a293 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -85,8 +85,8 @@ - - + + diff --git a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml index 8033c06ee3f..f21378fee04 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -140,6 +140,14 @@ + + + + + + + + @@ -166,6 +174,7 @@ + diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 136ae9a86ea..38fdbeecaea 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -170,7 +170,15 @@ + --> + + + + + + + + @@ -215,6 +223,7 @@ + @@ -251,6 +260,7 @@ + @@ -260,6 +270,7 @@ + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index 2dd89b84add..b9c07b7bf6d 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -78,6 +78,7 @@ + - + + + + + + + + + + + + + @@ -104,6 +116,7 @@ + @@ -122,6 +135,7 @@ + From eab27019cc0993b5c71fe88e83159567b9386252 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Mon, 13 Oct 2008 19:00:37 +0530 Subject: [PATCH 04/32] minor changes in process bzr revid: solanki.priyesh@gmail.com-20081013133037-tp7enmbx9vf8ocpy --- addons/account/__terp__.py | 2 +- addons/account/process/invoice_process.xml | 6 ++++-- addons/account/process/statement_process.xml | 12 +++++++++++- addons/document/__terp__.py | 4 +++- .../process/hr_timesheet_sheet_process.xml | 1 + addons/mrp/mrp.py | 2 +- addons/mrp/process/procurement_process.xml | 6 +++++- addons/project_mrp/process/project_mrp_process.xml | 4 +++- addons/purchase/process/purchase_process.xml | 3 +++ addons/sale/process/sale_process.xml | 10 +++++++--- 10 files changed, 39 insertions(+), 11 deletions(-) diff --git a/addons/account/__terp__.py b/addons/account/__terp__.py index 01d9f9e499f..7c0ac20d005 100644 --- a/addons/account/__terp__.py +++ b/addons/account/__terp__.py @@ -67,7 +67,7 @@ "product_view.xml", "account_assert_test.xml", "process/invoice_process.xml", - "process/statement_process.xml" + "process/statement_process.xml", ], "translations" : { "fr": "i18n/french_fr.csv" diff --git a/addons/account/process/invoice_process.xml b/addons/account/process/invoice_process.xml index 37575e9b653..9d39c9e8be8 100644 --- a/addons/account/process/invoice_process.xml +++ b/addons/account/process/invoice_process.xml @@ -23,6 +23,7 @@ + @@ -62,10 +63,11 @@ - + + @@ -102,7 +104,7 @@ - + diff --git a/addons/account/process/statement_process.xml b/addons/account/process/statement_process.xml index df5a544a293..3ee13ace8d5 100644 --- a/addons/account/process/statement_process.xml +++ b/addons/account/process/statement_process.xml @@ -78,10 +78,11 @@ + - + @@ -131,6 +132,15 @@ + + + + + + + + + diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py index 0e1c845cff6..a270736bb5c 100644 --- a/addons/document/__terp__.py +++ b/addons/document/__terp__.py @@ -14,7 +14,9 @@ """, "depends" : ["base", "process"], "init_xml" : ["document_data.xml"], - "update_xml" : ["document_view.xml"], + "update_xml" : ["document_view.xml", +# "process/document_process.xml" + ], "demo_xml" : ["document_demo.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 f21378fee04..6917812bedb 100644 --- a/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml +++ b/addons/hr_timesheet_sheet/process/hr_timesheet_sheet_process.xml @@ -89,6 +89,7 @@ + diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 95ac6df6f63..58f2dc7850c 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -858,7 +858,7 @@ class mrp_procurement(osv.osv): return True return False - def action_confirm(self, cr, uid, ids): + def action_confirm(self, cr, uid, ids, context={}): for procurement in self.browse(cr, uid, ids): if procurement.product_id.type in ('product', 'consu'): if not procurement.move_id: diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 38fdbeecaea..241a135868e 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -1,4 +1,3 @@ - @@ -43,6 +42,7 @@ + @@ -54,6 +54,7 @@ + @@ -109,6 +110,7 @@ + @@ -153,6 +155,7 @@ + @@ -164,6 +167,7 @@ + diff --git a/addons/project_mrp/process/project_mrp_process.xml b/addons/project_mrp/process/project_mrp_process.xml index b9c07b7bf6d..125d325f223 100644 --- a/addons/project_mrp/process/project_mrp_process.xml +++ b/addons/project_mrp/process/project_mrp_process.xml @@ -9,10 +9,11 @@ - + + @@ -35,6 +36,7 @@ + diff --git a/addons/purchase/process/purchase_process.xml b/addons/purchase/process/purchase_process.xml index 182812efe16..23891fda515 100644 --- a/addons/purchase/process/purchase_process.xml +++ b/addons/purchase/process/purchase_process.xml @@ -23,6 +23,7 @@ + @@ -67,6 +68,7 @@ + @@ -89,6 +91,7 @@ + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 829fcc61bf7..9f5716734cf 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -23,6 +23,7 @@ + @@ -34,6 +35,7 @@ + @@ -85,10 +87,11 @@ - + + @@ -96,10 +99,11 @@ - + + @@ -123,7 +127,7 @@ - + From 9cd8272f7669ba84e689a7a16ff58d2982b18ce8 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Wed, 15 Oct 2008 14:33:37 +0530 Subject: [PATCH 05/32] minor changes in process bzr revid: solanki.priyesh@gmail.com-20081015090337-78q7a2lov5cdqkd8 --- addons/mrp/process/procurement_process.xml | 6 +++--- addons/sale/process/sale_process.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/mrp/process/procurement_process.xml b/addons/mrp/process/procurement_process.xml index 241a135868e..866ad784349 100644 --- a/addons/mrp/process/procurement_process.xml +++ b/addons/mrp/process/procurement_process.xml @@ -130,7 +130,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -164,7 +164,7 @@ - + diff --git a/addons/sale/process/sale_process.xml b/addons/sale/process/sale_process.xml index 9f5716734cf..d91109ae331 100644 --- a/addons/sale/process/sale_process.xml +++ b/addons/sale/process/sale_process.xml @@ -127,7 +127,7 @@ - + From 313a7b00a540de8796e3273429353b9884b49e5e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Tue, 21 Oct 2008 08:38:29 +0200 Subject: [PATCH 06/32] improve_view bzr revid: fp@tinyerp.com-20081021063829-691gkyud6l45bn92 --- addons/mrp/mrp_view.xml | 41 +++++++++++++++++++++++++++-------------- 1 file changed, 27 insertions(+), 14 deletions(-) diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index bec2216b0c5..1d93353d4bd 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -27,9 +27,19 @@ form tree,form - - - + + + mrp.property.tree @@ -65,7 +75,10 @@ form tree,form - + + + + + + + + + + + + [[ company.name ]] + Print Journal - [[ company.currency_id.name ]] + + + + + + + [[ time.strftime("%Y-%m-%d %H:%M", time.localtime()) ]] + Page + + + + + 1cm 27.7cm 20cm 27.7cm + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [[ repeatIn(objects, 'o') ]] + + [[repeatIn(lines(data['form']['period_id'][0][2],data['form']['journal_id'][0][2],data['form']['sort_selection']), 'line') ]] + + + Date + + + Voucher No + + + A/c No. + + + Third party + + + Entry label + + + Debit + + + Credit + + + + + [[line[0].period_id.name ]] + + + [[line[0].journal_id.code ]] + + + + + [[ '%.2f' % sum_debit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]] + + + [[ '%.2f' % sum_credit(line[0].period_id.id, line[0].journal_id.id) or '0.00' ]] + + + + [[repeatIn(line,'l')]] + + [[ l.date ]] + + + [[ l.ref ]] + + + [[ l.account_id.code ]] + + + [[ l.partner_id and l.partner_id.name ]] + + + [[ l.name ]] + + + [[ l.debit and '%.2f' % l.debit or '0.00' ]] + + + [[ l.credit and '%.2f' % l.credit or '0.00' ]] + + + + + + + + \ No newline at end of file diff --git a/addons/account/wizard/__init__.py b/addons/account/wizard/__init__.py index 6ecd2040756..3cae8e78a95 100644 --- a/addons/account/wizard/__init__.py +++ b/addons/account/wizard/__init__.py @@ -64,6 +64,7 @@ import wizard_use_model import wizard_state_open import wizard_statement_from_invoice +import wizard_print_journal # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/account/wizard/wizard_print_journal.py b/addons/account/wizard/wizard_print_journal.py new file mode 100644 index 00000000000..d9440a8a231 --- /dev/null +++ b/addons/account/wizard/wizard_print_journal.py @@ -0,0 +1,71 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2004-2008 TINY SPRL. (http://tiny.be) 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 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. +# +# 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. +# +############################################################################## + +import wizard +import pooler + +form = ''' +
+ + + +''' + +fields = { + 'journal_id': {'string': 'Journal', 'type': 'many2many', 'relation': 'account.journal', 'required': True}, + 'period_id': {'string': 'Period', 'type': 'many2many', 'relation': 'account.period', 'required': True}, + 'sort_selection':{ + 'string':"Entries Sorted By", + 'type':'selection', + 'selection':[('date','By date'),('ref','Reference Number')], + 'required':True, + 'default': lambda *a: 'date', + }, + +} + +def print_journal(self, cr, uid, data, context): + return {} + +class wizard_print_journal(wizard.interface): + states = { + 'init': { + 'actions': [], + 'result': {'type': 'form', 'arch': form, 'fields': fields, 'state': (('end', 'Cancel'), ('print', 'Print'))}, + }, + 'print': { + 'actions': [print_journal], + 'result': {'type':'print', 'report':'account.journal.period.print.wiz', 'state':'end'}, + }, + } +wizard_print_journal('account.print.journal.report') + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + From 545e352bff25be3642629a67c69f22a083ec10fd Mon Sep 17 00:00:00 2001 From: qdp Date: Tue, 21 Oct 2008 15:27:31 +0200 Subject: [PATCH 13/32] *improved, bugfixed and corrected the chart of account for Luxembourg bzr revid: qdp@tinyerp.com-20081021132731-tgqi09btn35xsvmy --- addons/l10n_lu/__terp__.py | 4 +- addons/l10n_lu/account.tax.code.template.csv | 90 ++ addons/l10n_lu/account.tax.template.csv | 35 + addons/l10n_lu/l10n_lu_data.xml | 1053 +----------------- 4 files changed, 160 insertions(+), 1022 deletions(-) create mode 100644 addons/l10n_lu/account.tax.code.template.csv create mode 100644 addons/l10n_lu/account.tax.template.csv diff --git a/addons/l10n_lu/__terp__.py b/addons/l10n_lu/__terp__.py index 1391158f678..49761b3fdb5 100644 --- a/addons/l10n_lu/__terp__.py +++ b/addons/l10n_lu/__terp__.py @@ -12,9 +12,11 @@ This module install: *the main taxes used in Luxembourg""", "depends" : ["account","account_report","base_vat","base_iban"], "init_xml" : [ ], - "demo_xml" : [ "account.report.report.csv" ], + "demo_xml" : ["account.report.report.csv"], "update_xml" : [ + "account.tax.code.template.csv", "l10n_lu_data.xml", + "account.tax.template.csv", "l10n_lu_wizard.xml", "l10n_lu_report.xml", ], diff --git a/addons/l10n_lu/account.tax.code.template.csv b/addons/l10n_lu/account.tax.code.template.csv new file mode 100644 index 00000000000..eea68172e6c --- /dev/null +++ b/addons/l10n_lu/account.tax.code.template.csv @@ -0,0 +1,90 @@ +"parent_id:id","code","sign","id","name" +,,1,"account_tax_code_template_1","Plan de Taxes Luxembourgeois" +"account_tax_code_template_1",76,1,"account_tax_code_template_73","Solde à verser" +"account_tax_code_template_1",10,-1,"account_tax_code_template_8","Prestations de services (art 26)" +"account_tax_code_template_1",46,1,"account_tax_code_template_37","Total Base intracommunautaire" +"account_tax_code_template_1",52,1,"account_tax_code_template_50","Acquisition triangulaire" +"account_tax_code_template_1",61,1,"account_tax_code_template_63","Total Base Importation" +"account_tax_code_template_1",74,1,"account_tax_code_template_71","Excédent de taxe" +"account_tax_code_template_1",9,1,"account_tax_code_template_2","Total du chiffre d'affaires" +"account_tax_code_template_2",5,1,"account_tax_code_template_5","Prélèvements privés de services (art 16)" +"account_tax_code_template_2",4,1,"account_tax_code_template_4","Prélèvements privés de biens (art 13 a)" +"account_tax_code_template_2",8,1,"account_tax_code_template_7","Point 5" +"account_tax_code_template_2",3,1,"account_tax_code_template_3","1. Ventes ou recettes" +"account_tax_code_template_2",6,1,"account_tax_code_template_6","Affectation de biens (art 13 b)" +"account_tax_code_template_3","Exo",1,"account_tax_code_template_90","Total Exoneration" +"account_tax_code_template_3",22,1,"account_tax_code_template_17","Chiffre d'affaires imposable (sans TVA)" +"account_tax_code_template_8",422,1,"account_tax_code_template_87","Base des prestations de services (art.26/1/c et d)" +"account_tax_code_template_8",92,1,"account_tax_code_template_78","Livraisons de biens (art. 26) 6%" +"account_tax_code_template_17",33,1,"account_tax_code_template_28","Base CA 6%" +"account_tax_code_template_17",32,1,"account_tax_code_template_27","Base CA 15%" +"account_tax_code_template_17",82,1,"account_tax_code_template_31","Base CA au taux indéfini" +"account_tax_code_template_17",35,1,"account_tax_code_template_30","Base CA 12%" +"account_tax_code_template_17",34,1,"account_tax_code_template_29","Base CA 3%" +"account_tax_code_template_37",44,1,"account_tax_code_template_40","Base intracom. 3%" +"account_tax_code_template_37",85,1,"account_tax_code_template_42","Base intracom. exonérée" +"account_tax_code_template_37",43,1,"account_tax_code_template_39","Base intracom. 6%" +"account_tax_code_template_37",42,1,"account_tax_code_template_38","Base intracom. 15%" +"account_tax_code_template_37",45,1,"account_tax_code_template_41","Base intracom. 12%" +"account_tax_code_template_73",97,1,"account_tax_code_template_82","Taxe livraisons de biens (art. 26) 6%" +"account_tax_code_template_90",19,1,"account_tax_code_template_16","Point 7" +"account_tax_code_template_90",17,1,"account_tax_code_template_15","Autres opérations réalisées à l'étranger" +"account_tax_code_template_90",13,1,"account_tax_code_template_11","Autres exonérations (art 43)" +"account_tax_code_template_90",14,1,"account_tax_code_template_12","Autres exonérations (art 44)" +"account_tax_code_template_90",11,1,"account_tax_code_template_9","Livraisons intracommunautaires de biens" +"account_tax_code_template_90",12,1,"account_tax_code_template_10","Exportations (art 43)" +"account_tax_code_template_90",15,1,"account_tax_code_template_13","Tabacs fabriqués" +"account_tax_code_template_90",16,1,"account_tax_code_template_14","Livraisons / aquisitions intracom." +"account_tax_code_template_71",73,-1,"account_tax_code_template_70","Taxe en amont déductible" +"account_tax_code_template_71",98,1,"account_tax_code_template_83","Total de la taxe à payer" +"account_tax_code_template_83",72,1,"account_tax_code_template_69","Total de la taxe" +"account_tax_code_template_70",31,1,"account_tax_code_template_26","Taxe en amont déductible" +"account_tax_code_template_26",27,1,"account_tax_code_template_22","Taxe déclarée comme débiteur" +"account_tax_code_template_26",28,1,"account_tax_code_template_23","Taxe acquittée comme caution solidaire" +"account_tax_code_template_26",29,-1,"account_tax_code_template_24","Taxe non déductible / op. exonérée" +"account_tax_code_template_26",30,-1,"account_tax_code_template_25","Taxe non déductible (art 50)" +"account_tax_code_template_26",23,1,"account_tax_code_template_18","Achat de B. et S. à l'intérieur du pays" +"account_tax_code_template_26",24,1,"account_tax_code_template_19","Acquisitions intracom. de biens" +"account_tax_code_template_26",26,1,"account_tax_code_template_21","Affectations de biens" +"account_tax_code_template_26",25,1,"account_tax_code_template_20","Importations de biens" +"account_tax_code_template_69",70,1,"account_tax_code_template_59","Total Taxe Importation (entr.)" +"account_tax_code_template_69",219,1,"account_tax_code_template_88","Taxe des prestations de services (art.26/1/c et d)" +"account_tax_code_template_69",87,1,"account_tax_code_template_44","Report" +"account_tax_code_template_44",86,1,"account_tax_code_template_43","A reporter" +"account_tax_code_template_43",51,1,"account_tax_code_template_49","Total Taxe intracom." +"account_tax_code_template_49",47,1,"account_tax_code_template_45","Taxe intracom. 15%" +"account_tax_code_template_49",81,1,"account_tax_code_template_53","Base à un taux exonéré" +"account_tax_code_template_49",59,1,"account_tax_code_template_62","Base Importation (privées) 3%" +"account_tax_code_template_49",50,1,"account_tax_code_template_48","Taxe intracom. 12%" +"account_tax_code_template_49",48,1,"account_tax_code_template_46","taxe intracom. 6%" +"account_tax_code_template_49",49,1,"account_tax_code_template_47","Taxe intracom. 3%" +"account_tax_code_template_49",65,1,"account_tax_code_template_58","Taxe Importation (entr.) 12%" +"account_tax_code_template_69",71,1,"account_tax_code_template_68","Total Taxe Importation (privées)" +"account_tax_code_template_58",63,1,"account_tax_code_template_84","Taxe importation (entr.) 6%" +"account_tax_code_template_58",64,1,"account_tax_code_template_57","Taxe Importation (entr.) 3%" +"account_tax_code_template_58",62,1,"account_tax_code_template_56","Taxe Importation (entr.) 15%" +"account_tax_code_template_63",58,1,"account_tax_code_template_61","Base Importation (privées) 6%" +"account_tax_code_template_63",54,1,"account_tax_code_template_52","Base Importation (entr.) 6%" +"account_tax_code_template_63",57,1,"account_tax_code_template_60","Base Importation (privées) 15%" +"account_tax_code_template_63",56,1,"account_tax_code_template_55","Base Importation (entr.) 12%" +"account_tax_code_template_63",55,1,"account_tax_code_template_54","Base Importation (entr.) 3%" +"account_tax_code_template_63",53,1,"account_tax_code_template_51","Base importation (entr.) 15%" +"account_tax_code_template_63",60,1,"account_tax_code_template_85","Base importation (privées.) 12%" +"account_tax_code_template_68",68,1,"account_tax_code_template_66","Taxe Importation (privées) 3%" +"account_tax_code_template_68",69,1,"account_tax_code_template_67","Taxe Importation (privées) 12%" +"account_tax_code_template_68",67,1,"account_tax_code_template_65","Taxe Importation (privées) 6%" +"account_tax_code_template_68",66,1,"account_tax_code_template_64","Taxe Importation (privées) 15%" +"account_tax_code_template_87",89,1,"account_tax_code_template_75","Prestations de services (art. 26) 6%" +"account_tax_code_template_87",88,1,"account_tax_code_template_74","Prestations de services (art. 26) 15%" +"account_tax_code_template_87",91,1,"account_tax_code_template_77","Prestations de services (art. 26) 12%" +"account_tax_code_template_87",90,1,"account_tax_code_template_76","Prestations de services (art. 26) 3%" +"account_tax_code_template_88",94,1,"account_tax_code_template_79","Taxe prestations de services (art. 26) 6%" +"account_tax_code_template_88",93,1,"account_tax_code_template_86","Taxe prestation de services (Art.26) 15%" +"account_tax_code_template_88",96,1,"account_tax_code_template_81","Taxe prestations de services (art. 26) 12%" +"account_tax_code_template_88",95,1,"account_tax_code_template_80","Taxe prestations de services (art. 26) 3%" +"account_tax_code_template_43",41,1,"account_tax_code_template_89",41 +"account_tax_code_template_89",40,1,"account_tax_code_template_35","Taxes CA 12%" +"account_tax_code_template_89",83,1,"account_tax_code_template_36","Taxe au taux indéfini" +"account_tax_code_template_89",39,1,"account_tax_code_template_34","Taxe CA 3%" +"account_tax_code_template_89",37,1,"account_tax_code_template_32","Taxe CA 15%" +"account_tax_code_template_89",38,1,"account_tax_code_template_33","Taxe CA 6%" diff --git a/addons/l10n_lu/account.tax.template.csv b/addons/l10n_lu/account.tax.template.csv new file mode 100644 index 00000000000..93b4aaa28ea --- /dev/null +++ b/addons/l10n_lu/account.tax.template.csv @@ -0,0 +1,35 @@ +"ref_base_code_id:id","ref_base_sign","name","ref_tax_code_id:id","account_collected_id:id","amount","chart_template_id:id","tax_code_id:id","child_depend","include_base_amount","parent_id:id","tax_sign","account_paid_id:id","base_code_id:id","id","ref_tax_sign" +"account_tax_code_template_9",-1,"Intra Travail à façon 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_1",1 +"account_tax_code_template_9",-1,"Intra Livraison avec installation 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_2",1 +"account_tax_code_template_9",-1,"Intra transfert de biens 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_9","account_tax_template_3",1 +"account_tax_code_template_13",-1,"Vente de tabacs 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_13","account_tax_template_9",1 +"account_tax_code_template_10",-1,"Exportations 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,"account_tax_code_template_10","account_tax_template_10",1 +,1,"Achats frais généraux 0%",,,"0.0000","l10nlu_chart_template",,0,0,,1,,,"account_tax_template_11",1 +"account_tax_code_template_29",-1,"Ventes 3%","account_tax_code_template_34","account_451000","0.0300","l10nlu_chart_template","account_tax_code_template_34",0,0,,1,"account_451000","account_tax_code_template_29","account_tax_template_5",-1 +"account_tax_code_template_28",-1,"Ventes 6%","account_tax_code_template_33","account_451000","0.0600","l10nlu_chart_template","account_tax_code_template_33",0,0,,1,"account_451000","account_tax_code_template_28","account_tax_template_6",-1 +"account_tax_code_template_30",-1,"Ventes 12%","account_tax_code_template_35","account_451000","0.1200","l10nlu_chart_template","account_tax_code_template_35",0,0,,1,"account_451000","account_tax_code_template_30","account_tax_template_7",-1 +"account_tax_code_template_27",-1,"Ventes 15%","account_tax_code_template_32","account_451000","0.1500","l10nlu_chart_template","account_tax_code_template_32",0,0,,1,"account_451000","account_tax_code_template_27","account_tax_template_8",-1 +,1,"Achats frais généraux 15%","account_tax_code_template_18","account_411000","0.1500","l10nlu_chart_template","account_tax_code_template_18",0,0,,1,"account_411000",,"account_tax_template_12",-1 +,1,"Achats Intra-Co",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_13",1 +,1,"Achats de Services Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_18",1 +,1,"Ventes de Services Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_21",1 +,1,"Livraison de Biens Triangulaire 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,,1,"account_411000","account_tax_code_template_38","account_tax_template_26",1 +,1,"Livraisons de biens triangulaire 2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,,-1,"account_451000",,"account_tax_template_25",1 +,1,"Importations a des fins de l'entreprise",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_30",1 +,1,"Importations a des fins privées",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_33",1 +,1,"Livraisons de Biens Art.26",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_36",1 +,1,"Livraison de Biens triangulaire",,,1,"l10nlu_chart_template",,1,0,,1,,"account_tax_code_template_38","account_tax_template_24",1 +,1,"Livraisons de biens triangulaire 2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_24",-1,"account_451000",,"account_tax_template_22",1 +,1,"Livraison de Biens Triangulaire 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_24",1,"account_411000","account_tax_code_template_38","account_tax_template_23",1 +,1,"Importations Intra-Co2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_56",0,0,"account_tax_template_30",-1,"account_411000","account_tax_code_template_51","account_tax_template_28",1 +,1,"Importations Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_20",0,0,"account_tax_template_30",1,"account_411000",,"account_tax_template_29",1 +,1,"Importations Fins Privées",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_64",0,0,"account_tax_template_33",-1,"account_411000","account_tax_code_template_60","account_tax_template_31",1 +,1,"Importations Fins Privées",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_20",0,0,"account_tax_template_33",1,"account_411000",,"account_tax_template_32",1 +,1,"Livraison de Biens Art26",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_36",-1,"account_451000",,"account_tax_template_34",1 +,1,"Livraisons de Biens Art26",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_82",0,0,"account_tax_template_36",1,"account_411000","account_tax_code_template_78","account_tax_template_35",1 +,1,"Achats Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_19",0,0,"account_tax_template_13",1,"account_411000","account_tax_code_template_38","account_tax_template_14",1 +,1,"Achats Intra-CO2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_13",-1,"account_411000",,"account_tax_template_15",1 +,1,"Services Intra-Co2",,"account_451000","-0.1500","l10nlu_chart_template","account_tax_code_template_45",0,0,"account_tax_template_18",-1,"account_411000",,"account_tax_template_17",1 +,1,"Services Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_18",1,"account_411000","account_tax_code_template_38","account_tax_template_16",1 +,1,"Services Intra-Co2",,"account_411000","-0.1500","l10nlu_chart_template","account_tax_code_template_22",0,0,"account_tax_template_21",-1,"account_451000",,"account_tax_template_19",1 +,1,"Services Intra-Co 1",,"account_411500","0.1500","l10nlu_chart_template","account_tax_code_template_86",0,0,"account_tax_template_21",1,"account_411000","account_tax_code_template_74","account_tax_template_20",1 diff --git a/addons/l10n_lu/l10n_lu_data.xml b/addons/l10n_lu/l10n_lu_data.xml index ed23a24df70..ce071ad4cc5 100644 --- a/addons/l10n_lu/l10n_lu_data.xml +++ b/addons/l10n_lu/l10n_lu_data.xml @@ -1,7 +1,6 @@ - @@ -20,6 +19,11 @@ liability balance + + Créances + creances + balance + Equity equity @@ -41,543 +45,6 @@ balance - - - Plan de Taxes Luxembourgeois - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2614,9 +2081,11 @@ 401000 Effets à recevoir - clients - + True + - other + receivable + 403000 @@ -2624,7 +2093,7 @@ - other + receivable 404000 @@ -2637,10 +2106,10 @@ 406000 Acomptes versés aux fournisseurs - + - other + payable 407000 @@ -2677,15 +2146,15 @@ 411000 T.v.a en amont - - + + True other 411100 T.v.a soumise à l'origine amont - + other @@ -2693,7 +2162,7 @@ 411500 Compte courant tva - + other @@ -2709,7 +2178,7 @@ 413100 Autres créances sur entrepr. liées - + other @@ -2910,7 +2379,8 @@ 441000 Effets à payer - + True + other @@ -2918,7 +2388,8 @@ 442000 Factures à recevoir - + True + other @@ -2950,7 +2421,8 @@ 451000 T.v.a en aval - + True + other @@ -2958,7 +2430,8 @@ 451100 T.v.a soumise à l'origine aval - + True + other @@ -2966,7 +2439,8 @@ 451200 T.v.a intracom - + True + other @@ -3310,7 +2784,8 @@ 580000 Virements internes - + True + other @@ -4296,478 +3771,14 @@ PCMN for Luxembourg - + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From c3ba63722f47a82adf6e9248097d85653424f817 Mon Sep 17 00:00:00 2001 From: Priyesh Date: Tue, 21 Oct 2008 18:58:47 +0530 Subject: [PATCH 14/32] modified files of process bzr revid: solanki.priyesh@gmail.com-20081021132847-5vf9d0djh3fhmc9a --- addons/.project | 17 ++ addons/crm_configuration/__terp__.py | 4 +- .../process/crm_configuration_process.xml | 113 +++++++++ addons/document/__terp__.py | 3 +- addons/document/process/document_process.xml | 25 ++ addons/hr/__terp__.py | 3 +- addons/hr/process/hr_process.xml | 84 +++++++ addons/hr_holidays/__terp__.py | 2 +- .../process/hr_holidays_process.xml | 45 ++++ addons/hr_timesheet_project/__terp__.py | 2 +- addons/lunch/__init__.py | 6 + addons/lunch/__terp__.py | 15 ++ addons/lunch/lunch.py | 171 +++++++++++++ addons/lunch/lunch_demo.xml | 20 ++ addons/lunch/lunch_report.xml | 14 ++ addons/lunch/lunch_view.xml | 232 ++++++++++++++++++ addons/lunch/lunch_wizard.xml | 27 ++ addons/lunch/process/lunch_process.xml | 25 ++ addons/lunch/report/__init__.py | 4 + addons/lunch/report/order.py | 53 ++++ addons/lunch/report/order.rml | 132 ++++++++++ addons/lunch/wizard/__init__.py | 6 + addons/lunch/wizard/cancel.py | 34 +++ addons/lunch/wizard/confirm.py | 67 +++++ addons/lunch/wizard/reset_box.py | 56 +++++ addons/partner_ldap/__init__.py | 5 + addons/partner_ldap/__terp__.py | 18 ++ addons/partner_ldap/partner.py | 42 ++++ .../process/partner_ldap_process.xml | 33 +++ addons/partner_ldap/wizard.xml | 7 + addons/partner_ldap/wizard/__init__.py | 4 + addons/partner_ldap/wizard/synchronize.py | 149 +++++++++++ addons/sale_crm/__terp__.py | 6 +- addons/sale_crm/process/sale_crm_process.xml | 26 ++ addons/sandwich/__init__.py | 6 + addons/sandwich/__terp__.py | 14 ++ addons/sandwich/report/__init__.py | 4 + addons/sandwich/report/sandwich_report.py | 45 ++++ addons/sandwich/report/sandwich_report.rml | 142 +++++++++++ addons/sandwich/sandwich.py | 101 ++++++++ addons/sandwich/sandwich_demo.xml | 81 ++++++ addons/sandwich/sandwich_report.xml | 11 + addons/sandwich/sandwich_view.xml | 191 ++++++++++++++ addons/sandwich/sandwich_wizard.xml | 16 ++ addons/sandwich/wizard/__init__.py | 32 +++ addons/sandwich/wizard/order_create.py | 83 +++++++ addons/sandwich/wizard/sandwich_wizard.py | 131 ++++++++++ 47 files changed, 2299 insertions(+), 8 deletions(-) create mode 100644 addons/.project create mode 100644 addons/crm_configuration/process/crm_configuration_process.xml create mode 100644 addons/document/process/document_process.xml create mode 100644 addons/hr/process/hr_process.xml create mode 100644 addons/hr_holidays/process/hr_holidays_process.xml create mode 100644 addons/lunch/__init__.py create mode 100644 addons/lunch/__terp__.py create mode 100644 addons/lunch/lunch.py create mode 100644 addons/lunch/lunch_demo.xml create mode 100644 addons/lunch/lunch_report.xml create mode 100644 addons/lunch/lunch_view.xml create mode 100644 addons/lunch/lunch_wizard.xml create mode 100644 addons/lunch/process/lunch_process.xml create mode 100644 addons/lunch/report/__init__.py create mode 100644 addons/lunch/report/order.py create mode 100644 addons/lunch/report/order.rml create mode 100644 addons/lunch/wizard/__init__.py create mode 100644 addons/lunch/wizard/cancel.py create mode 100644 addons/lunch/wizard/confirm.py create mode 100644 addons/lunch/wizard/reset_box.py create mode 100644 addons/partner_ldap/__init__.py create mode 100644 addons/partner_ldap/__terp__.py create mode 100644 addons/partner_ldap/partner.py create mode 100644 addons/partner_ldap/process/partner_ldap_process.xml create mode 100644 addons/partner_ldap/wizard.xml create mode 100644 addons/partner_ldap/wizard/__init__.py create mode 100644 addons/partner_ldap/wizard/synchronize.py create mode 100644 addons/sale_crm/process/sale_crm_process.xml create mode 100644 addons/sandwich/__init__.py create mode 100644 addons/sandwich/__terp__.py create mode 100644 addons/sandwich/report/__init__.py create mode 100644 addons/sandwich/report/sandwich_report.py create mode 100644 addons/sandwich/report/sandwich_report.rml create mode 100644 addons/sandwich/sandwich.py create mode 100644 addons/sandwich/sandwich_demo.xml create mode 100644 addons/sandwich/sandwich_report.xml create mode 100644 addons/sandwich/sandwich_view.xml create mode 100644 addons/sandwich/sandwich_wizard.xml create mode 100644 addons/sandwich/wizard/__init__.py create mode 100644 addons/sandwich/wizard/order_create.py create mode 100644 addons/sandwich/wizard/sandwich_wizard.py diff --git a/addons/.project b/addons/.project new file mode 100644 index 00000000000..8fc3cc934ff --- /dev/null +++ b/addons/.project @@ -0,0 +1,17 @@ + + + pso-newaddons + + + + + + org.python.pydev.PyDevBuilder + + + + + + org.python.pydev.pythonNature + + diff --git a/addons/crm_configuration/__terp__.py b/addons/crm_configuration/__terp__.py index 1e5653dba61..0f6ccf2cabf 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", "process"], + "depends" : ["crm","report_crm", "process", "account"], "init_xml" : [ "crm_config_view.xml", "crm_bugs_view.xml", @@ -40,7 +40,7 @@ "crm_helpdesk_menu.xml", "crm_lead_menu.xml", "crm_meeting_menu.xml", "security/ir.model.access.csv", -# "process/crm_configuration_process.xml", + "process/crm_configuration_process.xml", ], "active": False, "installable": True diff --git a/addons/crm_configuration/process/crm_configuration_process.xml b/addons/crm_configuration/process/crm_configuration_process.xml new file mode 100644 index 00000000000..b7fa5202017 --- /dev/null +++ b/addons/crm_configuration/process/crm_configuration_process.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/document/__terp__.py b/addons/document/__terp__.py index 94abf642361..aafdbebdb1a 100644 --- a/addons/document/__terp__.py +++ b/addons/document/__terp__.py @@ -12,12 +12,13 @@ * User Authentification * Document Indexation """, - "depends" : ["base", "process"], + "depends" : ["base", "process", "hr"], "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 new file mode 100644 index 00000000000..3c37c793ab4 --- /dev/null +++ b/addons/document/process/document_process.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr/__terp__.py b/addons/hr/__terp__.py index 7da1af96772..1e5c9ff7e12 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", "process"], + "depends" : ["base", "crm_configuration", "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/process/hr_process.xml b/addons/hr/process/hr_process.xml new file mode 100644 index 00000000000..bfb0ad21f2a --- /dev/null +++ b/addons/hr/process/hr_process.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py index 6f3188d6acf..982b5624c19 100644 --- a/addons/hr_holidays/__terp__.py +++ b/addons/hr_holidays/__terp__.py @@ -32,7 +32,7 @@ "hr_view.xml", "hr_holidays_report.xml", "hr_holidays_wizard.xml", -# "process/hr_holidays_process.xml" + "process/hr_holidays_process.xml" ], # "demo_xml" : ["hr_bel_holidays_2008.xml",], "demo_xml" : [], diff --git a/addons/hr_holidays/process/hr_holidays_process.xml b/addons/hr_holidays/process/hr_holidays_process.xml new file mode 100644 index 00000000000..4cbddc9c423 --- /dev/null +++ b/addons/hr_holidays/process/hr_holidays_process.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/hr_timesheet_project/__terp__.py b/addons/hr_timesheet_project/__terp__.py index 0e41dbc8420..e3c24de5ea0 100644 --- a/addons/hr_timesheet_project/__terp__.py +++ b/addons/hr_timesheet_project/__terp__.py @@ -35,7 +35,7 @@ "website" : "http://tinyerp.com/module_hr.html", "depends" : ["project", "hr_timesheet_sheet"], "update_xml" : ["hr_timesheet_project_view.xml", -# "process/hr_timesheet_project_process.xml", + "process/hr_timesheet_project_process.xml", ], "active": False, "installable": True diff --git a/addons/lunch/__init__.py b/addons/lunch/__init__.py new file mode 100644 index 00000000000..949e893c0f0 --- /dev/null +++ b/addons/lunch/__init__.py @@ -0,0 +1,6 @@ +# -*- encoding: utf-8 -*- +import lunch +import wizard +import report +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/__terp__.py b/addons/lunch/__terp__.py new file mode 100644 index 00000000000..46da1f5e13f --- /dev/null +++ b/addons/lunch/__terp__.py @@ -0,0 +1,15 @@ +# -*- encoding: utf-8 -*- +{ + "name": "Lunch Module", + "author": "Tiny", + "version": "0.1", + "depends": ["base", "process", "hr"], + "init_xml": [], + "update_xml": ['lunch_wizard.xml', 'lunch_view.xml', 'lunch_report.xml', + 'process/lunch_process.xml' + ], + "demo_xml": ['lunch_demo.xml'], + "installable": True, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py new file mode 100644 index 00000000000..167a075d95b --- /dev/null +++ b/addons/lunch/lunch.py @@ -0,0 +1,171 @@ +# -*- encoding: utf-8 -*- +from osv import osv, fields +import time + +class lunch_category(osv.osv): + _name = 'lunch.category' + _description = "Category" + + _columns = { + 'name': fields.char('Name', required=True, size=50), + } + + _order = 'name' + +lunch_category() + +class lunch_product(osv.osv): + _name = 'lunch.product' + + def _category_name_get(self, cr, uid, context={}): + obj = self.pool.get('lunch.category') + cat_ids= obj.search(cr,uid,[]) + res = obj.read(cr,uid,cat_ids,['name', 'category']) + return [(str(r['id']), r['name']) for r in res]+ [('0','')] + + _columns = { + 'name': fields.char('Name', size=50, required=True), + 'category_id': fields.selection(_category_name_get, 'Category', size=32), + 'description': fields.char('Description', size=128, required=False), + 'price': fields.float('Price', digits=(16,2)), + 'active': fields.boolean('Active'), + } + + _defaults = { + 'active': lambda *a : True, + } + +lunch_product() + +class lunch_cashbox(osv.osv): + _name='lunch.cashbox' + + def amount_available(self, cr, uid, ids, field_name, arg, context): + cr.execute("SELECT box,sum(amount) from lunch_cashmove where active = 't' group by box") + r = dict(cr.fetchall()) + for i in ids : + r.setdefault(i,0) + return r + + _columns={ + 'manager':fields.many2one('res.users','Manager'), + 'name':fields.char('Name',size=30,required=True, unique = True), + 'sum_remain': fields.function(amount_available, method=True, string='Remained Total'), + } + +lunch_cashbox() + + + + +class lunch_cashmove(osv.osv): + _name= 'lunch.cashmove' + + _columns={ + 'name': fields.char('Name',size=128), + 'user_cashmove': fields.many2one('res.users','User Name', required=True), + 'amount': fields.float('Amount', digits=(16,2)), + 'box':fields.many2one('lunch.cashbox','Box Name',size=30,required=True), + 'active':fields.boolean('Active'), + 'create_date': fields.datetime('Created date', readonly=True), + } + + _defaults={ + 'active': lambda *a: True, + } + +lunch_cashmove() + + + +class lunch_order(osv.osv): + _name='lunch.order' + _rec_name= "user_id" + + def _price_get(self, cr, uid, ids, name, args, context=None): + res = {} + for o in self.browse(cr, uid, ids): + res[o.id] = o.product.price + return res + + _columns={ + 'user_id': fields.many2one('res.users','User Name', required=True, + readonly=True, states={'draft':[('readonly',False)]}), + 'product':fields.many2one('lunch.product','Product', required=True, + readonly=True, states={'draft':[('readonly',False)]}, change_default=True), + 'date': fields.date('Date',readonly=True,states={'draft':[('readonly',False)]}), + 'cashmove':fields.many2one('lunch.cashmove', 'CashMove' , readonly=True ), + 'descript':fields.char('Description Order', readonly=True, size=50, + states={'draft':[('readonly',False)]}), + 'state': fields.selection([('draft','Draft'), ('confirmed','Confirmed'),], + 'State', readonly=True, select=True), + 'price': fields.function(_price_get, method=True, string="Price"), + } + + _defaults={ + 'user_id': lambda self,cr,uid,context: uid, + 'date': lambda self,cr,uid,context: time.strftime('%Y-%m-%d'), + 'state': lambda self,cr,uid,context: 'draft', + } + + def confirm(self,cr,uid,ids,box,context): + cashmove_ref= self.pool.get('lunch.cashmove') + for order in self.browse(cr,uid,ids): + if order.state == 'confirmed': + continue + new_id= cashmove_ref.create(cr,uid,{'name': order.product.name+' order', + 'amount':-order.product.price, + 'user_cashmove':order.user_id.id, + 'box':box, + 'active':True, + }) + self.write(cr,uid,[order.id],{'cashmove':new_id, 'state':'confirmed'}) + return {} + + def lunch_order_cancel(self,cr,uid,ids,context): + orders= self.browse(cr,uid,ids) + for order in orders: + if not order.cashmove: + continue + self.pool.get('lunch.cashmove').unlink(cr, uid, [order.cashmove.id]) + self.write(cr,uid,ids,{'state':'draft'}) + return {} + + def onchange_product(self, cr, uid, ids, product): + if not product: + return {'value': {'price': 0.0}} + price = self.pool.get('lunch.product').read(cr, uid, product, ['price'])['price'] + return {'value': {'price': price}} + +lunch_order() + +class report_lunch_amount(osv.osv): + _name='report.lunch.amount' + _description = "Amount available by user and box" + _auto = False + _rec_name= "user" + + _columns = { + 'user_id': fields.many2one('res.users','User Name',readonly=True), + 'amount': fields.float('Amount', readonly=True, digits=(16,2)), + 'box':fields.many2one('lunch.cashbox','Box Name',size=30,readonly=True), + } + + def init(self, cr): + cr.execute(""" + create or replace view report_lunch_amount as ( + select + min(lc.id) as id, + lc.user_cashmove as user_id, + sum(amount) as amount, + lc.box as box + from + lunch_cashmove lc + where + active = 't' + group by lc.user_cashmove, lc.box + )""") + +report_lunch_amount() +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/lunch_demo.xml b/addons/lunch/lunch_demo.xml new file mode 100644 index 00000000000..e26680f5253 --- /dev/null +++ b/addons/lunch/lunch_demo.xml @@ -0,0 +1,20 @@ + + + + + + Sandwich + + + + Club + + 2.75 + + + + Cashbox + + + + diff --git a/addons/lunch/lunch_report.xml b/addons/lunch/lunch_report.xml new file mode 100644 index 00000000000..3cdd8cb418c --- /dev/null +++ b/addons/lunch/lunch_report.xml @@ -0,0 +1,14 @@ + + + + + + + diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml new file mode 100644 index 00000000000..5862089067a --- /dev/null +++ b/addons/lunch/lunch_view.xml @@ -0,0 +1,232 @@ + + + + + + + + + + Order + lunch.order + +
+ + + + + + + + + +
+ + + + + Order + lunch.order + tree + + + + + + + + + + + + + + + + + Make order + lunch.order + form,tree + + + + + Order of the day + lunch.order + [('date','=',time.strftime('%Y-%m-%d'))] + + + + + + CashBox + lunch.cashbox + +
+ + + + +
+ + + CashBox + lunch.cashbox + tree + + + + + + + + + + + CashBox + lunch.cashbox + + + + + CashMove + lunch.cashmove + +
+ + + + + + + +
+ + + CashMove + lunch.cashmove + tree + + + + + + + + + + + + + CashMove + lunch.cashmove + + + + + + Category of product + lunch.category + +
+ + + + +
+ + + Category + lunch.category + tree + + + + + + + + + + Category of product + lunch.category + + + + Products + form + lunch.product + +
+ + + + + + + +
+ + + + Products + lunch.product + tree + + + + + + + + + + + + Product + lunch.product + + + + + + + + + Lunch amount + report.lunch.amount + tree + + + + + + + + + + + Lunch amount + report.lunch.amount + form + +
+ + + + + +
+ + + + Lunch amount + report.lunch.amount + form + tree,form + + + + + + diff --git a/addons/lunch/lunch_wizard.xml b/addons/lunch/lunch_wizard.xml new file mode 100644 index 00000000000..ec9f7fea855 --- /dev/null +++ b/addons/lunch/lunch_wizard.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + diff --git a/addons/lunch/process/lunch_process.xml b/addons/lunch/process/lunch_process.xml new file mode 100644 index 00000000000..4818d9d93f9 --- /dev/null +++ b/addons/lunch/process/lunch_process.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/addons/lunch/report/__init__.py b/addons/lunch/report/__init__.py new file mode 100644 index 00000000000..efaffa8d307 --- /dev/null +++ b/addons/lunch/report/__init__.py @@ -0,0 +1,4 @@ +# -*- encoding: utf-8 -*- +import order +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/report/order.py b/addons/lunch/report/order.py new file mode 100644 index 00000000000..7824bade083 --- /dev/null +++ b/addons/lunch/report/order.py @@ -0,0 +1,53 @@ +# -*- encoding: utf-8 -*- +############################################################################## +# +# Copyright (c) 2006 TINY SPRL. (http://tiny.be) All Rights Reserved. +# +# 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 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. +# +# 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. +# +############################################################################## + +import time +from report import report_sxw +from osv import osv + + +class order(report_sxw.rml_parse): + + def sum_price(self, orders): + res = 0.0 + for o in orders: + res += o.price + return res + + def __init__(self, cr, uid, name, context): + super(order, self).__init__(cr, uid, name, context) + + self.localcontext.update({ + 'time': time, + 'sum_price': self.sum_price, + }) + +report_sxw.report_sxw('report.lunch.order', 'lunch.order', + 'addons/lunch/report/order.rml',parser=order, header=False) +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/report/order.rml b/addons/lunch/report/order.rml new file mode 100644 index 00000000000..a7bc1b32cdd --- /dev/null +++ b/addons/lunch/report/order.rml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Printed at : [[time.strftime("%Hh%M")]] + + + + + + + + + + + Name + + + Order + + + Description + + + Unit Price + + + +
+ + + +
+ + + + [[repeatIn(objects, 'o') ]] + [[ o.user_id.name ]] + + + [[o.product.name ]] + + + [[ o.descript ]] + + + + + + [['%.2f' % o.price ]] + + + + + + + + + + + + + + + + + + + + [[ '%.2f' % sum_price(objects) ]] + + + + + + + + + diff --git a/addons/lunch/wizard/__init__.py b/addons/lunch/wizard/__init__.py new file mode 100644 index 00000000000..26328e41dc2 --- /dev/null +++ b/addons/lunch/wizard/__init__.py @@ -0,0 +1,6 @@ +# -*- encoding: utf-8 -*- +import confirm +import cancel +import reset_box +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/lunch/wizard/cancel.py b/addons/lunch/wizard/cancel.py new file mode 100644 index 00000000000..15ad6b96451 --- /dev/null +++ b/addons/lunch/wizard/cancel.py @@ -0,0 +1,34 @@ +# -*- encoding: utf-8 -*- + +import wizard +import netsvc +import ir +import pooler + +cancel_form = """ +
+