diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-11-08 17:22:44 +0100 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-11-08 17:22:44 +0100 |
| commit | b742a2fbef5caacb19a8c080ee3df4fbfc53f3dd (patch) | |
| tree | 7344405953634b90b61ccd4acb9f0448bec07bef | |
| parent | 2e0bb35d3e50d8401c2c8c8b408747d9ea00f747 (diff) | |
| parent | a9c17d03d5ff22d580455c0d89d7e9713d1d025c (diff) | |
[merge]
bzr revid: nicolas.vanhoren@openerp.com-20111108162244-1x4yappursemha5k
324 files changed, 4639 insertions, 1803 deletions
diff --git a/addons/account/account.py b/addons/account/account.py index e13858c73ce..ef3df95a317 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -144,7 +144,7 @@ class account_account_type(osv.osv): ('none','/'), ('income','Profit & Loss (Income Accounts)'), ('expense','Profit & Loss (Expense Accounts)'), - ('asset','Balance Sheet (Assets Accounts)'), + ('asset','Balance Sheet (Asset Accounts)'), ('liability','Balance Sheet (Liability Accounts)') ],'P&L / BS Category', select=True, readonly=False, help="This field is used to generate legal reports: profit and loss, balance sheet.", required=True), 'note': fields.text('Description'), diff --git a/addons/account/account_bank.py b/addons/account/account_bank.py index a3d66ccdf7c..2a9e432894f 100644 --- a/addons/account/account_bank.py +++ b/addons/account/account_bank.py @@ -37,6 +37,10 @@ class bank(osv.osv): self.post_write(cr, uid, ids, context=context) return result + def _prepare_name(self, bank): + "Return the name to use when creating a bank journal" + return (bank.bank_name or '') + ' ' + bank.acc_number + def post_write(self, cr, uid, ids, context={}): obj_acc = self.pool.get('account.account') obj_data = self.pool.get('ir.model.data') @@ -45,7 +49,7 @@ class bank(osv.osv): # Find the code and parent of the bank account to create dig = 6 current_num = 1 - ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context) + ids = obj_acc.search(cr, uid, [('type','=','liquidity')], context=context) # No liquidity account exists, no template available if not ids: continue @@ -57,9 +61,9 @@ class bank(osv.osv): if not ids: break current_num += 1 - + name = self._prepare_name(bank) acc = { - 'name': (bank.bank_name or '')+' '+bank.acc_number, + 'name': name, 'currency_id': bank.company_id.currency_id.id, 'code': new_code, 'type': 'liquidity', @@ -74,7 +78,7 @@ class bank(osv.osv): data_id = obj_data.search(cr, uid, [('model','=','account.journal.view'), ('name','=','account_journal_bank_view')]) data = obj_data.browse(cr, uid, data_id[0], context=context) view_id_cash = data.res_id - + jour_obj = self.pool.get('account.journal') new_code = 1 while True: @@ -86,7 +90,7 @@ class bank(osv.osv): #create the bank journal vals_journal = { - 'name': (bank.bank_name or '')+' '+bank.acc_number, + 'name': name, 'code': code, 'type': 'bank', 'company_id': bank.company_id.id, @@ -100,4 +104,3 @@ class bank(osv.osv): self.write(cr, uid, [bank.id], {'journal_id': journal_id}, context=context) return True - diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index 6b2430e7e54..5206b65317f 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -4172,7 +4172,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/ar.po b/addons/account/i18n/ar.po index 3452aeb4a19..54a4ed3c9e8 100644 --- a/addons/account/i18n/ar.po +++ b/addons/account/i18n/ar.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -266,7 +266,7 @@ msgstr "" #: code:addons/account/invoice.py:1210 #, python-format msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)" -msgstr "" +msgstr "فاتورة '%s' ستدفع علي الأجزاء التالية: %s%s of %s%s (%s%s المتبقي)" #. module: account #: model:process.transition,note:account.process_transition_supplierentriesreconcile0 @@ -664,7 +664,7 @@ msgstr "" #. module: account #: field:account.fiscalyear.close,period_id:0 msgid "Opening Entries Period" -msgstr "" +msgstr "فترة قيود إفتتاحية" #. module: account #: model:ir.model,name:account.model_account_journal_period @@ -1325,7 +1325,7 @@ msgstr "لا يمكنك إستخدام هذا الحساب العام في هذ #: report:pl.account:0 #: report:pl.account.horizontal:0 msgid "With balance is not equal to 0" -msgstr "" +msgstr "برصيد لا يساوي صفر" #. module: account #: view:account.tax:0 @@ -4371,7 +4371,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/bg.po b/addons/account/i18n/bg.po index 7ae8139a664..b6f703a02cb 100644 --- a/addons/account/i18n/bg.po +++ b/addons/account/i18n/bg.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4444,7 +4444,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/br.po b/addons/account/i18n/br.po index a15e99c5d2b..b6732915bcf 100644 --- a/addons/account/i18n/br.po +++ b/addons/account/i18n/br.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/bs.po b/addons/account/i18n/bs.po index aefaed16603..31f8d5e5ff7 100644 --- a/addons/account/i18n/bs.po +++ b/addons/account/i18n/bs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4388,7 +4388,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/ca.po b/addons/account/i18n/ca.po index e8910ba04cf..989d6033466 100644 --- a/addons/account/i18n/ca.po +++ b/addons/account/i18n/ca.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-08-17 22:28+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 13:03+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4596,7 +4596,7 @@ msgstr "Apunts comptables" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Balanç de situació (comptes d'actiu)" #. module: account @@ -11762,6 +11762,9 @@ msgstr "Passiu" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balanç de situació (comptes d'actiu)" + #, python-format #~ msgid "is validated." #~ msgstr "està validada." diff --git a/addons/account/i18n/cs.po b/addons/account/i18n/cs.po index da3365826c0..240bbf5c248 100644 --- a/addons/account/i18n/cs.po +++ b/addons/account/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-16 08:47+0000\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" "Last-Translator: Jiří Hajda <robie@centrum.cz>\n" "Language-Team: Czech <cs@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" @@ -4458,7 +4458,7 @@ msgstr "Položky deníku" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Rozvaha (Majetkové účty)" #. module: account @@ -10150,5 +10150,8 @@ msgstr "" #~ msgid "The statement balance is incorrect !\n" #~ msgstr "Nesprávný zůstatek výpisu!\n" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Rozvaha (Majetkové účty)" + #~ msgid "Chart of Account" #~ msgstr "Účtový rozvrh" diff --git a/addons/account/i18n/da.po b/addons/account/i18n/da.po index 5898d0f34d7..448a89899b9 100644 --- a/addons/account/i18n/da.po +++ b/addons/account/i18n/da.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4380,7 +4380,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/de.po b/addons/account/i18n/de.po index 009eedc1b75..d1939efaf5f 100644 --- a/addons/account/i18n/de.po +++ b/addons/account/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-02 08:42+0000\n" -"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n" +"PO-Revision-Date: 2011-11-07 13:03+0000\n" +"Last-Translator: Ferdinand-camptocamp <Unknown>\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: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4624,7 +4624,7 @@ msgstr "Buchungsjournale" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Bilanz (Vermögen)" #. module: account @@ -11735,6 +11735,9 @@ msgstr "Verbindlichkeiten" #~ msgid "Invoice " #~ msgstr "Rechnung " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilanz (Vermögen)" + #~ msgid "Invalid model name in the action definition." #~ msgstr "Ungültiger Modulname in der Aktionsdefinition." diff --git a/addons/account/i18n/el.po b/addons/account/i18n/el.po index c16fea6c15f..db972ab2e5f 100644 --- a/addons/account/i18n/el.po +++ b/addons/account/i18n/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4447,7 +4447,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/en_GB.po b/addons/account/i18n/en_GB.po index 0cff5a4a0ff..16761252d6c 100644 --- a/addons/account/i18n/en_GB.po +++ b/addons/account/i18n/en_GB.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4398,7 +4398,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/en_US.po b/addons/account/i18n/en_US.po index 655b5d16e86..5b1abbe4cd1 100644 --- a/addons/account/i18n/en_US.po +++ b/addons/account/i18n/en_US.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4365,7 +4365,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/es.po b/addons/account/i18n/es.po index 885d32836b0..3d9d0cb6d31 100644 --- a/addons/account/i18n/es.po +++ b/addons/account/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-08-17 23:12+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4600,7 +4600,7 @@ msgstr "Apuntes contables" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Balance de situación (cuentas de activos)" #. module: account @@ -11766,6 +11766,9 @@ msgstr "Pasivos" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balance de situación (cuentas de activos)" + #, python-format #~ msgid "is validated." #~ msgstr "está validada." diff --git a/addons/account/i18n/es_AR.po b/addons/account/i18n/es_AR.po index 4a05fad2a67..0c50fa3431b 100644 --- a/addons/account/i18n/es_AR.po +++ b/addons/account/i18n/es_AR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4409,7 +4409,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/es_CL.po b/addons/account/i18n/es_CL.po index db81b258070..4d8ae4b0df0 100644 --- a/addons/account/i18n/es_CL.po +++ b/addons/account/i18n/es_CL.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4364,7 +4364,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index 28a6bceca02..ea7fead4f0e 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4579,8 +4579,8 @@ msgstr "Detalle de asientos Contables" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" -msgstr "Hoja de Balance (Cuentas de Activo)" +msgid "Balance Sheet (Asset Accounts)" +msgstr "" #. module: account #: report:account.tax.code.entries:0 @@ -11610,6 +11610,9 @@ msgstr "Pasivos" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Hoja de Balance (Cuentas de Activo)" + #~ msgid "Chart of Account" #~ msgstr "Plan de Cuentas" diff --git a/addons/account/i18n/es_PY.po b/addons/account/i18n/es_PY.po index cf9e549f8ce..7e625ea038b 100644 --- a/addons/account/i18n/es_PY.po +++ b/addons/account/i18n/es_PY.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4598,8 +4598,8 @@ msgstr "Registros del diario" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" -msgstr "Balance de situación (cuentas de activos)" +msgid "Balance Sheet (Asset Accounts)" +msgstr "" #. module: account #: report:account.tax.code.entries:0 @@ -10401,6 +10401,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balance de situación (cuentas de activos)" + #, python-format #~ msgid "is validated." #~ msgstr "está validada." diff --git a/addons/account/i18n/et.po b/addons/account/i18n/et.po index ed332e9f075..31516e79afc 100644 --- a/addons/account/i18n/et.po +++ b/addons/account/i18n/et.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4374,7 +4374,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/eu.po b/addons/account/i18n/eu.po index 243be9e04f2..e8a27c45eb2 100644 --- a/addons/account/i18n/eu.po +++ b/addons/account/i18n/eu.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:41+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/fa.po b/addons/account/i18n/fa.po index 6ca9b4b6713..fe4ea4f52f7 100644 --- a/addons/account/i18n/fa.po +++ b/addons/account/i18n/fa.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/fa_AF.po b/addons/account/i18n/fa_AF.po index a9f720c8193..204473e7f50 100644 --- a/addons/account/i18n/fa_AF.po +++ b/addons/account/i18n/fa_AF.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/fi.po b/addons/account/i18n/fi.po index ca07d2ca154..1d425787f6d 100644 --- a/addons/account/i18n/fi.po +++ b/addons/account/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-18 09:18+0000\n" -"Last-Translator: Pekka Pylvänäinen <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4422,7 +4422,7 @@ msgstr "Päiväkirjan tapahtumat" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Tase (omaisuustilit)" #. module: account @@ -11159,6 +11159,9 @@ msgstr "Vastuut" #~ msgid "Balance:" #~ msgstr "Saldo:" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Tase (omaisuustilit)" + #, python-format #~ msgid "is validated." #~ msgstr "on tarkistettu." diff --git a/addons/account/i18n/fr.po b/addons/account/i18n/fr.po index dff418cfef4..4129c9cd735 100644 --- a/addons/account/i18n/fr.po +++ b/addons/account/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-09-16 09:10+0000\n" -"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4656,7 +4656,7 @@ msgstr "Écritures comptables" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Bilan (comptes d'actif)" #. module: account @@ -11744,6 +11744,9 @@ msgstr "Passif" #~ "The expected balance (%.2f) is different than the computed one. (%.2f)" #~ msgstr "Le solde affiché (%.2f) est différent du solde calculé. (%.2f)" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilan (comptes d'actif)" + #~ msgid "Chart of Account" #~ msgstr "Plan comptable" diff --git a/addons/account/i18n/fr_BE.po b/addons/account/i18n/fr_BE.po index c40d028fa1e..f902b492437 100644 --- a/addons/account/i18n/fr_BE.po +++ b/addons/account/i18n/fr_BE.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4363,7 +4363,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/gl.po b/addons/account/i18n/gl.po index 46b6327895d..adba5d19687 100644 --- a/addons/account/i18n/gl.po +++ b/addons/account/i18n/gl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-27 15:37+0000\n" -"Last-Translator: Xosé <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Galician <gl@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4576,7 +4576,7 @@ msgstr "Elementos de diario" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Balance de situación (contas de activos)" #. module: account @@ -10079,6 +10079,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Factura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balance de situación (contas de activos)" + #, python-format #~ msgid "is validated." #~ msgstr "está validada." diff --git a/addons/account/i18n/gu.po b/addons/account/i18n/gu.po index 6c239c3482f..2110a95d7f9 100644 --- a/addons/account/i18n/gu.po +++ b/addons/account/i18n/gu.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/he.po b/addons/account/i18n/he.po index 1f9276eefe9..2ff59ed17c6 100644 --- a/addons/account/i18n/he.po +++ b/addons/account/i18n/he.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/hi.po b/addons/account/i18n/hi.po index 52d8a4debd2..db02dad0ab5 100644 --- a/addons/account/i18n/hi.po +++ b/addons/account/i18n/hi.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:09+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4362,7 +4362,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/hr.po b/addons/account/i18n/hr.po index 579aa303c1b..034e5e7de0f 100644 --- a/addons/account/i18n/hr.po +++ b/addons/account/i18n/hr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-17 06:59+0000\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" "Last-Translator: Goran Kliska <gkliska@gmail.com>\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: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4392,7 +4392,7 @@ msgstr "Stavke dnevnika" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Bilanca (konta imovine)" #. module: account @@ -10902,5 +10902,8 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Račun " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilanca (konta imovine)" + #~ msgid "Chart of Account" #~ msgstr "Kontni plan" diff --git a/addons/account/i18n/hu.po b/addons/account/i18n/hu.po index 6eef63fefdb..0583e83ba5e 100644 --- a/addons/account/i18n/hu.po +++ b/addons/account/i18n/hu.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-03-18 11:11+0000\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " "<openerp@novotrade.hu>\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: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4565,7 +4565,7 @@ msgstr "Könyvelési tételsorok" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Mérleg (eszköz számlák)" #. module: account @@ -10615,6 +10615,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Számla " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Mérleg (eszköz számlák)" + #, python-format #~ msgid "is validated." #~ msgstr "jóváhagyásra került." diff --git a/addons/account/i18n/id.po b/addons/account/i18n/id.po index 5522ac6452a..59de935b5c3 100644 --- a/addons/account/i18n/id.po +++ b/addons/account/i18n/id.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4520,7 +4520,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/it.po b/addons/account/i18n/it.po index 56925f55dbc..95b9d8641e9 100644 --- a/addons/account/i18n/it.po +++ b/addons/account/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-04-05 12:13+0000\n" -"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4591,7 +4591,7 @@ msgstr "Voci sezionale" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Bilancio (Attività)" #. module: account @@ -11041,6 +11041,9 @@ msgstr "" #~ msgid "Chart of Account" #~ msgstr "Piano dei conti" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilancio (Attività)" + #~ msgid "Header" #~ msgstr "Intestazione" diff --git a/addons/account/i18n/kab.po b/addons/account/i18n/kab.po index 9d628c12b9d..930391188d4 100644 --- a/addons/account/i18n/kab.po +++ b/addons/account/i18n/kab.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/kk.po b/addons/account/i18n/kk.po index f0784fb2e36..a2ea28fb56d 100644 --- a/addons/account/i18n/kk.po +++ b/addons/account/i18n/kk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:43+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/ko.po b/addons/account/i18n/ko.po index 64dcf8a8323..5a2f2856ab9 100644 --- a/addons/account/i18n/ko.po +++ b/addons/account/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/lo.po b/addons/account/i18n/lo.po index 25bf559646c..96bea222d44 100644 --- a/addons/account/i18n/lo.po +++ b/addons/account/i18n/lo.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/lt.po b/addons/account/i18n/lt.po index b9315a5ae43..8851d332f62 100644 --- a/addons/account/i18n/lt.po +++ b/addons/account/i18n/lt.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4395,7 +4395,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/lv.po b/addons/account/i18n/lv.po index 6558a4ed460..c802a70768e 100644 --- a/addons/account/i18n/lv.po +++ b/addons/account/i18n/lv.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:10+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4445,7 +4445,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/mk.po b/addons/account/i18n/mk.po index 1db0ff18a67..a36c2505229 100644 --- a/addons/account/i18n/mk.po +++ b/addons/account/i18n/mk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4363,7 +4363,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po index 78c9447626f..e79fe091e1b 100644 --- a/addons/account/i18n/mn.po +++ b/addons/account/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-19 10:00+0000\n" +"PO-Revision-Date: 2011-11-07 13:02+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4461,7 +4461,7 @@ msgstr "Журналын бичилт" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Баланс тайлан (Хөрөнгө)" #. module: account @@ -11151,6 +11151,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Нэхэмжлэл " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Баланс тайлан (Хөрөнгө)" + #~ msgid "Invalid model name in the action definition." #~ msgstr "Үйлдлийн тодорхойлолтод буруу моделийн нэр байна." diff --git a/addons/account/i18n/nb.po b/addons/account/i18n/nb.po index 82d2fd42a8d..c3c90c9dcbe 100644 --- a/addons/account/i18n/nb.po +++ b/addons/account/i18n/nb.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-10-13 07:32+0000\n" -"Last-Translator: Rolv Råen (adEgo) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:43+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Norwegian Bokmal <nb@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4412,7 +4412,7 @@ msgstr "Journalregistreringer" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Balanse (Aktivakonti)" #. module: account @@ -9843,6 +9843,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Faktura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balanse (Aktivakonti)" + #~ msgid "Chart of Account" #~ msgstr "Kontoplan" diff --git a/addons/account/i18n/nl.po b/addons/account/i18n/nl.po index ee57ec17891..0cbf9687cb7 100644 --- a/addons/account/i18n/nl.po +++ b/addons/account/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-18 22:08+0000\n" -"Last-Translator: debaetsr <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:54+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:08+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:42+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4577,7 +4577,7 @@ msgstr "Dagboekregels" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Balans (Actiefrekeningen)" #. module: account @@ -11406,3 +11406,6 @@ msgstr "" #, python-format #~ msgid "Invoice " #~ msgstr "Factuur " + +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balans (Actiefrekeningen)" diff --git a/addons/account/i18n/nl_BE.po b/addons/account/i18n/nl_BE.po index 22581af2fc9..6e7b65bbbda 100644 --- a/addons/account/i18n/nl_BE.po +++ b/addons/account/i18n/nl_BE.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4408,7 +4408,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/oc.po b/addons/account/i18n/oc.po index 535e07b7992..442f4af30ef 100644 --- a/addons/account/i18n/oc.po +++ b/addons/account/i18n/oc.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:44+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/pl.po b/addons/account/i18n/pl.po index 48c7975fa46..b890024372b 100644 --- a/addons/account/i18n/pl.po +++ b/addons/account/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-13 06:21+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4497,7 +4497,7 @@ msgstr "Pozycje zapisów" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Bilans (konta aktywów)" #. module: account @@ -11355,6 +11355,9 @@ msgstr "" #~ msgid "Invoice " #~ msgstr "Faktura " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bilans (konta aktywów)" + #, python-format #~ msgid "is validated." #~ msgstr "zostało zatwierdzone." diff --git a/addons/account/i18n/pt.po b/addons/account/i18n/pt.po index 5c9a1104a51..5a995f8211b 100644 --- a/addons/account/i18n/pt.po +++ b/addons/account/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-22 00:46+0000\n" -"Last-Translator: Tiago Baptista <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:42+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:11+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4576,7 +4576,7 @@ msgstr "Lançamentos do diário" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Balancete (Contas de Activo)" #. module: account @@ -11715,3 +11715,6 @@ msgstr "" #~ msgid "" #~ "The expected balance (%.2f) is different than the computed one. (%.2f)" #~ msgstr "O saldo esperado (%.2f) é diferente do calculado. (%.2f)" + +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balancete (Contas de Activo)" diff --git a/addons/account/i18n/pt_BR.po b/addons/account/i18n/pt_BR.po index d417fe5de92..36d85714b06 100644 --- a/addons/account/i18n/pt_BR.po +++ b/addons/account/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-02 18:53+0000\n" -"Last-Translator: Nédio Batista Marques <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4591,7 +4591,7 @@ msgstr "Itens do Diário" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Planilha de Balanço (Ativos)" #. module: account @@ -11659,6 +11659,9 @@ msgstr "" #~ msgid "is validated." #~ msgstr "está validada." +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Planilha de Balanço (Ativos)" + #, python-format #~ msgid "Date not in a defined fiscal year" #~ msgstr "A data não está em um ano fiscal definido" diff --git a/addons/account/i18n/ro.po b/addons/account/i18n/ro.po index e42d9f5ba35..6d90115440d 100644 --- a/addons/account/i18n/ro.po +++ b/addons/account/i18n/ro.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4414,7 +4414,7 @@ msgstr "Poziții jurnal" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/ru.po b/addons/account/i18n/ru.po index f85bf8371b4..935177ef07b 100644 --- a/addons/account/i18n/ru.po +++ b/addons/account/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-06-27 05:16+0000\n" -"Last-Translator: Andrew Yashchuk <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:58+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4529,7 +4529,7 @@ msgstr "Элементы журнала" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Баланс (счета активов)" #. module: account @@ -10956,6 +10956,9 @@ msgstr "Обязательства" #~ msgid "is validated." #~ msgstr "проверен." +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Баланс (счета активов)" + #~ msgid "Accounting Statement" #~ msgstr "Бухгалтерская ведомость" diff --git a/addons/account/i18n/si.po b/addons/account/i18n/si.po index 5571d906074..ba8ecf327e8 100644 --- a/addons/account/i18n/si.po +++ b/addons/account/i18n/si.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/sk.po b/addons/account/i18n/sk.po index 2a6eddfa62e..8d08e6776b5 100644 --- a/addons/account/i18n/sk.po +++ b/addons/account/i18n/sk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/sl.po b/addons/account/i18n/sl.po index e70cab24b64..282b716dc63 100644 --- a/addons/account/i18n/sl.po +++ b/addons/account/i18n/sl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4371,7 +4371,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/sq.po b/addons/account/i18n/sq.po index fa4c0346ced..8176d6350c4 100644 --- a/addons/account/i18n/sq.po +++ b/addons/account/i18n/sq.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4371,7 +4371,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/sr.po b/addons/account/i18n/sr.po index af40e3e5612..8545e0c8e3f 100644 --- a/addons/account/i18n/sr.po +++ b/addons/account/i18n/sr.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:12+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:45+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4392,7 +4392,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/sr@latin.po b/addons/account/i18n/sr@latin.po index b71e23b4ff6..5f65b7f4ce1 100644 --- a/addons/account/i18n/sr@latin.po +++ b/addons/account/i18n/sr@latin.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4390,7 +4390,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/sv.po b/addons/account/i18n/sv.po index 964a2738f58..95adfaa6b15 100644 --- a/addons/account/i18n/sv.po +++ b/addons/account/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.14\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-24 13:10+0000\n" -"Last-Translator: Anders Eriksson, Aspirix AB <ae@mobilasystem.se>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4448,7 +4448,7 @@ msgstr "Journalrader" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Balansräkning (Tillgångskonton)" #. module: account @@ -11240,6 +11240,9 @@ msgstr "" #~ "The optional quantity expressed by this line, eg: number of product sold. " #~ "The quantity is not a legal requirement but is very usefull for some reports." +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balansräkning (Tillgångskonton)" + #, python-format #~ msgid "is validated." #~ msgstr "har validerats." diff --git a/addons/account/i18n/ta.po b/addons/account/i18n/ta.po index d754b1c25d9..058d1d661c3 100644 --- a/addons/account/i18n/ta.po +++ b/addons/account/i18n/ta.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/te.po b/addons/account/i18n/te.po index 5216c2f93b8..29a1c2c2d92 100644 --- a/addons/account/i18n/te.po +++ b/addons/account/i18n/te.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/th.po b/addons/account/i18n/th.po index 54c5fbc4bbd..d074ef0aca9 100644 --- a/addons/account/i18n/th.po +++ b/addons/account/i18n/th.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:46+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4363,7 +4363,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/tlh.po b/addons/account/i18n/tlh.po index 5c0de6b2922..ee21cddc1d0 100644 --- a/addons/account/i18n/tlh.po +++ b/addons/account/i18n/tlh.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4360,7 +4360,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/tr.po b/addons/account/i18n/tr.po index 748314886aa..60d193ccb9a 100644 --- a/addons/account/i18n/tr.po +++ b/addons/account/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-20 15:30+0000\n" -"Last-Translator: Ayhan KIZILTAN <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4562,8 +4562,8 @@ msgstr "Journal Items" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" -msgstr "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" +msgstr "Balance Sheet (Asset Accounts)" #. module: account #: report:account.tax.code.entries:0 @@ -11020,6 +11020,9 @@ msgstr "" #~ msgid "Message" #~ msgstr "İleti" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Balance Sheet (Assets Accounts)" + #, python-format #~ msgid "The opening journal must not have any entry in the new fiscal year !" #~ msgstr "The opening journal must not have any entry in the new fiscal year !" diff --git a/addons/account/i18n/ug.po b/addons/account/i18n/ug.po index 88d7d863e58..e7011eaa6fb 100644 --- a/addons/account/i18n/ug.po +++ b/addons/account/i18n/ug.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/uk.po b/addons/account/i18n/uk.po index 24853546f59..18548cd6803 100644 --- a/addons/account/i18n/uk.po +++ b/addons/account/i18n/uk.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:13+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4362,7 +4362,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/ur.po b/addons/account/i18n/ur.po index e32f5edae19..a855a9b7a26 100644 --- a/addons/account/i18n/ur.po +++ b/addons/account/i18n/ur.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/vi.po b/addons/account/i18n/vi.po index 2ea7c6f7949..9d5ddd58e92 100644 --- a/addons/account/i18n/vi.po +++ b/addons/account/i18n/vi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-20 09:45+0000\n" -"Last-Translator: lam nhut tien <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:57+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Vietnamese <vi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4567,7 +4567,7 @@ msgstr "Journal Items" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "Bảng cân đối Kế toán (Các Tài khoản Tài sản)" #. module: account @@ -10565,6 +10565,9 @@ msgstr "Tài sản nợ" #~ msgid "Entry encoding" #~ msgstr "Mã hóa bút toán" +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "Bảng cân đối Kế toán (Các Tài khoản Tài sản)" + #, python-format #~ msgid "is validated." #~ msgstr "đã được kiểm tra." diff --git a/addons/account/i18n/zh_CN.po b/addons/account/i18n/zh_CN.po index 1c0ddb0ea50..aa7282fe1ac 100644 --- a/addons/account/i18n/zh_CN.po +++ b/addons/account/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-07-02 15:26+0000\n" +"PO-Revision-Date: 2011-11-07 12:54+0000\n" "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4386,7 +4386,7 @@ msgstr "账簿明细" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "资产负债表（资产科目）" #. module: account @@ -11130,6 +11130,9 @@ msgstr "负债" #~ msgid "Invoice " #~ msgstr "发票 " +#~ msgid "Balance Sheet (Assets Accounts)" +#~ msgstr "资产负债表（资产科目）" + #~ msgid "Chart of Account" #~ msgstr "科目一览表" diff --git a/addons/account/i18n/zh_HK.po b/addons/account/i18n/zh_HK.po index 39ed24e50aa..7546f4df059 100644 --- a/addons/account/i18n/zh_HK.po +++ b/addons/account/i18n/zh_HK.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:14+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:47+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4361,7 +4361,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index d8332cb54b1..d23bd13822b 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:15+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:48+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: account @@ -4360,7 +4360,7 @@ msgstr "" #. module: account #: selection:account.account.type,report_type:0 -msgid "Balance Sheet (Assets Accounts)" +msgid "Balance Sheet (Asset Accounts)" msgstr "" #. module: account diff --git a/addons/account/wizard/account_fiscalyear_close.py b/addons/account/wizard/account_fiscalyear_close.py index 297911f15f7..d2295b5bbf2 100644 --- a/addons/account/wizard/account_fiscalyear_close.py +++ b/addons/account/wizard/account_fiscalyear_close.py @@ -69,6 +69,9 @@ class account_fiscalyear_close(osv.osv_memory): cr.execute("SELECT id FROM account_period WHERE date_start > (SELECT date_stop FROM account_fiscalyear WHERE id = %s)", (str(fy_id),)) fy2_period_set = ','.join(map(lambda id: str(id[0]), cr.fetchall())) + if not fy_period_set or not fy2_period_set: + raise osv.except_osv(_('UserError'), _('The periods to generate opening entries were not found')) + period = obj_acc_period.browse(cr, uid, data[0].period_id.id, context=context) new_fyear = obj_acc_fiscalyear.browse(cr, uid, data[0].fy2_id.id, context=context) old_fyear = obj_acc_fiscalyear.browse(cr, uid, fy_id, context=context) @@ -108,10 +111,10 @@ class account_fiscalyear_close(osv.osv_memory): #1. report of the accounts with defferal method == 'unreconciled' cr.execute(''' - SELECT a.id + SELECT a.id FROM account_account a LEFT JOIN account_account_type t ON (a.user_type = t.id) - WHERE a.active + WHERE a.active AND a.type != 'view' AND t.close_method = %s''', ('unreconciled', )) account_ids = map(lambda x: x[0], cr.fetchall()) @@ -122,15 +125,15 @@ class account_fiscalyear_close(osv.osv_memory): name, create_uid, create_date, write_uid, write_date, statement_id, journal_id, currency_id, date_maturity, partner_id, blocked, credit, state, debit, - ref, account_id, period_id, date, move_id, amount_currency, - quantity, product_id, company_id) + ref, account_id, period_id, date, move_id, amount_currency, + quantity, product_id, company_id) (SELECT name, create_uid, create_date, write_uid, write_date, statement_id, %s,currency_id, date_maturity, partner_id, blocked, credit, 'draft', debit, ref, account_id, %s, date, %s, amount_currency, quantity, product_id, company_id FROM account_move_line - WHERE account_id IN %s - AND ''' + query_line + ''' + WHERE account_id IN %s + AND ''' + query_line + ''' AND reconcile_id IS NULL)''', (new_journal.id, period.id, move_id, tuple(account_ids),)) #We have also to consider all move_lines that were reconciled @@ -197,7 +200,7 @@ class account_fiscalyear_close(osv.osv_memory): query_1st_part = """ INSERT INTO account_move_line ( debit, credit, name, date, move_id, journal_id, period_id, - account_id, currency_id, amount_currency, company_id, state) VALUES + account_id, currency_id, amount_currency, company_id, state) VALUES """ query_2nd_part = "" query_2nd_part_args = [] @@ -207,7 +210,7 @@ class account_fiscalyear_close(osv.osv_memory): cr.execute('SELECT sum(amount_currency) as balance_in_currency FROM account_move_line ' \ 'WHERE account_id = %s ' \ 'AND ' + query_line + ' ' \ - 'AND currency_id = %s', (account.id, account.currency_id.id)) + 'AND currency_id = %s', (account.id, account.currency_id.id)) balance_in_currency = cr.dictfetchone()['balance_in_currency'] company_currency_id = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id diff --git a/addons/account_followup/report/account_followup_print.py b/addons/account_followup/report/account_followup_print.py index 9081e862cfe..557364372b0 100644 --- a/addons/account_followup/report/account_followup_print.py +++ b/addons/account_followup/report/account_followup_print.py @@ -86,6 +86,8 @@ class report_rappel(report_sxw.rml_parse): def _get_text(self, partner, followup_id, context=None): + if context is None: + context = {} fp_obj = pooler.get_pool(self.cr.dbname).get('account_followup.followup') fp_line = fp_obj.browse(self.cr, self.uid, followup_id).followup_line li_delay = [] @@ -96,7 +98,6 @@ class report_rappel(report_sxw.rml_parse): a = {} partner_line = pooler.get_pool(self.cr.dbname).get('account.move.line').search(self.cr, self.uid, [('partner_id','=',partner.id),('reconcile_id','=',False)]) partner_delay = [] - context={} context.update({'lang': partner.lang}) for i in pooler.get_pool(self.cr.dbname).get('account.move.line').browse(self.cr, self.uid, partner_line, context): for delay in li_delay: @@ -110,7 +111,7 @@ class report_rappel(report_sxw.rml_parse): 'partner_name': partner.name, 'date': time.strftime('%Y-%m-%d'), 'company_name': fp_obj.browse(self.cr, self.uid, followup_id).company_id.name, - 'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature, + 'user_signature': pooler.get_pool(self.cr.dbname).get('res.users').browse(self.cr, self.uid, self.uid, context).signature or '', } return text diff --git a/addons/base_module_record/base_module_record.py b/addons/base_module_record/base_module_record.py index 0208e6cdc37..af63a0cf369 100644 --- a/addons/base_module_record/base_module_record.py +++ b/addons/base_module_record/base_module_record.py @@ -104,7 +104,8 @@ class base_module_record(osv.osv): for key,val in data.items(): if not (val or (fields[key]['type']=='boolean')): continue - if fields[key]['type'] in ('integer','float'): + if (fields[key]['type'] in ('integer','float') or + fields[key]['type'] == 'selection' and isinstance(val, int)): field = doc.createElement('field') field.setAttribute("name", key) field.setAttribute("eval", val and str(val) or 'False' ) diff --git a/addons/base_setup/base_setup.py b/addons/base_setup/base_setup.py index 59adf25e015..d2155e5b01e 100644 --- a/addons/base_setup/base_setup.py +++ b/addons/base_setup/base_setup.py @@ -39,13 +39,12 @@ DEFAULT_MODULES = { 'Accounting & Finance' : ['account'], 'Purchase Management' : ['purchase'], 'Human Resources' : ['hr',], - 'Point of Sales' : ['point_of_sale',], + 'Point of Sale' : ['point_of_sale',], 'Marketing' : ['marketing',], } class base_setup_installer(osv.osv_memory): _name = 'base.setup.installer' - _inherit = 'res.config.installer' _columns = { diff --git a/addons/base_setup/i18n/ar.po b/addons/base_setup/i18n/ar.po index 894b19a9279..0e658ca1d41 100644 --- a/addons/base_setup/i18n/ar.po +++ b/addons/base_setup/i18n/ar.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-02-03 06:25+0000\n" -"Last-Translator: <>\n" +"PO-Revision-Date: 2011-11-07 12:48+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "تم إنشاء قاعدة البيانات" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "نقاط البيع" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "تمت إضافة المستخدمين التالين: \n" @@ -488,3 +488,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "" + +#~ msgid "Point of Sales" +#~ msgstr "نقاط البيع" diff --git a/addons/base_setup/i18n/base_setup.pot b/addons/base_setup/i18n/base_setup.pot index f96155ea246..2f76a49f27c 100644 --- a/addons/base_setup/i18n/base_setup.pot +++ b/addons/base_setup/i18n/base_setup.pot @@ -72,7 +72,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup diff --git a/addons/base_setup/i18n/bg.po b/addons/base_setup/i18n/bg.po index cccc52d9693..e00d8c838da 100644 --- a/addons/base_setup/i18n/bg.po +++ b/addons/base_setup/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-09-08 14:09+0000\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" "Last-Translator: lem0na <nickyk@gmx.net>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "Базата данни е създадена" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "POS продажби" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "препоръчваме да инсталирате само фактуриране " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Следните потребители са инсталирани: \n" @@ -601,3 +601,6 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Предишен" + +#~ msgid "Point of Sales" +#~ msgstr "POS продажби" diff --git a/addons/base_setup/i18n/bs.po b/addons/base_setup/i18n/bs.po index 128b15092af..d16261f722b 100644 --- a/addons/base_setup/i18n/bs.po +++ b/addons/base_setup/i18n/bs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/ca.po b/addons/base_setup/i18n/ca.po index 9b0601aa387..fec53e21170 100644 --- a/addons/base_setup/i18n/ca.po +++ b/addons/base_setup/i18n/ca.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-09-30 08:29+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: Raimon Esteve (www.zikzakmedia.com) " "<resteve@zikzakmedia.com>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,7 +78,7 @@ msgstr "La seva base de dades ja està creada." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Terminal punt de venda" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "suggerim instal·lar només la facturació. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Els següents usuaris han estat instal·lats : \n" @@ -627,3 +627,6 @@ msgstr "base.setup.config" #~ msgstr "" #~ "Podeu iniciar la configuració del sistema o connectar-vos directament a la " #~ "base de dades utilitzant la instal·lació per defecte." + +#~ msgid "Point of Sales" +#~ msgstr "Terminal punt de venda" diff --git a/addons/base_setup/i18n/cs.po b/addons/base_setup/i18n/cs.po index 32a661c357b..595a3cd5c33 100644 --- a/addons/base_setup/i18n/cs.po +++ b/addons/base_setup/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2009-11-17 08:51+0000\n" -"Last-Translator: Kuvaly [LCT] <kuvaly@seznam.cz>\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" @@ -78,7 +78,7 @@ msgstr "Vaše databáze je nyní vytvořena." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Prodejní místo" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "vám instalovat pouze Fakturaci. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Byli instalováni následující uživatelů : \n" @@ -577,3 +577,6 @@ msgstr "base.setup.config" #~ msgid "Installation Done" #~ msgstr "Instalace dokončena" + +#~ msgid "Point of Sales" +#~ msgstr "Prodejní místo" diff --git a/addons/base_setup/i18n/da.po b/addons/base_setup/i18n/da.po index 38b28307c96..ff3ff65cf8c 100644 --- a/addons/base_setup/i18n/da.po +++ b/addons/base_setup/i18n/da.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,8 +76,8 @@ msgstr "Din database er ny oprettet" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" -msgstr "Point of sales" +msgid "Point of Sale" +msgstr "" #. module: base_setup #: field:base.setup.installer,association:0 @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Følgende brugere er installeret \n" @@ -520,3 +520,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "" + +#~ msgid "Point of Sales" +#~ msgstr "Point of sales" diff --git a/addons/base_setup/i18n/de.po b/addons/base_setup/i18n/de.po index 50e31baa561..942bc9a5dd6 100644 --- a/addons/base_setup/i18n/de.po +++ b/addons/base_setup/i18n/de.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-13 12:54+0000\n" -"Last-Translator: silas <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "Ihre Datenbank ist jetzt vollständig installiert" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "POS & Kasse" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "Buchhaltung. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Folgende Benutzer wurden installiert : \n" @@ -623,5 +623,8 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Vorherig" +#~ msgid "Point of Sales" +#~ msgstr "POS & Kasse" + #~ msgid "Use Directly" #~ msgstr "Sofort beginnen" diff --git a/addons/base_setup/i18n/el.po b/addons/base_setup/i18n/el.po index 6059cc83e46..8837d6d223e 100644 --- a/addons/base_setup/i18n/el.po +++ b/addons/base_setup/i18n/el.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-15 03:01+0000\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Greek <el@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,7 +78,7 @@ msgstr "Η βάση σου έχει δημιουργηθεί" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Σημείο πώλησης" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "λογιστής, σας προτείνουμε να εγκαταστήσετε μόνο την Τιμολόγηση " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Οι ακόλουθοι χρήστες έχουν εγκατασταθεί: \n" @@ -626,3 +626,6 @@ msgstr "base.setup.config" #~ msgid "Cancel" #~ msgstr "Άκυρο" + +#~ msgid "Point of Sales" +#~ msgstr "Σημείο πώλησης" diff --git a/addons/base_setup/i18n/es.po b/addons/base_setup/i18n/es.po index f8a375042a0..a71e2900e12 100644 --- a/addons/base_setup/i18n/es.po +++ b/addons/base_setup/i18n/es.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-27 08:23+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Jordi Esteve (www.zikzakmedia.com) " "<jesteve@zikzakmedia.com>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,7 +78,7 @@ msgstr "Su base de datos ya está creada." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Terminal punto de venta" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "sugerimos instalar sólo la facturación. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Los siguientes usuarios han sido instalados : \n" @@ -627,3 +627,6 @@ msgstr "base.setup.config" #~ msgid "Define Main Company" #~ msgstr "Defina la compañia principal" + +#~ msgid "Point of Sales" +#~ msgstr "Terminal punto de venta" diff --git a/addons/base_setup/i18n/es_AR.po b/addons/base_setup/i18n/es_AR.po index c21a137e6d6..c646a7145ac 100644 --- a/addons/base_setup/i18n/es_AR.po +++ b/addons/base_setup/i18n/es_AR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/es_CL.po b/addons/base_setup/i18n/es_CL.po index a82d71c57b4..011ed071d89 100644 --- a/addons/base_setup/i18n/es_CL.po +++ b/addons/base_setup/i18n/es_CL.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,8 +78,8 @@ msgstr "Su base de datos ya está creada." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" -msgstr "Terminal punto de venta" +msgid "Point of Sale" +msgstr "" #. module: base_setup #: field:base.setup.installer,association:0 @@ -96,7 +96,7 @@ msgstr "" "sugerimos instalar sólo la facturación. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Los siguientes usuarios han sido instalados : \n" @@ -558,6 +558,9 @@ msgstr "" msgid "base.setup.config" msgstr "base.setup.config" +#~ msgid "Point of Sales" +#~ msgstr "Terminal punto de venta" + #~ msgid "Select a Profile" #~ msgstr "Seleccione un perfil" diff --git a/addons/base_setup/i18n/es_EC.po b/addons/base_setup/i18n/es_EC.po index c21eab0fe18..9c4a446168b 100644 --- a/addons/base_setup/i18n/es_EC.po +++ b/addons/base_setup/i18n/es_EC.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,8 +78,8 @@ msgstr "Su base de datos ya está creada." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" -msgstr "Terminal punto de venta" +msgid "Point of Sale" +msgstr "" #. module: base_setup #: field:base.setup.installer,association:0 @@ -96,7 +96,7 @@ msgstr "" "sugerimos instalar sólo la facturación. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Los siguientes usuarios han sido instalados : \n" @@ -627,3 +627,6 @@ msgstr "Configuración" #~ msgid "Your new database is now fully installed." #~ msgstr "Su nueva base de datos ha sido instalada completamente." + +#~ msgid "Point of Sales" +#~ msgstr "Terminal punto de venta" diff --git a/addons/base_setup/i18n/es_PY.po b/addons/base_setup/i18n/es_PY.po index 91ffeb25705..2db06e83fb4 100644 --- a/addons/base_setup/i18n/es_PY.po +++ b/addons/base_setup/i18n/es_PY.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,8 +78,8 @@ msgstr "Su base de datos ya está creada." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" -msgstr "Terminal punto de venta" +msgid "Point of Sale" +msgstr "" #. module: base_setup #: field:base.setup.installer,association:0 @@ -96,7 +96,7 @@ msgstr "" "sugerimos instalar sólo la facturación. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Los siguientes usuarios han sido instalados : \n" @@ -557,3 +557,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "base.setup.config" + +#~ msgid "Point of Sales" +#~ msgstr "Terminal punto de venta" diff --git a/addons/base_setup/i18n/et.po b/addons/base_setup/i18n/et.po index 054a0027844..178eceacde7 100644 --- a/addons/base_setup/i18n/et.po +++ b/addons/base_setup/i18n/et.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/fa.po b/addons/base_setup/i18n/fa.po index f776d6c22f7..9f902b1a90e 100644 --- a/addons/base_setup/i18n/fa.po +++ b/addons/base_setup/i18n/fa.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/fi.po b/addons/base_setup/i18n/fi.po index c591105d658..967797046a5 100644 --- a/addons/base_setup/i18n/fi.po +++ b/addons/base_setup/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-08-03 03:47+0000\n" -"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:49+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,7 +78,7 @@ msgstr "Tietokantasi on nyt luotu." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Myyntipiste" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "suosittelemme että asennat vain laskutuksen " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Seuraavat käyttäjät on asennettu: \n" @@ -605,3 +605,6 @@ msgstr "" #~ msgid "Your new database is now fully installed." #~ msgstr "Uusi tietokanta on nyt kokonaan asennettu." + +#~ msgid "Point of Sales" +#~ msgstr "Myyntipiste" diff --git a/addons/base_setup/i18n/fr.po b/addons/base_setup/i18n/fr.po index a1cc70b7ec5..92e683590f3 100644 --- a/addons/base_setup/i18n/fr.po +++ b/addons/base_setup/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-18 16:45+0000\n" -"Last-Translator: Quentin THEURET <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:49+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "Votre base de données est maintenant créée." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Point de vente" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "vous suggérons d'installer uniquement la facturation. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Les utilisateurs suivants ont été installés : \n" @@ -625,3 +625,6 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Précédent" + +#~ msgid "Point of Sales" +#~ msgstr "Point de vente" diff --git a/addons/base_setup/i18n/gl.po b/addons/base_setup/i18n/gl.po index 09cf7999e26..a92e4b42916 100644 --- a/addons/base_setup/i18n/gl.po +++ b/addons/base_setup/i18n/gl.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/hr.po b/addons/base_setup/i18n/hr.po index 451c1a676ed..e65d8d9141c 100644 --- a/addons/base_setup/i18n/hr.po +++ b/addons/base_setup/i18n/hr.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" "Language: hr\n" @@ -76,7 +76,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/hu.po b/addons/base_setup/i18n/hu.po index c8d943eb61e..de41cc5a5b4 100644 --- a/addons/base_setup/i18n/hu.po +++ b/addons/base_setup/i18n/hu.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-02-02 16:23+0000\n" +"PO-Revision-Date: 2011-11-07 12:54+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " "<openerp@novotrade.hu>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,7 +78,7 @@ msgstr "Az Ön adatbázisa létrejött." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Pénztárgép működés" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "a Számlázást telepítse. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "A következő felhasználók lettek létrehozva : \n" @@ -555,3 +555,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "base.setup.config" + +#~ msgid "Point of Sales" +#~ msgstr "Pénztárgép működés" diff --git a/addons/base_setup/i18n/id.po b/addons/base_setup/i18n/id.po index 7edba231c59..660100f151c 100644 --- a/addons/base_setup/i18n/id.po +++ b/addons/base_setup/i18n/id.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -93,7 +93,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/it.po b/addons/base_setup/i18n/it.po index 99b533fea78..61b01d6a487 100644 --- a/addons/base_setup/i18n/it.po +++ b/addons/base_setup/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-16 09:42+0000\n" -"Last-Translator: Loris Turchetti <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:49+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "Il nuovo database è creato." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Punto vendita" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "di installare solo la fatturazione " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "I seguenti utenti sono stati installati: \n" @@ -626,3 +626,6 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Indietro" + +#~ msgid "Point of Sales" +#~ msgstr "Punto vendita" diff --git a/addons/base_setup/i18n/ko.po b/addons/base_setup/i18n/ko.po index bd6efc37fee..f708a4785e8 100644 --- a/addons/base_setup/i18n/ko.po +++ b/addons/base_setup/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/lt.po b/addons/base_setup/i18n/lt.po index 198e44485ed..73e3011abea 100644 --- a/addons/base_setup/i18n/lt.po +++ b/addons/base_setup/i18n/lt.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/lv.po b/addons/base_setup/i18n/lv.po index d59fa73f93f..003c661d82a 100644 --- a/addons/base_setup/i18n/lv.po +++ b/addons/base_setup/i18n/lv.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/mn.po b/addons/base_setup/i18n/mn.po index 980176ba562..3c15f553bf2 100644 --- a/addons/base_setup/i18n/mn.po +++ b/addons/base_setup/i18n/mn.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-20 16:18+0000\n" -"Last-Translator: badralb <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:43+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Mongolian <mn@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,7 +78,7 @@ msgstr "Таний өгөгдлийн сан үүсгэгдсэн." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Борлуулалтын цэг" #. module: base_setup @@ -94,7 +94,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Дараагийн хэрэглэгчийн суулгасан байх : \n" @@ -571,5 +571,8 @@ msgstr "base.setup.config" #~ "байрлуулдаг. Эдгээр хувийн тохиргоонууд нь OpenERP-н ялгаатай байдлуудыг олж " #~ "нээхэд тохируулагдсан. Энэ зөвхөн тойм төдий, өшөө 300+ бэлэн модулиуд бий." +#~ msgid "Point of Sales" +#~ msgstr "Борлуулалтын цэг" + #~ msgid "Use Directly" #~ msgstr "Хэрэглэх заавар" diff --git a/addons/base_setup/i18n/nb.po b/addons/base_setup/i18n/nb.po index aa147a7fc60..550fb9d10c3 100644 --- a/addons/base_setup/i18n/nb.po +++ b/addons/base_setup/i18n/nb.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-30 19:56+0000\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2011-11-07 12:48+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Norwegian Bokmal <nb@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -79,7 +79,7 @@ msgstr "Din database er nå opprettet." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Utsalgssted" #. module: base_setup @@ -97,7 +97,7 @@ msgstr "" "regnskapsfører, anbefaler vi at du kun installerer Fakturering " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Følgende brukere er blitt installert: \n" @@ -552,3 +552,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "base.oppsett.konfig" + +#~ msgid "Point of Sales" +#~ msgstr "Utsalgssted" diff --git a/addons/base_setup/i18n/nl.po b/addons/base_setup/i18n/nl.po index d3555495f76..3fefd2f2fb5 100644 --- a/addons/base_setup/i18n/nl.po +++ b/addons/base_setup/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-16 17:03+0000\n" -"Last-Translator: Stefan Rijnhart (Therp) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:48+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "Uw database is nu gemaakt." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Kassa's" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "om alleen de facturatie te installeren " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "De volgende gebruikers zijn geïnstalleerd: \n" @@ -620,3 +620,6 @@ msgstr "base.setup.config" #~ msgid "Previous" #~ msgstr "Vorige" + +#~ msgid "Point of Sales" +#~ msgstr "Kassa's" diff --git a/addons/base_setup/i18n/nl_BE.po b/addons/base_setup/i18n/nl_BE.po index f7c6a56682c..301a65a5673 100644 --- a/addons/base_setup/i18n/nl_BE.po +++ b/addons/base_setup/i18n/nl_BE.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -93,7 +93,7 @@ msgstr "" "aan om enkel Facturatie te installeren. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/pl.po b/addons/base_setup/i18n/pl.po index f668c5753c7..18c0f19159f 100644 --- a/addons/base_setup/i18n/pl.po +++ b/addons/base_setup/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-14 13:45+0000\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "Baza danych została utworzaona" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Punkt sprzedaży" #. module: base_setup @@ -93,7 +93,7 @@ msgstr "" "instalowanie tylko fakturowania. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Następujący użytkownicy zostali utworzeni : \n" @@ -608,3 +608,6 @@ msgstr "" #~ msgid "Use Directly" #~ msgstr "Użyj bezpośrednio" + +#~ msgid "Point of Sales" +#~ msgstr "Punkt sprzedaży" diff --git a/addons/base_setup/i18n/pt.po b/addons/base_setup/i18n/pt.po index c81aa43d4e2..0f7395bc92b 100644 --- a/addons/base_setup/i18n/pt.po +++ b/addons/base_setup/i18n/pt.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-13 10:06+0000\n" -"Last-Translator: Tiago Baptista <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:42+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "A sua base de dados foi criada" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Ponto de Venda" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "instale apenas o módulo Facturação " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Foram instalados os seguintes utilizadores: \n" @@ -600,3 +600,6 @@ msgstr "base.setup.config" #~ msgid "Use Directly" #~ msgstr "Usar Directamente" + +#~ msgid "Point of Sales" +#~ msgstr "Ponto de Venda" diff --git a/addons/base_setup/i18n/pt_BR.po b/addons/base_setup/i18n/pt_BR.po index ae8b2040db6..0c0e036c6f5 100644 --- a/addons/base_setup/i18n/pt_BR.po +++ b/addons/base_setup/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-13 09:49+0000\n" -"Last-Translator: Guilherme Santos <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "O banco de dados foi criado." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Ponto de Vendas" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "instalação apenas do Faturamento " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Os seguintes usuário foram instalados: \n" @@ -621,3 +621,6 @@ msgstr "base.setup.config" #~ msgid "Summary" #~ msgstr "Resumo" + +#~ msgid "Point of Sales" +#~ msgstr "Ponto de Vendas" diff --git a/addons/base_setup/i18n/ro.po b/addons/base_setup/i18n/ro.po index e8b8114a397..015eb620e8e 100644 --- a/addons/base_setup/i18n/ro.po +++ b/addons/base_setup/i18n/ro.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-12 01:45+0000\n" +"PO-Revision-Date: 2011-11-07 12:48+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "Baza de date a fost creată." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Punct de vînzare" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "doar modulul de Facturare. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Utilizatorii din lista de mai jos nu au fost instalați : \n" @@ -599,3 +599,6 @@ msgstr "base.setup.config" #~ msgid "Use Directly" #~ msgstr "Folosire directă" + +#~ msgid "Point of Sales" +#~ msgstr "Punct de vînzare" diff --git a/addons/base_setup/i18n/ru.po b/addons/base_setup/i18n/ru.po index 70654f0ca54..0080ba636f1 100644 --- a/addons/base_setup/i18n/ru.po +++ b/addons/base_setup/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-25 11:19+0000\n" -"Last-Translator: Treefeed Xavier <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -78,7 +78,7 @@ msgstr "Ваша база данных создана." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Кассовый терминал" #. module: base_setup @@ -96,7 +96,7 @@ msgstr "" "— советуем установить только модуль выставления счетов. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Были введены следующие пользователи: \n" @@ -624,3 +624,6 @@ msgstr "base.setup.config" #~ msgid "State" #~ msgstr "Область/штат" + +#~ msgid "Point of Sales" +#~ msgstr "Кассовый терминал" diff --git a/addons/base_setup/i18n/sk.po b/addons/base_setup/i18n/sk.po index f2d3efbf826..cd4ffd266ae 100644 --- a/addons/base_setup/i18n/sk.po +++ b/addons/base_setup/i18n/sk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/sl.po b/addons/base_setup/i18n/sl.po index 92fd9df24f6..42c245534a7 100644 --- a/addons/base_setup/i18n/sl.po +++ b/addons/base_setup/i18n/sl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "Vaša baza je bila ustvarjena." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -93,7 +93,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Naslednji uporabniki so bili nameščeni: \n" diff --git a/addons/base_setup/i18n/sq.po b/addons/base_setup/i18n/sq.po index b60d4d250a9..9e3df647985 100644 --- a/addons/base_setup/i18n/sq.po +++ b/addons/base_setup/i18n/sq.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:06+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/sr.po b/addons/base_setup/i18n/sr.po index 3477428f479..a95a53dfc00 100644 --- a/addons/base_setup/i18n/sr.po +++ b/addons/base_setup/i18n/sr.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-10-30 12:59+0000\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian <sr@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -79,7 +79,7 @@ msgstr "Tvoja databaza je kreirana." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "POS" #. module: base_setup @@ -97,7 +97,7 @@ msgstr "" "knjigovodja, predlazemo ti da instaliras samo Fakturisanje " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Sledeci korisnici su instalirani: \n" @@ -602,3 +602,6 @@ msgstr "base.setup.config" #~ msgid "Cancel" #~ msgstr "Otkaži" + +#~ msgid "Point of Sales" +#~ msgstr "POS" diff --git a/addons/base_setup/i18n/sr@latin.po b/addons/base_setup/i18n/sr@latin.po index d1a529c0a75..25fa7984891 100644 --- a/addons/base_setup/i18n/sr@latin.po +++ b/addons/base_setup/i18n/sr@latin.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-23 15:28+0000\n" -"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:59+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Serbian latin <sr@latin@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -79,7 +79,7 @@ msgstr "Tvoja databaza je kreirana." #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "POS" #. module: base_setup @@ -97,7 +97,7 @@ msgstr "" "knjigovodja, predlazemo ti da instaliras samo Fakturisanje " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Sledeci korisnici su instalirani: \n" @@ -535,6 +535,9 @@ msgstr "" msgid "base.setup.config" msgstr "base.setup.config" +#~ msgid "Point of Sales" +#~ msgstr "POS" + #~ msgid "Use Directly" #~ msgstr "Koristi Direktno" diff --git a/addons/base_setup/i18n/sv.po b/addons/base_setup/i18n/sv.po index 1de1b5f93e1..0dfabca49da 100644 --- a/addons/base_setup/i18n/sv.po +++ b/addons/base_setup/i18n/sv.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.14\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-13 07:19+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: Anders Wallenquist <anders.wallenquist@vertel.se>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -77,7 +77,7 @@ msgstr "Din databas är nu skapad" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Kassa" #. module: base_setup @@ -95,7 +95,7 @@ msgstr "" "redovisning rekommenderar vi dig att enbart installera faktureringsmodulen " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Följande användere har nu blivit installerade \n" @@ -598,5 +598,8 @@ msgstr "base.setup.config" #~ msgid "General Information" #~ msgstr "Allmän information" +#~ msgid "Point of Sales" +#~ msgstr "Kassa" + #~ msgid "State" #~ msgstr "Län" diff --git a/addons/base_setup/i18n/th.po b/addons/base_setup/i18n/th.po index 4d00beee180..eacc77db53d 100644 --- a/addons/base_setup/i18n/th.po +++ b/addons/base_setup/i18n/th.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "กำลังสร้างฐานข้อมูลของคุ #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/tlh.po b/addons/base_setup/i18n/tlh.po index 935f2249a13..6f8b89d6cd8 100644 --- a/addons/base_setup/i18n/tlh.po +++ b/addons/base_setup/i18n/tlh.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po index bfb9232de3f..0f279bc80c0 100644 --- a/addons/base_setup/i18n/tr.po +++ b/addons/base_setup/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-10 18:46+0000\n" -"Last-Translator: Ayhan KIZILTAN <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "Veritabanınız Oluşturuldu" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Hızlı Satış Noktası" #. module: base_setup @@ -94,7 +94,7 @@ msgstr "" "sadece Faturalama modülünü kurmanızı tavsiye ederiz. " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Aşağıdaki kullanıcılar kuruldu: \n" @@ -571,3 +571,6 @@ msgstr "temel.kurulum.ayar" #~ msgid "Previous" #~ msgstr "Önceki" + +#~ msgid "Point of Sales" +#~ msgstr "Hızlı Satış Noktası" diff --git a/addons/base_setup/i18n/uk.po b/addons/base_setup/i18n/uk.po index cf4cf158916..ae7cb912e4e 100644 --- a/addons/base_setup/i18n/uk.po +++ b/addons/base_setup/i18n/uk.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "" diff --git a/addons/base_setup/i18n/vi.po b/addons/base_setup/i18n/vi.po index 9560540ae34..2d63ca2d0fc 100644 --- a/addons/base_setup/i18n/vi.po +++ b/addons/base_setup/i18n/vi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-05-04 16:45+0000\n" -"Last-Translator: OpenBMS JSC <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:42+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Vietnamese <vi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -76,7 +76,7 @@ msgstr "CSDL của bạn đã được tạo" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "Điểm bán hàng" #. module: base_setup @@ -92,7 +92,7 @@ msgid "" msgstr "" #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "Những người sử dụng sau đã được cài đặt: \n" @@ -489,3 +489,6 @@ msgstr "" #: model:ir.model,name:base_setup.model_base_setup_config msgid "base.setup.config" msgstr "base.setup.config" + +#~ msgid "Point of Sales" +#~ msgstr "Điểm bán hàng" diff --git a/addons/base_setup/i18n/zh_CN.po b/addons/base_setup/i18n/zh_CN.po index bec718b6634..670a9f6ed58 100644 --- a/addons/base_setup/i18n/zh_CN.po +++ b/addons/base_setup/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2010-12-31 10:59+0000\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "您的帐套（数据库）已经创建。" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "销售点" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "帮助您掌控您的会计需求，如果您不是一个会计人员，我们建议您仅仅安装发票模块。 " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "下列用户已经安装 \n" @@ -566,3 +566,6 @@ msgstr "base.setup.config" #~ msgid "Your new database is now fully installed." #~ msgstr "新帐套已安装完毕." + +#~ msgid "Point of Sales" +#~ msgstr "销售点" diff --git a/addons/base_setup/i18n/zh_TW.po b/addons/base_setup/i18n/zh_TW.po index cfa00f337a8..e56ace16d84 100644 --- a/addons/base_setup/i18n/zh_TW.po +++ b/addons/base_setup/i18n/zh_TW.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:14+0000\n" -"PO-Revision-Date: 2011-01-26 04:32+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2011-11-05 05:07+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: base_setup @@ -75,7 +75,7 @@ msgstr "已建立資料庫。" #. module: base_setup #: field:base.setup.installer,point_of_sale:0 -msgid "Point of Sales" +msgid "Point of Sale" msgstr "鎖售點 (POS)" #. module: base_setup @@ -91,7 +91,7 @@ msgid "" msgstr "助您處理會計事情；如閣下非會計師，建議只安裝發票 " #. module: base_setup -#: code:addons/base_setup/__init__.py:56 +#: code:addons/base_setup/__init__.py:50 #, python-format msgid "The following users have been installed : \n" msgstr "已安裝以下用戶： \n" @@ -566,3 +566,6 @@ msgstr "基礎.設置.配置" #~ msgid "Previous" #~ msgstr "上一個" + +#~ msgid "Point of Sales" +#~ msgstr "鎖售點 (POS)" diff --git a/addons/crm/crm_lead_demo.xml b/addons/crm/crm_lead_demo.xml index 390932c9e0a..cf6b391f7f2 100644 --- a/addons/crm/crm_lead_demo.xml +++ b/addons/crm/crm_lead_demo.xml @@ -10,12 +10,12 @@ <field eval="'The Oil Company'" name="partner_name"/> <field eval="'draft'" name="state"/> <field name="section_id" ref="crm.section_sales_department"/> - <field eval="'Luc Latour'" name="contact_name"/> + <field eval="'Luc Latour'" name="contact_name"/> <field name="title" ref="base.res_partner_title_sir"/> - <field eval="'Training Manager'" name="function"/> - <field eval="'Paris'" name="city"/> - <field name="country_id" ref="base.fr"/> - <field eval="'luc.latour@oilcompany.fr'" name="email_from"/> + <field eval="'Training Manager'" name="function"/> + <field eval="'Paris'" name="city"/> + <field name="country_id" ref="base.fr"/> + <field eval="'luc.latour@oilcompany.fr'" name="email_from"/> <field eval="'0033 621 782-0636'" name="mobile"/> <field eval="1" name="active"/> <field name="stage_id" ref="crm.stage_lead1"/> @@ -29,12 +29,12 @@ <field name="type">lead</field> <field name="user_id" ref="base.user_root"/> <field eval="'Le Club SARL'" name="partner_name"/> - <field eval="'Marc Dufour'" name="contact_name"/> + <field eval="'Marc Dufour'" name="contact_name"/> <field name="title" ref="base.res_partner_title_sir"/> - <field eval="'Purchase Manager'" name="function"/> - <field eval="'Bordeaux'" name="city"/> - <field name="country_id" ref="base.fr"/> - <field eval="'md@leclub.fr'" name="email_from"/> + <field eval="'Purchase Manager'" name="function"/> + <field eval="'Bordeaux'" name="city"/> + <field name="country_id" ref="base.fr"/> + <field eval="'md@leclub.fr'" name="email_from"/> <field eval="'draft'" name="state"/> <field name="section_id" ref="crm.section_sales_department"/> <field eval="'(392) 895-7917'" name="mobile"/> @@ -50,9 +50,9 @@ <field name="type">lead</field> <field name="user_id" ref="base.user_demo"/> <field eval="'The Kompany'" name="partner_name"/> - <field eval="'John Miller'" name="contact_name"/> - <field eval="'New-York'" name="city"/> - <field name="country_id" ref="base.us"/> + <field eval="'John Miller'" name="contact_name"/> + <field eval="'New-York'" name="city"/> + <field name="country_id" ref="base.us"/> <field eval="'draft'" name="state"/> <field name="section_id" ref="crm.section_sales_department"/> <field eval="'(820) 167-3208'" name="mobile"/> @@ -68,9 +68,9 @@ <field eval="'3'" name="priority"/> <field name="type">lead</field> <field eval="'The Gas Company'" name="partner_name"/> - <field eval="'Henry Mc Coy'" name="contact_name"/> - <field eval="'London'" name="city"/> - <field name="country_id" ref="base.uk"/> + <field eval="'Henry Mc Coy'" name="contact_name"/> + <field eval="'London'" name="city"/> + <field name="country_id" ref="base.uk"/> <field eval="'draft'" name="state"/> <field name="section_id" ref="crm.section_sales_department"/> <field eval="'(077) 582-4035'" name="mobile"/> @@ -87,10 +87,10 @@ <field name="type">lead</field> <field name="user_id" ref="base.user_root"/> <field eval="'Stonage IT'" name="partner_name"/> - <field eval="'Carrie Helle'" name="contact_name"/> - <field eval="'Purchase Manager'" name="function"/> - <field eval="'Bruxelles'" name="city"/> - <field name="country_id" ref="base.be"/> + <field eval="'Carrie Helle'" name="contact_name"/> + <field eval="'Purchase Manager'" name="function"/> + <field eval="'Bruxelles'" name="city"/> + <field name="country_id" ref="base.be"/> <field eval="'draft'" name="state"/> <field name="section_id" ref="crm.section_sales_department"/> <field eval="'(333) 715-1450'" name="mobile"/> @@ -111,10 +111,10 @@ <field name="type">lead</field> <field name="user_id" ref="base.user_root"/> <field eval="'Opensides'" name="partner_name"/> - <field eval="'Tina Pinero'" name="contact_name"/> - <field eval="'Consultant'" name="function"/> - <field eval="'Roma'" name="city"/> - <field name="country_id" ref="base.it"/> + <field eval="'Tina Pinero'" name="contact_name"/> + <field eval="'Consultant'" name="function"/> + <field eval="'Roma'" name="city"/> + <field name="country_id" ref="base.it"/> <field eval="'draft'" name="state"/> <field name="section_id" ref="crm.section_sales_department"/> <field eval="'(468) 017-2684'" name="mobile"/> @@ -131,10 +131,10 @@ <field name="type">lead</field> <field name="user_id" ref="base.user_demo"/> <field eval="'Gardner Group'" name="partner_name"/> - <field eval="'Wendi Baltz'" name="contact_name"/> - <field eval="'Journalist'" name="function"/> - <field eval="'Kiev'" name="city"/> - <field name="country_id" ref="base.ua"/> + <field eval="'Wendi Baltz'" name="contact_name"/> + <field eval="'Journalist'" name="function"/> + <field eval="'Kiev'" name="city"/> + <field name="country_id" ref="base.ua"/> <field eval="'draft'" name="state"/> <field name="section_id" ref="crm.section_sales_department"/> <field eval="'(463) 014-1208'" name="mobile"/> @@ -155,12 +155,12 @@ <field name="categ_id" ref="crm.categ_oppor6"/> <field name="stage_id" ref="crm.stage_lead1"/> <field eval="'Survey Expert'" name="partner_name"/> - <field eval="'John Smith'" name="contact_name"/> - <field eval="'Sales'" name="function"/> - <field eval="'Cambridge'" name="city"/> - <field name="country_id" ref="base.uk"/> + <field eval="'John Smith'" name="contact_name"/> + <field eval="'Sales'" name="function"/> + <field eval="'Cambridge'" name="city"/> + <field name="country_id" ref="base.uk"/> <field eval="'smith_john@gmail.com'" name="email_from"/> - <field eval="'(282) 596-8584'" name="phone"/> + <field eval="'(282) 596-8584'" name="phone"/> </record> <record id="crm_case_business_card0" model="crm.lead"> <field eval="1" name="active"/> @@ -174,12 +174,12 @@ <field name="categ_id" ref="crm.categ_oppor5"/> <field name="stage_id" ref="crm.stage_lead1"/> <field eval="'Marketing Business'" name="partner_name"/> - <field eval="'Laure Smith'" name="contact_name"/> - <field eval="'Sales'" name="function"/> - <field eval="'Oxford'" name="city"/> - <field name="country_id" ref="base.uk"/> + <field eval="'Laure Smith'" name="contact_name"/> + <field eval="'Sales'" name="function"/> + <field eval="'Oxford'" name="city"/> + <field name="country_id" ref="base.uk"/> <field eval="'l.smith@marketing-business.com'" name="email_from"/> - <field eval="'(252) 578-7894'" name="phone"/> + <field eval="'(252) 578-7894'" name="phone"/> </record> <record id="crm_case_imported_contact0" model="crm.lead"> <field eval="1" name="active"/> @@ -204,7 +204,7 @@ <field name="categ_id" ref="crm.categ_oppor3"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Agrolait'" name="partner_name"/> - <field eval="'Sylvie Lelitre'" name="contact_name"/> + <field eval="'Sylvie Lelitre'" name="contact_name"/> </record> <record id="crm_case_company_partnership0" model="crm.lead"> <field eval="1" name="active"/> @@ -270,7 +270,9 @@ <field name="categ_id" ref="crm.categ_oppor3"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Pricing Information of Onsite Intervention'" name="name"/> - <field eval="'Send price list regarding our interventions'" name="title_action"/> + <field eval="'Send price list regarding our interventions'" name="title_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/> <field name="partner_name">BalmerInc S.A.</field> <field name="street">Rue des Palais 51, bte 33</field> <field name="city">Bruxelles</field> @@ -291,14 +293,16 @@ <field name="categ_id" ref="crm.categ_oppor3"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Interest in your Kitchen Design Project'" name="name"/> - <field eval="'Send Catalogue by E-Mail'" name="title_action"/> + <field eval="'Send Catalogue by E-Mail'" name="title_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/> <field name="partner_name">Lucie Vonck</field> <field name="street">Chaussée de Namur</field> <field name="city">Grand-Rosière</field> <field eval="1367" name="zip"/> <field name="country_id" ref="base.be"/> </record> - <record id="crm_case_unifliege" model="crm.lead"> + <record id="crm_case_unifliege" model="crm.lead"> <field eval="1" name="active"/> <field name="type">opportunity</field> <field name="type_id" ref="crm.type_lead2"/> @@ -313,7 +317,9 @@ <field name="categ_id" ref="crm.categ_oppor6"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Plan train our students on your product'" name="name"/> - <field eval="'Call to define real needs about training'" name="title_action"/> + <field eval="'Call to define real needs about training'" name="title_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/> <field eval="4000" name="zip"/> <field name="partner_name">Université de Liège</field> <field name="street">Place du 20Août</field> @@ -321,7 +327,7 @@ <field eval="75016" name="zip"/> <field name="country_id" ref="base.be"/> </record> - <record id="crm_case_bankwealthy2" model="crm.lead"> + <record id="crm_case_bankwealthy2" model="crm.lead"> <field eval="1" name="active"/> <field name="type">opportunity</field> <field name="type_id" ref="crm.type_lead2"/> @@ -336,7 +342,9 @@ <field name="categ_id" ref="crm.categ_oppor2"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Plan to buy 66 keyboards and 66 mouses'" name="name"/> - <field eval="'Propose the kit keyboard+mouse'" name="title_action"/> + <field eval="'Propose the kit keyboard+mouse'" name="title_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/> <field name="partner_name">Bank Wealthy and sons</field> <field name="street">1 rue Rockfeller</field> <field name="city">Paris</field> @@ -359,6 +367,7 @@ <field name="categ_id" ref="crm.categ_oppor7"/> <field name="stage_id" ref="crm.stage_lead5"/> <field eval="'Need 20 Days of Consultancy'" name="name"/> + <field eval="time.strftime('%Y-%m-%d')" name="date_deadline"/> <field eval="'info@mycompany.net'" name="email_from"/> </record> <record id="crm_case_abcfuelcounits0" model="crm.lead"> @@ -376,8 +385,10 @@ <field name="categ_id" ref="crm.categ_oppor5"/> <field name="stage_id" ref="crm.stage_lead4"/> <field eval="'Need new design for my website'" name="name"/> + <field eval="time.strftime('%Y') +'/'+ time.strftime('%m') +'/'+ str(int(time.strftime('%d')) + 15)" name="date_action"/> + <field eval="time.strftime('%Y') +'/'+ time.strftime('%m') +'/'+ str(int(time.strftime('%d')) + 15)" name="date_deadline"/> <field eval="'info@opensides.be'" name="email_from"/> - <field eval="'Convert to quote'" name="title_action"/> + <field eval="'Convert to quote'" name="title_action"/> <field name="partner_name">Dubois sprl</field> <field name="street">Avenue de la Liberté 56</field> <field name="city">Brussels</field> @@ -399,7 +410,7 @@ <field name="stage_id" ref="crm.stage_lead6"/> <field eval="'Want to subscribe to your online solution'" name="name"/> </record> - <record id="crm_case_dirtminingltdunits0" model="crm.lead"> + <record id="crm_case_dirtminingltdunits0" model="crm.lead"> <field eval="30" name="probability"/> <field eval="1" name="active"/> <field name="type">opportunity</field> @@ -413,7 +424,7 @@ <field name="stage_id" ref="crm.stage_lead6"/> <field eval="'Interest in your Partnership Contract'" name="name"/> </record> - <record id="crm_case_dirtminingltdunits10" model="crm.lead"> + <record id="crm_case_dirtminingltdunits10" model="crm.lead"> <field eval="30" name="probability"/> <field name="partner_address_id" ref="base.res_partner_address_3000"/> <field eval="1" name="active"/> @@ -428,14 +439,16 @@ <field name="categ_id" ref="crm.categ_oppor2"/> <field name="stage_id" ref="crm.stage_lead2"/> <field eval="'Plan to attend a training'" name="name"/> - <field eval="'Call to give info about next training session'" name="title_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 2) +'/'+ time.strftime('%d')" name="date_deadline"/> + <field eval="'Call to give info about next training session'" name="title_action"/> <field name="partner_name">Axelor</field> <field name="street">12 rue Albert Einstein</field> <field name="city">Champs sur Marne</field> <field eval="77420" name="zip"/> <field name="country_id" ref="base.fr"/> </record> - <record id="crm_case_construstazunits0" model="crm.lead"> + <record id="crm_case_construstazunits0" model="crm.lead"> <field eval="60" name="probability"/> <field name="partner_address_id" ref="base.res_partner_address_thymbra"/> <field eval="1" name="active"/> @@ -450,6 +463,8 @@ <field name="categ_id" ref="crm.categ_oppor1"/> <field name="stage_id" ref="crm.stage_lead3"/> <field eval="'Need customize the solution'" name="name"/> + <field eval="time.strftime('%Y') +'/'+ time.strftime('%m') +'/'+ str(int(time.strftime('%d')) + 15)" name="date_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_deadline"/> <field eval="'Conf call with technical service'" name="title_action"/> <field name="partner_name">Thymbra</field> <field name="street">Palermo, Capital Federal</field> @@ -458,7 +473,7 @@ <field eval="1659" name="zip"/> <field name="country_id" ref="base.ar"/> </record> - <record id="crm_case_ericdubois4" model="crm.lead"> + <record id="crm_case_ericdubois4" model="crm.lead"> <field eval="65" name="probability"/> <field name="partner_address_id" ref="base.res_partner_address_ericdubois0"/> <field eval="1" name="active"/> @@ -473,6 +488,8 @@ <field name="categ_id" ref="crm.categ_oppor1"/> <field name="stage_id" ref="crm.stage_lead3"/> <field eval="'Interest in your customizable PC'" name="name"/> + <field eval="time.strftime('%Y') +'/'+ time.strftime('%m') +'/'+ str(int(time.strftime('%d')) + 15)" name="date_action"/> + <field eval="time.strftime('%Y') +'/'+ str(int(time.strftime('%m')) + 1) +'/'+ time.strftime('%d')" name="date_deadline"/> <field eval="'Ask for the good receprion of the proposition'" name="title_action"/> <field name="partner_name">Eric Dubois</field> <field name="street">Chaussée de Binche, 27</field> @@ -480,7 +497,7 @@ <field eval="7000" name="zip"/> <field name="country_id" ref="base.be"/> </record> - <record id="crm_case_fabiendupont" model="crm.lead"> + <record id="crm_case_fabiendupont" model="crm.lead"> <field name="partner_address_id" ref="base.res_partner_address_fabiendupont0"/> <field eval="1" name="active"/> <field name="type">opportunity</field> @@ -493,7 +510,7 @@ <field name="stage_id" ref="crm.stage_lead1"/> <field eval="'Need more info about the onsite intervention'" name="name"/> </record> - <record id="crm_case_shelvehouse" model="crm.lead"> + <record id="crm_case_shelvehouse" model="crm.lead"> <field name="partner_address_id" ref="base.res_partner_address_henrychard1"/> <field eval="1" name="active"/> <field name="type">opportunity</field> diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 42587eea2b0..350e85b977e 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -462,7 +462,7 @@ <field name="user_id"/> <button string="Schedule/Log Call" - name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/> + name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action"/> <field name="planned_revenue"/> <field name="probability"/> diff --git a/addons/crm/report/crm_lead_report_view.xml b/addons/crm/report/crm_lead_report_view.xml index bf3917863cd..623f9a4c5e3 100644 --- a/addons/crm/report/crm_lead_report_view.xml +++ b/addons/crm/report/crm_lead_report_view.xml @@ -267,7 +267,6 @@ parent="base.next_id_64" action="action_report_crm_lead" sequence="3"/> <menuitem name="Opportunities Analysis" id="menu_report_crm_opportunities_tree" - groups="base.group_extended" parent="base.next_id_64" action="action_report_crm_opportunity" sequence="4"/> </data> diff --git a/addons/crm/wizard/crm_lead_to_partner.py b/addons/crm/wizard/crm_lead_to_partner.py index 88ccacffef5..861472949e2 100644 --- a/addons/crm/wizard/crm_lead_to_partner.py +++ b/addons/crm/wizard/crm_lead_to_partner.py @@ -78,21 +78,16 @@ class crm_lead2partner(osv.osv_memory): email = re.findall(r'([^ ,<@]+@[^> ,]+)', lead.email_from or '') email = map(lambda x: "'" + x + "'", email) if email: - cr.execute("""select id from res_partner_address + cr.execute("""select partner_id from res_partner_address where substring(email from '([^ ,<@]+@[^> ,]+)') in (%s)""" % (','.join(email))) - address_ids = map(lambda x: x[0], cr.fetchall()) - if address_ids: - partner_ids = partner_obj.search(cr, uid, [('address', 'in', address_ids)], context=context) - + partner_ids = map(lambda x: x[0], cr.fetchall()) + # Find partner name that matches the name of the lead if not partner_ids and lead.partner_name: - partner_ids = partner_obj.search(cr, uid, [('name', '=', lead.partner_name)], context=context) - - partner_id = partner_ids and partner_ids[0] or False - - + partner_ids = partner_obj.search(cr, uid, [('name', '=ilike', lead.partner_name)], context=context) + partner_id = partner_ids and partner_ids[0] or False if 'partner_id' in fields: res.update({'partner_id': partner_id}) if 'action' in fields: diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall.py b/addons/crm/wizard/crm_opportunity_to_phonecall.py index 714376766f6..b0bfbf3b817 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall.py +++ b/addons/crm/wizard/crm_opportunity_to_phonecall.py @@ -35,13 +35,16 @@ class crm_opportunity2phonecall(osv.osv_memory): _columns = { 'name' : fields.char('Call summary', size=64, required=True, select=1), 'user_id' : fields.many2one('res.users', "Assign To"), + 'contact_name':fields.char('Contact', size=64), + 'phone':fields.char('Phone', size=64), 'partner_id' : fields.many2one('res.partner', "Partner"), 'date': fields.datetime('Date'), 'section_id': fields.many2one('crm.case.section', 'Sales Team'), 'categ_id': fields.many2one('crm.case.categ', 'Category', \ domain="['|',('section_id','=',False),('section_id','=',section_id),\ ('object_id.model', '=', 'crm.phonecall')]"), - 'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True), + 'action': fields.selection([('schedule','Schedule a call'), ('log','Log a call')], 'Action', required=True), + 'note':fields.text('Note'), } def default_get(self, cr, uid, fields, context=None): @@ -64,7 +67,7 @@ class crm_opportunity2phonecall(osv.osv_memory): record_ids = context and context.get('active_ids', []) or [] res = super(crm_opportunity2phonecall, self).default_get(cr, uid, fields, context=context) - res.update({'action': 'schedule', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}) + res.update({'action': 'log', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}) for opp in opp_obj.browse(cr, uid, record_ids, context=context): if 'name' in fields: res.update({'name': opp.name}) @@ -76,6 +79,12 @@ class crm_opportunity2phonecall(osv.osv_memory): res.update({'categ_id': categ_id}) if 'partner_id' in fields: res.update({'partner_id': opp.partner_id and opp.partner_id.id or False}) + if 'note' in fields: + res.update({'note': opp.description}) + if 'contact_name' in fields: + res.update({'contact_name': opp.partner_address_id and opp.partner_address_id.name or False}) + if 'phone' in fields: + res.update({'phone': opp.phone or (opp.partner_address_id and opp.partner_address_id.phone or False)}) return res def action_cancel(self, cr, uid, ids, context=None): @@ -142,6 +151,7 @@ class crm_opportunity2phonecall(osv.osv_memory): if this.action == 'log': phonecall_obj.case_close(cr, uid, [new_case]) + return {'type': 'ir.actions.act_window_close'} value = { 'name': _('Phone Call'), diff --git a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml index 764648a877b..980b93500d2 100644 --- a/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml +++ b/addons/crm/wizard/crm_opportunity_to_phonecall_view.xml @@ -16,10 +16,19 @@ <field name="name"/> <field name="date" string="Planned Date" attrs="{'invisible': [('action','=','log')]}"/> <newline/> - <field name="partner_id" readonly="True"/> - <field name="user_id" /> - <field name="section_id" widget="selection" /> - <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/> + <group colspan="4"> + <field name="partner_id" readonly="True"/> + <field name="categ_id" string="Type" widget="selection" domain="[('object_id.model', '=', 'crm.phonecall')]"/> + <field name="contact_name"/> + <field name="phone"/> + </group> + <group colspan="4"> + <field name="user_id" attrs="{'invisible': [('action','=','log')]}"/> + <field name="section_id" widget="selection" attrs="{'invisible': [('action','=','log')]}"/> + </group> + <group colspan="4"> + <field name="note"/> + </group> <separator string="" colspan="4"/> <group colspan="4" col="3"> <button name="action_cancel" string="_Cancel" icon="gtk-cancel" special="cancel" /> diff --git a/addons/crm_todo/__init__.py b/addons/crm_todo/__init__.py new file mode 100644 index 00000000000..891c71db7ff --- /dev/null +++ b/addons/crm_todo/__init__.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## + +import crm_todo diff --git a/addons/crm_todo/__openerp__.py b/addons/crm_todo/__openerp__.py new file mode 100644 index 00000000000..f56e95281fd --- /dev/null +++ b/addons/crm_todo/__openerp__.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## + + +{ + 'name': 'To Do List for CRM', + 'version': '1.0', + 'category': 'Sales', + 'description': """ +Todo list for CRM leads and opportunities. + """, + 'author': 'OpenERP SA', + 'depends': ['crm','project_gtd'], + 'update_xml': [ + 'crm_todo_view.xml', + ], + 'demo': [ + 'crm_todo_demo.xml', + ], +} diff --git a/addons/crm_todo/crm_todo.py b/addons/crm_todo/crm_todo.py new file mode 100644 index 00000000000..ba7445ecef1 --- /dev/null +++ b/addons/crm_todo/crm_todo.py @@ -0,0 +1,37 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero 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 Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## + +from osv import fields, osv + +class project_task(osv.osv): + _inherit = 'project.task' + _columns = { + 'lead_id': fields.many2one('crm.lead', 'Lead / Opportunity') + } + +class crm_todo(osv.osv): + _inherit = 'crm.lead' + _columns = { + 'task_ids': fields.one2many('project.task', 'lead_id', 'Tasks'), + } + + + diff --git a/addons/crm_todo/crm_todo_demo.xml b/addons/crm_todo/crm_todo_demo.xml new file mode 100644 index 00000000000..eef41bdc472 --- /dev/null +++ b/addons/crm_todo/crm_todo_demo.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" ?> +<openerp> +<data> + + <record id="project.project_task_188" model="project.task"> + <field name="lead_id" ref="crm.crm_case_fabiendupont"/> + </record> + <record id="project.project_task_186" model="project.task"> + <field name="lead_id" ref="crm.crm_case_fabiendupont"/> + </record> + <record id="project.project_task_184" model="project.task"> + <field name="lead_id" ref="crm.crm_case_dirtminingltdunits25"/> + </record> + +</data> +</openerp> diff --git a/addons/crm_todo/crm_todo_view.xml b/addons/crm_todo/crm_todo_view.xml new file mode 100644 index 00000000000..94d5b1a0cbe --- /dev/null +++ b/addons/crm_todo/crm_todo_view.xml @@ -0,0 +1,62 @@ +<?xml version="1.0" ?> +<openerp> + <data> + + <record id="crm_todo_opportunity_add" model="ir.ui.view"> + <field name="name">Opportunities - Tasks</field> + <field name="model">crm.lead</field> + <field name="type">form</field> + <field name="inherit_id" ref="crm.crm_case_form_view_oppor" /> + <field name="arch" type="xml"> + <data> + <page string="Extra Info" position="before"> + <page string="Tasks"> + <field name="task_ids" colspan="4" nolabel="1"> + <tree editable="bottom" string="Tasks"> + <field name="name"/> + <field name="user_id"/> + + <field string="Timebox" name="timebox_id"/> + <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open"/> + <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open"/> + + <field name="state"/> + <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/> + <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> + </tree> + </field> + </page> + </page> + </data> + </field> + </record> + + <record model="ir.ui.view" id="project_task_crm_tree"> + <field name="name">project.task.tree.crm</field> + <field name="model">project.task</field> + <field name="type">tree</field> + <field name="priority">20</field> + <field name="inherit_id" ref="project.view_task_tree2" /> + <field name="arch" type="xml"> + <field name="remaining_hours" position="after"> + <field name="lead_id" invisible="not context.get('lead_id', False)"/> + </field> + </field> + </record> + + + <record model="ir.actions.act_window" id="crm_todo_action"> + <field name="name">Todo List</field> + <field name="res_model">project.task</field> + <field name="context">{'set_editable':True,'set_visible':True,'gtd':True,'user_invisible':True, 'search_default_user_id':uid, "search_default_current": 1, "search_default_open": 1, "lead_id": 1}</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field> + </record> + <menuitem name="Tasks" + id="menu_crm_todo" + parent="base.menu_sales" + action="crm_todo_action"/> + + + </data> +</openerp> diff --git a/addons/event/i18n/ru.po b/addons/event/i18n/ru.po index 04789b02e47..77f37159701 100644 --- a/addons/event/i18n/ru.po +++ b/addons/event/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-08-02 10:44+0000\n" +"PO-Revision-Date: 2011-11-07 22:33+0000\n" "Last-Translator: Stanislav Hanzhin <Unknown>\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: 2011-11-05 04:58+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: event @@ -689,8 +689,9 @@ msgid "" "outbound emails for this record before being sent. Separate multiple email " "addresses with a comma" msgstr "" -"Эти эл. адреса будут добавлены в поле \"Копия\" всей входящей и исходящей " -"почты для этой записи. Разделяйте эл. адреса запятыми." +"Эти электронные адреса будут добавлены в поле \"Копия\" всех входящих и " +"исходящих сообщений для этой записи перед отправкой. Разделяйте адреса " +"запятыми." #. module: event #: constraint:res.partner:0 diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py index 66a32c80437..1c6bb5688d7 100644 --- a/addons/l10n_ch/__openerp__.py +++ b/addons/l10n_ch/__openerp__.py @@ -2,7 +2,7 @@ ############################################################################## # # Author: Nicolas Bessi. Copyright Camptocamp SA -# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA +# Donors: Hasa SA, Open Net SA and Prisme Solutions Informatique SA # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -21,10 +21,8 @@ { "name" : "Switzerland - localization with 2011 taxes", - "description" : """ -Swiss localisation. -=================== - + "description" : """ +Swiss localisation : - DTA generation for a lot of payment types - BVR management (number generation, report, etc..) - Import account move from the bank file (like v11 etc..) @@ -33,9 +31,11 @@ Swiss localisation. You can also add ZIP and bank completion with: - l10n_ch_zip - l10n_ch_bank + + Author: Camptocamp SA + Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA -Author: Camptocamp SA -Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA +------------------------------------------------------------------------ Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp. Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement électronique via DTA (pour les banques, le système postal est en développement) @@ -47,10 +47,11 @@ Par ailleurs, conjointement à ce module, nous proposons la complétion NPA: Vous pouvez ajouter la completion des banques et des NPA avec with: - l10n_ch_zip - l10n_ch_bank - + Auteur: Camptocamp SA Donateurs: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA +-------------------------------------------------------------------------- TODO : - Implement bvr import partial reconciliation - Replace wizard by osv_memory when possible @@ -60,9 +61,9 @@ TODO : """, - "version" : "6.0", - "author" : "Camptocamp SA", - "category" : "Localization/Account Charts", + "version" : "6.1", + "author" : "Camptocamp", + "category" : "Finance", "website": "http://www.camptocamp.com", "depends" : [ @@ -83,10 +84,10 @@ TODO : ], "demo_xml" : [ "demo/demo.xml", + "demo/dta_demo.xml", ], "update_xml" : [ "wizard.xml", - "dta_view.xml", "wizard/bvr_import_view.xml", "wizard/create_dta_view.xml", "company_view.xml", @@ -97,6 +98,9 @@ TODO : ], 'test' : [ 'test/l10n_ch_report.yml', + 'test/l10n_ch_dta.yml', + 'test/l10n_ch_v11.yml', + 'test/l10n_ch_v11_part.yml', ], "active": False, "installable": True, diff --git a/addons/l10n_ch/account_wizard.py b/addons/l10n_ch/account_wizard.py index 08c969dd654..f9b2600adca 100644 --- a/addons/l10n_ch/account_wizard.py +++ b/addons/l10n_ch/account_wizard.py @@ -32,13 +32,13 @@ class WizardMultiChartsAccounts(osv.osv_memory): 'sale_tax': False, 'purchase_tax':False } - + def execute(self, cr, uid, ids, context=None): """Override of code in order to be able to link journal with account in XML""" res = super(WizardMultiChartsAccounts, self).execute(cr, uid, ids, context) path = addons.get_module_resource(os.path.join('l10n_ch','sterchi_chart','account_journal_rel.xml')) tools.convert_xml_import(cr, 'l10n_ch', path, idref=None, mode='init', noupdate=True, report=None) return res - -WizardMultiChartsAccounts() + +WizardMultiChartsAccounts() diff --git a/addons/l10n_ch/bank.py b/addons/l10n_ch/bank.py index d64d57436a9..6b9294bea13 100644 --- a/addons/l10n_ch/bank.py +++ b/addons/l10n_ch/bank.py @@ -19,12 +19,15 @@ # ############################################################################## +from tools.translate import _ from osv import fields, osv class Bank(osv.osv): """Inherit res.bank class in order to add swiss specific field""" _inherit = 'res.bank' _columns = { + ### Internal reference + 'code': fields.char('Code', size=64), ###Swiss unik bank identifier also use in IBAN number 'clearing': fields.char('Clearing number', size=64), ### city of the bank @@ -33,15 +36,44 @@ class Bank(osv.osv): Bank() -class bvr_checkbox(osv.osv): - """ Add function to generate function """ + +class ResPartnerBank(osv.osv): _inherit = "res.partner.bank" _columns = { - 'print_bank' : fields.boolean('Print Bank on BVR'), - 'print_account' : fields.boolean('Print Account Number on BVR'), - } + 'name': fields.char('Description', size=128, required=True), + 'post_number': fields.char('Post number', size=64), + 'bvr_adherent_num': fields.char('BVR adherent number', size=11), + 'dta_code': fields.char('DTA code', size=5), + 'print_bank': fields.boolean('Print Bank on BVR'), + 'print_account': fields.boolean('Print Account Number on BVR'), + 'acc_number': fields.char('Account/IBAN Number', size=64), + 'my_bank': fields.boolean('Use my account to print BVR ?', help="Check to print BVR invoices"), + } + + def name_get(self, cursor, uid, ids, context=None): + if not len(ids): + return [] + bank_type_obj = self.pool.get('res.partner.bank.type') + + type_ids = bank_type_obj.search(cursor, uid, []) + bank_type_names = {} + for bank_type in bank_type_obj.browse(cursor, uid, type_ids, + context=context): + bank_type_names[bank_type.code] = bank_type.name + res = [] + for r in self.read(cursor, uid, ids, ['name','state'], context): + res.append((r['id'], r['name']+' : '+bank_type_names.get(r['state'], ''))) + return res + + def _prepare_name(self, bank): + "Hook to get bank number of bank account" + res = super(ResPartnerBank, self)._prepare_name(bank) + if bank.post_number: + res = u"%s - %s" % (res, bank.post_number) + return res -bvr_checkbox() + _sql_constraints = [('bvr_adherent_uniq', 'unique (bvr_adherent_num)', + 'The BVR adherent number must be unique !')] -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: +ResPartnerBank() diff --git a/addons/l10n_ch/bank_view.xml b/addons/l10n_ch/bank_view.xml index 339e5cf887a..f8c66c16000 100644 --- a/addons/l10n_ch/bank_view.xml +++ b/addons/l10n_ch/bank_view.xml @@ -1,54 +1,186 @@ <?xml version="1.0" encoding="utf-8"?> <openerp> <data> + <!-- res.bank base form--> <record model="ir.ui.view" id="view_res_bank_form"> <field name="name">res.bank.form</field> <field name="model">res.bank</field> <field name="type">form</field> + <field name="sequence" eval="9" /> <field name="inherit_id" ref="base.view_res_bank_form"/> <field name="arch" type="xml"> + <field name="name" position="after"> + <field name="code"/> + </field> <field name="bic" position="after"> <field name="clearing"/> </field> </field> </record> + <!-- res.bank base tree--> <record model="ir.ui.view" id="l10nch_view_res_bank_tree"> <field name="name">res.bank.tree</field> <field name="model">res.bank</field> <field name="type">tree</field> + <field name="sequence" eval="9" /> <field name="inherit_id" ref="base.view_res_bank_tree"/> <field name="arch" type="xml"> - <field name="code" position="after"> + <field name="name" position="after"> + <field name="code" select="1"/> <field name="clearing" select="1"/> </field> </field> </record> + + <!-- res.partner.bank in res partner form--> + <!-- Partner -> Bank Details --> + + <record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_f1"> + <field name="name">res.partner_bank.form.hide.f1</field> + <field name="model">res.partner</field> + <field name="type">form</field> + <field name="sequence" eval="9" /> + <field name="inherit_id" ref="account.view_partner_property_form"/> + <field name="arch" type="xml"> + <field name="acc_number" position="replace"> + </field> + </field> + </record> + <record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_f2"> + <field name="name">res.partner_bank.form.hide.f2</field> + <field name="model">res.partner</field> + <field name="type">form</field> + <field name="sequence" eval="9" /> + <field name="inherit_id" ref="account.view_partner_property_form"/> + <field name="arch" type="xml"> + <field name="bank" position="replace"> + </field> + </field> + </record> + + <record model="ir.ui.view" id="l10nch_view_res_partner_bank_add_groups"> + <field name="name">res.partner_bank.form.hide.f2</field> + <field name="model">res.partner</field> + <field name="type">form</field> + <field name="sequence" eval="10" /> + <field name="inherit_id" ref="account.view_partner_property_form"/> + <field name="arch" type="xml"> + <field name="state" position="after"> + <newline/> + <separator colspan="4" string="Account infos"/> + <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" > + <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/> + <field name="dta_code"/> + <newline/> + </group> + <newline/> + <group string="Postal account info" colspan="4" attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" > + <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/> + <newline/> + </group> + <separator colspan="4" string="Financial institute infos"/> + <field name="bank" /> + </field> + </field> + </record> + + + <!-- res.partner.bank base form--> + <!-- Sales -> Configuration -> Address Book -> Bank accounts --> + <!-- Invoice -> Bank account --> - <record model="ir.ui.view" id="l10nch_view_res_partner_bank"> - <field name="name">res.partner_bank.form</field> + <record model="ir.ui.view" id="l10nch_view_res_partner_bank_acc_number_hide_frominvoice"> + <field name="name">res.partner_bank.form.hide.acc_number.frominvoice</field> <field name="model">res.partner.bank</field> <field name="type">form</field> + <field name="sequence" eval="9" /> <field name="inherit_id" ref="base.view_partner_bank_form"/> <field name="arch" type="xml"> - <field name="country_id" position="after"> - <field name="print_bank"/> - <field name="print_account"/> + <field name="acc_number" position="replace"> </field> </field> </record> - <record model="ir.ui.view" id="l10nch_view_res_partner_bank"> - <field name="name">res.partner_partner_bank.form</field> - <field name="model">res.partner</field> + + <record model="ir.ui.view" id="l10nch_view_res_partner_bank_hide_bank_frominvoice2"> + <field name="name">res.partner_bank.form.hide.bank.frominvoice</field> + <field name="model">res.partner.bank</field> <field name="type">form</field> - <field name="inherit_id" ref="account.view_partner_property_form"/> + <field name="sequence" eval="9" /> + <field name="inherit_id" ref="base.view_partner_bank_form"/> + <field name="arch" type="xml"> + <field name="bank" position="replace"> + </field> + </field> + </record> + + <record model="ir.ui.view" id="l10nch_view_res_partner_bank_from_invoice"> + <field name="name">res.partner_bank.form.hide.frominvoice</field> + <field name="model">res.partner.bank</field> + <field name="type">form</field> + <field name="sequence" eval="10"/> + <field name="inherit_id" ref="base.view_partner_bank_form"/> <field name="arch" type="xml"> - <field name="bank" position="after"> - <newline /> - <field name="print_bank"/> - <field name="print_account"/> + <field name="state" position="after"> + <newline/> + + <separator colspan="4" string="Account infos"/> + <newline/> + <group string="Bank account info" colspan="4" attrs="{'invisible': [('state','in', ['bvpost','bvrpost'])]}" > + <field name="acc_number" string="Account/IBAN Number" attrs="{'required': [('state','not in',['bvpost','bvrpost'])]}"/> + <field name="dta_code"/> + <newline/> + </group> + <newline/> + <group string="Postal account info" colspan="4" attrs="{'invisible': [('state','not in', ['bvpost','bvrpost','bvbank','bvrbank'])]}" > + <field name="post_number" attrs="{'required': [('state','in',['bvpost','bvrpost','bvrbank'])]}"/> + <newline/> + </group> + <separator colspan="4" string="Financial institute infos"/> + <newline/> + <field name="my_bank" attrs="{'invisible': [('company_id', '!=', True)]}" colspan="4"/> + <group string="BVR print options" colspan="4" attrs="{'invisible': [('my_bank', '!=', True)]}" > + <field name="bvr_adherent_num"/> + <field name="print_bank"/> + <field name="print_account"/> + <newline/> + </group> + <newline/> + <field name="bank" /> </field> </field> + </record> + + <!-- res.partner form bank list--> + <!-- Adding Type and bank name --> + <record id="l10nch_view_partner_bank_details_list" model="ir.ui.view"> + <field name="name">res.partner.form.bank_details.list</field> + <field name="model">res.partner</field> + <field name="inherit_id" ref="base.view_partner_form"/> + <field name="type">form</field> + <field name="arch" type="xml"> + <xpath expr="/form/notebook/page/field[@name='bank_ids']/tree/field[@name='acc_number']" position="before"> + <field name="state" /> + <field name="bank" /> + </xpath> + </field> </record> + + <!-- res.partner form bank list--> + <!-- Adding Type and bank name --> + <record id="l10nch_view_partner_bank_invoice_tree" model="ir.ui.view"> + <field name="name">res.partner.bank.tree.from_invoice</field> + <field name="model">res.partner.bank</field> + <field name="inherit_id" ref="base.view_partner_bank_tree"/> + <field name="type">tree</field> + <field name="arch" type="xml"> + <field name="acc_number" position="before"> + <field name="state" /> + <field name="bank" /> + </field> + </field> + </record> + + </data> </openerp> diff --git a/addons/l10n_ch/company.py b/addons/l10n_ch/company.py index 20f6b6168ec..a90bb6a0389 100644 --- a/addons/l10n_ch/company.py +++ b/addons/l10n_ch/company.py @@ -29,19 +29,36 @@ class res_company(osv.osv): _columns = { 'bvr_delta_horz': fields.float('BVR Horz. Delta (mm)', help='horiz. delta in mm 1.2 will print the bvr 1.2mm lefter, negative value is possible'), - + 'bvr_delta_vert': fields.float('BVR Vert. Delta (mm)', help='vert. delta in mm 1.2 will print the bvr 1.2mm lower, negative value is possible'), - + + 'bvr_scan_line_vert': fields.float('BVR vert. position for scan line (mm)', + help='Vert. position in mm for scan line'), + + 'bvr_scan_line_horz': fields.float('BVR horiz. position for scan line(mm)', + help='Horiz. position in mm for scan line'), + + 'bvr_scan_line_font_size': fields.float('BVR scan line font size (pt)'), + + 'bvr_scan_line_letter_spacing':fields.float('BVR scan line letter spacing'), + 'bvr_background': fields.boolean('Insert BVR background ?'), - + 'bvr_only': fields.boolean('Separated BVR only ?', help='Print only the BVR separated page'), - + 'invoice_only': fields.boolean('Invoice only (Do not use with bvr only)?', help='Print only the invoice without BVR'), } + _defaults = { + 'bvr_scan_line_vert': 232, + 'bvr_scan_line_horz': 72, + 'bvr_scan_line_font_size': 12, + 'bvr_scan_line_letter_spacing': 0, + } + res_company() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml index df49cf123be..0d107f63723 100644 --- a/addons/l10n_ch/company_view.xml +++ b/addons/l10n_ch/company_view.xml @@ -8,13 +8,21 @@ <field name="inherit_id" ref="base.view_company_form"/> <field name="arch" type="xml"> <field name="rml_footer2" position="after"> - <field name="bvr_delta_horz"/> - <field name="bvr_delta_vert"/> - <field name="bvr_background"/> - <field name="bvr_only"/> - <field name="invoice_only"/> + <newline/> + <group string="BVR data" colspan="4"> + <field name="bvr_delta_horz"/> + <field name="bvr_delta_vert"/> + <field name="bvr_scan_line_vert"/> + <field name="bvr_scan_line_horz"/> + <field name="bvr_scan_line_font_size"/> + <field name="bvr_scan_line_letter_spacing"/> + <field name="bvr_background"/> + <field name="bvr_only"/> + <field name="invoice_only"/> + </group> + <newline/> </field> </field> </record> </data> -</openerp> +</openerp>
\ No newline at end of file diff --git a/addons/l10n_ch/demo/demo.xml b/addons/l10n_ch/demo/demo.xml index 8df7be446bd..fbe09024966 100644 --- a/addons/l10n_ch/demo/demo.xml +++ b/addons/l10n_ch/demo/demo.xml @@ -13,10 +13,8 @@ <field name="state">bvrbank</field> <field name="post_number">11-1234-1</field> <field name="bank" ref="main_bank"/> - <field name="iban">CH9100767000S00023455</field> + <!-- <field name="iban">CH9100767000S00023455</field> --> <field name="bvr_adherent_num">0000000</field> - - </record> <record id="bank" model="res.partner"> @@ -24,7 +22,6 @@ <field name="ref">banq</field> <field name="name">Banque</field> <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/> - <field name="address" eval="[]"/> </record> <record id="res_partner_address_bank1" model="res.partner.address"> @@ -48,7 +45,6 @@ <field name="website">http://camptocamp.com</field> <field name="name">ProLibre</field> <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/> - <field name="address" eval="[]"/> </record> <record id="camptocamp" model="res.partner"> @@ -58,7 +54,6 @@ <field name="website">http://camptocamp.com</field> <field name="name">camptocamp SA</field> <field name="category_id" model="res.partner.category" search="[('name','=','Partenaire')]"/> - <field name="address" eval="[]"/> </record> <!-- Resource: res.partner.address diff --git a/addons/l10n_ch/demo/dta_demo.xml b/addons/l10n_ch/demo/dta_demo.xml index d2968fcf40b..cdddb0d7a74 100644 --- a/addons/l10n_ch/demo/dta_demo.xml +++ b/addons/l10n_ch/demo/dta_demo.xml @@ -14,17 +14,18 @@ <field name="state">bvrbank</field> <field name="post_number">234567</field> <field name="bank" ref="partner_bank"/> - <field name="iban">CH9100767000S00023455</field> + <!-- <field name="iban">CH9100767000S00023455</field> --> </record> - <record model="res.partner.bank" id="main_bank"> + <record model="res.partner.bank" id="main_partner_bank"> <field name="name">My bank</field> - <field name="acc_number">123456</field> - <field name="iban">123456</field> + <!-- <field name="acc_number">123456</field> --> + <!-- <field name="iban">123456</field> --> <field name="partner_id" ref="base.main_partner"/> <field name="state">dta_company</field> <field name="bank" ref="partner_bank"/> - <field name="iban">CH9100767000S00023455</field> + <!-- <field name="iban">CH9100767000S00023455</field> --> + <field name="acc_number">CH9100767000S00023455</field> </record> <record model="account.invoice" id="v11_invoice"> @@ -52,7 +53,7 @@ <!-- Define a payment mode --> <record model="payment.mode" id="payment_mode_dta"> <field name="name">DTA</field> - <field name="bank_id" ref="main_bank"/> + <field name="bank_id" ref="main_partner_bank"/> <field name="journal" model="account.journal" search="[('type','=','cash')]"/> </record> diff --git a/addons/l10n_ch/dta.py b/addons/l10n_ch/dta.py deleted file mode 100644 index a8ae96e080d..00000000000 --- a/addons/l10n_ch/dta.py +++ /dev/null @@ -1,85 +0,0 @@ -# -*- encoding: utf-8 -*- -############################################################################## -# -# Author: Nicolas Bessi. Copyright Camptocamp SA -# Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero 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 Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# -############################################################################## - -import time -from osv import osv, fields - -class account_dta(osv.osv): - """class that implements bank DTA File format, - used to transfert bulk batch payment instruction to a bank""" - _name = "account.dta" - _description = "DTA History" - _columns = { - ### name of the file - 'name': fields.binary('DTA file', readonly=True), - ### list of dta line linked to the dta order - 'dta_line_ids': fields.one2many('account.dta.line','dta_id','DTA lines', readonly=True), - ## textual notes - 'note': fields.text('Creation log', readonly=True, - help="Displays the problem during dta generation"), - ### bank how will execute DTA order - 'bank': fields.many2one('res.partner.bank','Bank', readonly=True,select=True, - help="Bank how will execute DTA order"), - ### date of DTA order generation - 'date': fields.date('Creation Date', readonly=True,select=True, - help="Date of DTA order generation"), - ### user how generate the DTA order - 'user_id': fields.many2one('res.users','User', readonly=True, select=True), - } -account_dta() - -class account_dta_line(osv.osv): - """Class that represent a DTA order line, - each line corressponds to a payment instruction""" - _name = "account.dta.line" - _description = "DTA line" - _columns = { - ### name of the line - 'name' : fields.many2one('account.invoice','Invoice', required=True, size=256), - ### partner how will receive payments - 'partner_id' : fields.many2one('res.partner','Partner', - help="Partenr to pay"), - ### due date of the payment - 'due_date' : fields.date('Due date'), - ### date of the supplier invoice to pay - 'invoice_date' : fields.date('Invoice date'), - ### cash discount date - 'cashdisc_date' : fields.date('Cash Discount date'), - ### amount effectively paied on this line - 'amount_to_pay' : fields.float('Amount to pay', - help="Amount effectively paid"), - ### amount that was on the supplier invoice - 'amount_invoice': fields.float('Invoiced Amount', - help="Amount to pay base on the supplier invoice"), - ### Cash discount amount - 'amount_cashdisc': fields.float('Cash Discount Amount'), - ### Linke to the main dta order - 'dta_id': fields.many2one('account.dta','Associated DTA', required=True, ondelete='cascade'), - ### state of the invoice Drat, Cancel, Done - 'state' : fields.selection([('draft','Draft'),('cancel','Error'),('done','Paid')],'State') - } - _defaults = { - 'state' : lambda *a :'draft', - } - -account_dta_line() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file diff --git a/addons/l10n_ch/dta_data.xml b/addons/l10n_ch/dta_data.xml index 5ef689d551c..b11e5e172a9 100644 --- a/addons/l10n_ch/dta_data.xml +++ b/addons/l10n_ch/dta_data.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> <openerp> - <data> + <data noupdate="1"> <!-- Memo : @@ -30,113 +30,25 @@ <field name="code">dta_company</field> </record> - <record model="res.partner.bank.type" id="dta_iban"> - <field name="name">DTA-IBAN</field> - <field name="code">dta_iban</field> - </record> - <record model="res.partner.bank.type" id="bvrbank"> - <field name="name">DTA-BVRBANK</field> + <field name="name">BVR Bank</field> <field name="code">bvrbank</field> </record> <record model="res.partner.bank.type" id="bvrpost"> - <field name="name">DTA-BVRPOST</field> + <field name="name">BVR Post</field> <field name="code">bvrpost</field> </record> <record model="res.partner.bank.type" id="bvpost"> - <field name="name">DTA-BVPOST</field> + <field name="name">BV Post</field> <field name="code">bvpost</field> </record> <record model="res.partner.bank.type" id="bvbank"> - <field name="name">DTA-BVBANK</field> + <field name="name">BV Bank</field> <field name="code">bvbank</field> </record> - - - <!-- Adjust the fields attributes for dta_company--> - <record model="res.partner.bank.type.field" id="iban_field"> - <field name="name">iban</field> - <field name="bank_type_id" ref="bank_dta"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - - - <!-- Adjust the fields attributes for dta_iban--> - <record model="res.partner.bank.type.field" id="iban_field_iban"> - <field name="name">iban</field> - <field name="bank_type_id" ref="dta_iban"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - <record model="res.partner.bank.type.field" id="bank_field_iban"> - <field name="name">bank</field> - <field name="bank_type_id" ref="dta_iban"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - - - <!-- Adjust the fields attributes for bvrbank--> - <record model="res.partner.bank.type.field" id="bank_field_bvrbank"> - <field name="name">bank</field> - <field name="bank_type_id" ref="bvrbank"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - <record model="res.partner.bank.type.field" id="bvr_num_field_bvrbank"> - <field name="name">post_number</field> - <field name="bank_type_id" ref="bvrbank"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - - <!-- Adjust the fields attributes for bvrpost--> - <record model="res.partner.bank.type.field" id="bank_field_bvrpost"> - <field name="name">bank</field> - <field name="bank_type_id" ref="bvrpost"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - <record model="res.partner.bank.type.field" id="bvr_num_field_bvrpost"> - <field name="name">post_number</field> - <field name="bank_type_id" ref="bvrpost"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - - <!-- Adjust the fields attributes for bvpost --> - <record model="res.partner.bank.type.field" id="bank_field_bvpost"> - <field name="name">bank</field> - <field name="bank_type_id" ref="bvpost"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - <record model="res.partner.bank.type.field" id="post_field_bvpost"> - <field name="name">post_number</field> - <field name="bank_type_id" ref="bvpost"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - - <!-- Adjust the fields attributes for bvbank --> - <record model="res.partner.bank.type.field" id="bank_field_bvbank"> - <field name="name">bank</field> - <field name="bank_type_id" ref="bvbank"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - - <record model="res.partner.bank.type.field" id="acc_num_field_bvbank"> - <field name="name">acc_number</field> - <field name="bank_type_id" ref="bvbank"/> - <field name="required" eval="True"/> - <field name="readonly" eval="False"/> - </record> - </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/l10n_ch/dta_view.xml b/addons/l10n_ch/dta_view.xml deleted file mode 100644 index 869eacae6f1..00000000000 --- a/addons/l10n_ch/dta_view.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0"?> -<openerp> - <data> - - <!-- Inherit both bank view --> - <record model="ir.ui.view" id="view_partner_bank_form"> - <field name="name">partner - bank inherit</field> - <field name="model">res.partner</field> - <field name="type">form</field> - <field name="inherit_id" ref="base.view_partner_form"/> - <field name="arch" type="xml"> - <field name="acc_number" position="after"> - <newline/> - <field name="bvr_adherent_num"/> - <field name="post_number"/> - <field name="dta_code"/> - </field> - </field> - </record> - - <record model="ir.ui.view" id="view_partner_bank_form2"> - <field name="name">partner - bank inherit</field> - <field name="model">res.partner.bank</field> - <field name="type">form</field> - <field name="inherit_id" ref="base.view_partner_bank_form"/> - <field name="arch" type="xml"> - <field name="acc_number" position="after"> - <newline/> - <field name="bvr_adherent_num"/> - <field name="post_number"/> - <field name="dta_code"/> - </field> - </field> - </record> - - </data> -</openerp> diff --git a/addons/l10n_ch/invoice.py b/addons/l10n_ch/invoice.py index 4896931b77b..9e8d3f0d57b 100644 --- a/addons/l10n_ch/invoice.py +++ b/addons/l10n_ch/invoice.py @@ -74,7 +74,8 @@ class account_invoice(osv.osv): ), ### Amount to pay 'amount_to_pay': fields.function(_amount_to_pay, - type='float', string='Amount to be paid', + type='float', + string='Amount to be paid', help='The amount which should be paid at the current date\n' \ 'minus the amount which is already in payment order'), } @@ -120,7 +121,7 @@ class account_invoice(osv.osv): invoice.partner_bank_id.state in \ ('bvrbank', 'bvrpost') and \ invoice.reference_type != 'bvr': - return False + return False return True _constraints = [ @@ -143,24 +144,34 @@ class account_invoice(osv.osv): def onchange_partner_id(self, cr, uid, ids, type, partner_id, date_invoice=False, payment_term=False, partner_bank_id=False, company_id=False): """ Function that is call when the partner of the invoice is changed - it will retriev and set the good bank partner bank""" - res = super(account_invoice, self).onchange_partner_id( - cr, - uid, - ids, - type, - partner_id, - date_invoice, - payment_term - ) + it will retrieve and set the good bank partner bank""" + #context not define in signature of function in account module + context = {} + res = super(account_invoice, self).onchange_partner_id(cr, + uid, + ids, + type, + partner_id, + date_invoice, + payment_term, + partner_bank_id, + company_id) bank_id = False if partner_id: - p = self.pool.get('res.partner').browse(cr, uid, partner_id) - if p.bank_ids: - bank_id = p.bank_ids[0].id - - if type in ('in_invoice', 'in_refund'): - res['value']['partner_bank_id'] = bank_id + if type in ('in_invoice', 'in_refund'): + p = self.pool.get('res.partner').browse(cr, uid, partner_id, context) + if p.bank_ids: + bank_id = p.bank_ids[0].id + res['value']['partner_bank_id'] = bank_id + else: + user = self.pool.get('res.users').browse(cr, uid, uid, context) + bank_ids = user.company_id.partner_id.bank_ids + if bank_ids: + #How to order bank ? + for bank in bank_ids: + if bank.my_bank: + bank_id = bank.id + res['value']['partner_bank_id'] = bank_id if partner_bank_id != bank_id: to_update = self.onchange_partner_bank(cr, uid, ids, bank_id) diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml index c755660d950..04870ca936b 100644 --- a/addons/l10n_ch/journal_data.xml +++ b/addons/l10n_ch/journal_data.xml @@ -1,5 +1,5 @@ <openerp> - <data> + <data noupdate="1"> <record id="expenses_journal" model="account.journal"> <field name="name">Journal de frais</field> @@ -14,7 +14,7 @@ <record id="bank_journal" model="account.journal"> <field name="name">Banque CHF</field> <field name="code">BCHF</field> - <field name="type">cash</field> + <field name="type">bank</field> <field name="view_id" ref="account.account_journal_bank_view"/> <field name="user_id" ref="base.user_root"/> <field name="update_posted" eval="True" /> @@ -24,7 +24,7 @@ <record id="bank_euro_journal" model="account.journal"> <field name="name">Banque EUR</field> <field name="code">BEUR</field> - <field name="type">cash</field> + <field name="type">bank</field> <field name="view_id" ref="account.account_journal_bank_view"/> <field name="user_id" ref="base.user_root"/> <field name="update_posted" eval="True" /> diff --git a/addons/l10n_ch/partner.py b/addons/l10n_ch/partner.py index 35a4456b7fd..9301c564227 100644 --- a/addons/l10n_ch/partner.py +++ b/addons/l10n_ch/partner.py @@ -30,35 +30,4 @@ class res_partner(osv.osv): } res_partner() - -class res_partner_bank(osv.osv): - _inherit = "res.partner.bank" - _columns = { - 'name': fields.char('Description', size=128, required=True), - 'post_number': fields.char('Post number', size=64), - 'bvr_adherent_num': fields.char('BVR adherent number', size=11), - 'dta_code': fields.char('DTA code', size=5), - } - - def name_get(self, cr, uid, ids, context=None): - if not len(ids): - return [] - bank_type_obj = self.pool.get('res.partner.bank.type') - - type_ids = bank_type_obj.search(cr, uid, []) - bank_type_names = {} - for bank_type in bank_type_obj.browse(cr, uid, type_ids, - context=context): - bank_type_names[bank_type.code] = bank_type.name - res = [] - for r in self.read(cr, uid, ids, ['name','state'], context): - res.append((r['id'], r['name']+' : '+bank_type_names[r['state']])) - return res - - _sql_constraints = [ - ('bvr_adherent_uniq', 'unique (bvr_adherent_num)', 'The BVR adherent number must be unique !') - ] - -res_partner_bank() - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file diff --git a/addons/l10n_ch/report/bvr.mako b/addons/l10n_ch/report/bvr.mako index 6ff8921a142..e4a2a2ea87d 100644 --- a/addons/l10n_ch/report/bvr.mako +++ b/addons/l10n_ch/report/bvr.mako @@ -7,6 +7,17 @@ font-weight: normal; src: url(${police_absolute_path('ocrbb.ttf')}) format("truetype"); } + .ocrbb{ + text-align:right; + font-family:bvrocrb; + font-size:${str(company.bvr_scan_line_font_size or '0.0').replace(',','.')}pt; + position:absolute;top:${str(company.bvr_scan_line_vert or '0.0').replace(',','.')}mm; + left:${str(company.bvr_scan_line_horz or '0.0').replace(',','.')}mm; + z-index:4; + letter-spacing:str(company.bvr_scan_line_letter_spacing or '0.0').replace(',','.') + } + ${css} + </style> </style> </head> @@ -87,9 +98,41 @@ } </script> - ${_check(objects)} %for inv in objects : <% setLang(inv.partner_id.lang) %> + <!--adresses + info block --> + <table class="dest_address" style="position:absolute;top:6mm;left:15mm"> + <tr><td ><b>${inv.partner_id.title.name or ''|entity} ${inv.partner_id.name |entity}</b></td></tr> + <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr> + <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr> + <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr> + %if inv.address_invoice_id.country_id : + <tr><td>${inv.address_invoice_id.country_id.name or ''|entity} </td></tr> + %endif + %if inv.address_invoice_id.phone : + <tr><td>${_("Tel") |entity}: ${inv.address_invoice_id.phone|entity}</td></tr> + %endif + %if inv.address_invoice_id.fax : + <tr><td>${_("Fax") |entity}: ${inv.address_invoice_id.fax|entity}</td></tr> + %endif + %if inv.address_invoice_id.email : + <tr><td>${_("E-mail") |entity}: ${inv.address_invoice_id.email|entity}</td></tr> + %endif + %if inv.partner_id.vat : + <tr><td>${_("VAT") |entity}: ${inv.partner_id.vat|entity}</td></tr> + %endif + </table> + + <div style="position:absolute;top:60mm; left:20mm"> + ${_('Invoice')} - ${inv.number or ''|entity} + <br/> + <br/> + ${_('Here is the BVR to allow you to pay the invoice %s - %s') % (inv.name or '', inv.number or '',)} + <br/> + ${_('Regards')} + </div> + + <div colspan="2" class="ocrbb">${mod10r('01'+str('%.2f' % inv.amount_total).replace('.','').rjust(10,'0'))}>${_get_ref(inv)}+${inv.partner_bank_id.post_number.split('-')[0]+(str(inv.partner_bank_id.post_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.post_number.split('-')[2]}></div> <div id="cont_${inv.id}" style="padding-left:20mm;padding-top:0;padding-bottom:10;height:180mm"> <!-- Your communication message here --> </div> @@ -103,7 +146,7 @@ <tr style="height:8.4666667mm;vertical-align:bottom;padding-bottom:0"> <td><table style="width:100%" CELLPADDING="0" CELLSPACING="0"><td style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td><table style="width:100%" CELLPADDING="0" CELLSPACING="0"><td style="width:4mm"></td><td style="width:40mm;text-align: right" >${_space(('%.2f' % inv.amount_total)[:-3], 1)}</td><td style="width:6mm"></td><td style="width:10mm;text-align: right">${ _space(('%.2f' % inv.amount_total)[-2:], 1)}</td><td style="width:3mm;text-align: right"></td></table></td><td></td></tr> <tr style="height:21.166667mm"><td></td><td></td><td></td></tr> <tr style="height:8.4666667mm"> <td></td><td></td><td></td></tr> - <tr style="height:21.166667mm;vertical-align:top"><td></td><td colspan="2" style="text-align:right;padding-right:0.3in;font-family:bvrocrb;font-size:12pt">${mod10r('01'+str('%.2f' % inv.amount_total).replace('.','').rjust(10,'0'))}>${_get_ref(inv)}+${inv.partner_bank_id.post_number.split('-')[0]+(str(inv.partner_bank_id.post_number.split('-')[1])).rjust(6,'0')+inv.partner_bank_id.post_number.split('-')[2]}></td></tr> + <tr style="height:21.166667mm;vertical-align:top"><td></td><td></td></tr> </table> %endfor </body> diff --git a/addons/l10n_ch/report/report_webkit_html.mako b/addons/l10n_ch/report/report_webkit_html.mako index d15bfda2898..099bbbf8816 100644 --- a/addons/l10n_ch/report/report_webkit_html.mako +++ b/addons/l10n_ch/report/report_webkit_html.mako @@ -9,7 +9,7 @@ <% setLang(inv.partner_id.lang) %> <div id="inv_cont_${inv.id}" style="padding-left:20mm;padding-top:0;padding-bottom:10;border-width:0px;border-style:solid"> <table class="dest_address"> - <tr><td ><b>${inv.partner_id.title or ''|entity} ${inv.partner_id.name |entity}</b></td></tr> + <tr><td ><b>${inv.partner_id.title.name or ''|entity} ${inv.partner_id.name |entity}</b></td></tr> <tr><td>${inv.address_invoice_id.street or ''|entity}</td></tr> <tr><td>${inv.address_invoice_id.street2 or ''|entity}</td></tr> <tr><td>${inv.address_invoice_id.zip or ''|entity} ${inv.address_invoice_id.city or ''|entity}</td></tr> diff --git a/addons/l10n_ch/report/report_webkit_html.py b/addons/l10n_ch/report/report_webkit_html.py index 619a152405c..b551845322f 100644 --- a/addons/l10n_ch/report/report_webkit_html.py +++ b/addons/l10n_ch/report/report_webkit_html.py @@ -33,7 +33,9 @@ import addons import pooler from tools.config import config from mako.template import Template +from mako import exceptions from tools.translate import _ +from osv.osv import except_osv class l10n_ch_report_webkit_html(report_sxw.rml_parse): @@ -41,16 +43,15 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse): super(l10n_ch_report_webkit_html, self).__init__(cr, uid, name, context=context) self.localcontext.update({ 'time': time, - 'cr':cr, + 'cr': cr, 'uid': uid, 'user':self.pool.get("res.users").browse(cr, uid, uid), 'mod10r': mod10r, '_space': self._space, '_get_ref': self._get_ref, 'comma_me': self.comma_me, - 'police_absolute_path' : self.police_absolute_path, - 'bvr_absolute_path':self.bvr_absolute_path, - '_check' : self._check, + 'police_absolute_path': self.police_absolute_path, + 'bvr_absolute_path': self.bvr_absolute_path, 'headheight': self.headheight }) @@ -58,15 +59,22 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse): _compile_comma_me = re.compile("^(-?\d+)(\d{3})") _compile_check_bvr = re.compile('[0-9][0-9]-[0-9]{3,6}-[0-9]') _compile_check_bvr_add_num = re.compile('[0-9]*$') - + + def set_context(self, objects, data, ids, report_type=None): + user = self.pool.get('res.users').browse(self.cr, self.uid, self.uid) + company = user.company_id + if not company.invoice_only: + self._check(ids) + return super(l10n_ch_report_webkit_html, self).set_context(objects, data, ids, report_type=report_type) + def police_absolute_path(self, inner_path) : """Will get the ocrb police absolute path""" - path = addons.get_module_resource(os.path.join('l10n_ch','report',inner_path)) + path = addons.get_module_resource(os.path.join('l10n_ch', 'report', inner_path)) return path def bvr_absolute_path(self) : """Will get the ocrb police absolute path""" - path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr1.jpg')) + path = addons.get_module_resource(os.path.join('l10n_ch', 'report', 'bvr1.jpg')) return path def headheight(self): @@ -76,7 +84,7 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse): def comma_me(self, amount): """Fast swiss number formatting""" - if type(amount) is float : + if isinstance(amount, float): amount = str('%.2f'%amount) else : amount = str(amount) @@ -88,14 +96,15 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse): return self.comma_me(new) def _space(self, nbr, nbrspc=5): - """Spaces * 5""" - res = '' - for i in range(len(nbr)): - res = res + nbr[i] - if not (i-1) % nbrspc: - res = res + ' ' - return res + """Spaces * 5. + Example: + >>> self._space('123456789012345') + '12 34567 89012 345' + """ + return ''.join([' '[(i - 2) % nbrspc:] + c for i, c in enumerate(nbr)]) + + def _get_ref(self, inv): """Retrieve ESR/BVR reference form invoice in order to print it""" res = '' @@ -106,39 +115,77 @@ class l10n_ch_report_webkit_html(report_sxw.rml_parse): invoice_number = self._compile_get_ref.sub('', inv.number) return mod10r(res + invoice_number.rjust(26-len(res), '0')) - def _check(self, invoices): + def _check(self, invoice_ids): """Check if the invoice is ready to be printed""" + if not invoice_ids: + invoice_ids = [] cursor = self.cr pool = self.pool invoice_obj = pool.get('account.invoice') - ids = [x.id for x in invoices] + ids = invoice_ids for invoice in invoice_obj.browse(cursor, self.uid, ids): if not invoice.partner_bank_id: - raise wizard.except_wizard(_('UserError'), + raise except_osv(_('UserError'), _('No bank specified on invoice:\n' + \ invoice_obj.name_get(cursor, self.uid, [invoice.id], context={})[0][1])) if not self._compile_check_bvr.match( invoice.partner_bank_id.post_number or ''): - raise wizard.except_wizard(_('UserError'), - _("Your bank BVR number should be of the form 0X-XXX-X! " + - 'Please check your company ' + - 'information for the invoice:\n' + - invoice_obj.name_get(cursor, self.uid, [invoice.id], - context={})[0][1])) + raise except_osv(_('UserError'), + _('Your bank BVR number should be of the form 0X-XXX-X! ' + + 'Please check your company ' + + 'information for the invoice:\n' + + invoice_obj.name_get(cursor, self.uid, [invoice.id], + context={})[0][1])) if invoice.partner_bank_id.bvr_adherent_num \ and not self._compile_check_bvr_add_num.match( invoice.partner_bank_id.bvr_adherent_num): - raise wizard.except_wizard('UserError', - 'Your bank BVR adherent number must contain exactly seven' + - 'digits!\nPlease check your company ' + - 'information for the invoice:\n' + - invoice_obj.name_get(cursor, self.uid, [invoice.id], - context={})[0][1]) - return "" + raise except_osv(_('UserError'), + _('Your bank BVR adherent number must contain exactly seven' + + 'digits!\nPlease check your company ' + + 'information for the invoice:\n' + + invoice_obj.name_get(cursor, self.uid, [invoice.id], + context={})[0][1])) + return '' class BVRWebKitParser(webkit_report.WebKitParser): + def setLang(self, lang): + if not lang: + lang = 'en_US' + self.localcontext['lang'] = lang + + def formatLang(self, value, digits=None, date=False, date_time=False, grouping=True, monetary=False): + """format using the know cursor, language from localcontext""" + if digits is None: + digits = self.parser_instance.get_digits(value) + if isinstance(value, (str, unicode)) and not value: + return '' + pool_lang = self.pool.get('res.lang') + lang = self.localcontext['lang'] + + lang_ids = pool_lang.search(self.parser_instance.cr, self.parser_instance.uid, [('code','=',lang)])[0] + lang_obj = pool_lang.browse(self.parser_instance.cr, self.parser_instance.uid, lang_ids) + + if date or date_time: + if not str(value): + return '' + + date_format = lang_obj.date_format + parse_format = '%Y-%m-%d' + if date_time: + value=value.split('.')[0] + date_format = date_format + " " + lang_obj.time_format + parse_format = '%Y-%m-%d %H:%M:%S' + if not isinstance(value, time.struct_time): + return time.strftime(date_format, time.strptime(value, parse_format)) + + else: + date = datetime(*value.timetuple()[:6]) + return date.strftime(date_format) + + return lang_obj.format('%.' + str(digits) + 'f', value, grouping=grouping, monetary=monetary) + def create_single_pdf(self, cursor, uid, ids, data, report_xml, context=None): """generate the PDF""" self.parser_instance = self.parser( @@ -190,74 +237,81 @@ class BVRWebKitParser(webkit_report.WebKitParser): <body style="border:0; margin: 0;" onload="subst()"> </body> </html>""" + self.parser_instance.localcontext.update({'setLang':self.setLang}) + self.parser_instance.localcontext.update({'formatLang':self.formatLang}) css = report_xml.webkit_header.css if not css : css = '' user = self.pool.get('res.users').browse(cursor, uid, uid) - company= user.company_id + company = user.company_id parse_template = template #default_filters=['unicode', 'entity'] can be used to set global filter - body_mako_tpl = Template(parse_template ,input_encoding='utf-8') + body_mako_tpl = Template(parse_template ,input_encoding='utf-8', output_encoding='utf-8') #BVR specific bvr_path = addons.get_module_resource(os.path.join('l10n_ch','report','bvr.mako')) - body_bvr_tpl = Template(file(bvr_path).read(), input_encoding='utf-8') + body_bvr_tpl = Template(file(bvr_path).read(), input_encoding='utf-8', output_encoding='utf-8') helper = report_helper.WebKitHelper(cursor, uid, report_xml.id, context) ##BVR Specific htmls = [] for obj in objs : - self.parser_instance.localcontext['objects'] = [obj] if not company.bvr_only: - html = body_mako_tpl.render( - helper=helper, - css=css, - _=self.translate_call, - **self.parser_instance.localcontext - ) + try: + html = body_mako_tpl.render( + helper=helper, + css=css, + _=self.translate_call, + **self.parser_instance.localcontext + ) + except Exception, e: + raise Exception(exceptions.text_error_template().render()) htmls.append(html) if not company.invoice_only: - bvr = body_bvr_tpl.render( - helper=helper, - css=css, - _=self.translate_call, - **self.parser_instance.localcontext - ) - htmls.append(bvr) - head_mako_tpl = Template(header, input_encoding='utf-8') - head = head_mako_tpl.render( - company=company, - time=time, - helper=helper, - css=css, - formatLang=self.parser_instance.formatLang, - setLang=self.parser_instance.setLang, - _debug=False - ) - foot = False - if footer and company.invoice_only : - foot_mako_tpl = Template(footer ,input_encoding='utf-8') - foot = foot_mako_tpl.render( - company=company, - time=time, + try: + bvr = body_bvr_tpl.render( helper=helper, - css=css, - formatLang=self.parser_instance.formatLang, - setLang=self.parser_instance.setLang, + css=css, _=self.translate_call, - + **self.parser_instance.localcontext ) - if report_xml.webkit_debug : - deb = head_mako_tpl.render( - company=company, - time=time, + except Exception, e: + raise Exception(exceptions.text_error_template().render()) + htmls.append(bvr) + head_mako_tpl = Template(header, input_encoding='utf-8', output_encoding='utf-8') + try: + head = head_mako_tpl.render( helper=helper, - css=css, - _debug=html, - formatLang=self.parser_instance.formatLang, - setLang=self.parser_instance.setLang, + css=css, + _debug=False, _=self.translate_call, - ) + **self.parser_instance.localcontext + ) + except Exception, e: + raise Exception(exceptions.text_error_template().render()) + foot = False + if footer and company.invoice_only : + foot_mako_tpl = Template(footer, input_encoding='utf-8', output_encoding='utf-8') + try: + foot = foot_mako_tpl.render( + helper=helper, + css=css, + _=self.translate_call, + **self.parser_instance.localcontext + ) + except Exception, e: + raise Exception(exceptions.text_error_template().render()) + if report_xml.webkit_debug : + try: + deb = head_mako_tpl.render( + helper=helper, + css=css, + _debug=html, + _=self.translate_call, + **self.parser_instance.localcontext + ) + except Exception, e: + raise Exception(exceptions.text_error_template().render()) return (deb, 'html') bin = self.get_lib(cursor, uid, company.id) pdf = self.generate_pdf(bin, report_xml, head, foot, htmls) diff --git a/addons/l10n_ch/report/report_webkit_html_view.xml b/addons/l10n_ch/report/report_webkit_html_view.xml index c03db709162..c1638ff99db 100644 --- a/addons/l10n_ch/report/report_webkit_html_view.xml +++ b/addons/l10n_ch/report/report_webkit_html_view.xml @@ -5,55 +5,57 @@ <field name="orientation">Portrait</field> <field name="format">A4</field> <field name="html"><![CDATA[<html> - <head> - <script> - function subst() { - var vars={}; - var x=document.location.search.substring(1).split('&'); - for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);} - var x=['frompage','topage','page','webpage','section','subsection','subsubsection']; - for(var i in x) { - var y = document.getElementsByClassName(x[i]); - for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]]; - } - } - </script> - <style type="text/css"> - ${css} - </style> - </head> - <body style="border:0; margin: 0;" onload="subst()"> - <table class="header" style="border-bottom: 0px solid black; width: 100%;padding-left:20mm"> - <tr style="vertical-align:top" > - <td>${helper.embed_logo_by_name('camptocamp_logo', width=64)}</td> - <td style="text-align:right"> - <table style="border-top: 0px solid black; width: 100%;height:100%"> - <tr style="vertical-align:top"> - <td style="text-align:right;font-size:12" width="80%"><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td> - </tr> - </table> </td> - </tr> - <tr> - <td><br/></td> - <td style="text-align:right"> </td> - </tr> - <tr> - <td>${company.partner_id.name |entity}</td> - <td/> - </tr> - <tr> - <td >${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td> - <td/> - </tr> - <tr> - <td>Phone: ${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td> - <td/> - </tr> - <tr> - <td>Mail: <a href="mailto:${company.partner_id.address and company.partner_id.address[0].email or ''|entity}">${company.partner_id.address and company.partner_id.address[0].email or ''|entity}</a><br/></td> - </tr> - </table> ${_debug or ''} <br/></body> - </html>]]> + <head> + <script> + function subst() { + var vars={}; + var x=document.location.search.substring(1).split('&'); + for(var i in x) {var z=x[i].split('=',2);vars[z[0]] = unescape(z[1]);} + var x=['frompage','topage','page','webpage','section','subsection','subsubsection']; + for(var i in x) { + var y = document.getElementsByClassName(x[i]); + for(var j=0; j<y.length; ++j) y[j].textContent = vars[x[i]]; + } + } + </script> + <style type="text/css"> + ${css} + </style> + </head> + <!-- <tr style="vertical-align:top"> + <td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td> + </tr> style="text-align:right"--> + <body style="border:0; margin: 0;" onload="subst()"> + <table style="border-bottom: 1px solid black; width: 90%;padding-left:0mm;margin-left:5%"> + <tr style="vertical-align:top" > + <td>${helper.embed_logo_by_name('camptocamp_logo', width=128)}</td> + <td > + + <table style="border-top: 0px solid black; width: 100%;height:100%;;padding-left:4mm; margin-left:2%" class="dest_address"> + <tr> + <td><b>${company.partner_id.name |entity}</b></td><td></td><td></td> + </tr> + <tr> + <td>${company.partner_id.address and company.partner_id.address[0].street or ''|entity}</td><td>${_("phone")}:</td><td>${company.partner_id.address and company.partner_id.address[0].phone or ''|entity} </td><td></td> + </tr> + <tr> + <td>${company.partner_id.address and company.partner_id.address[0].street2 or ''|entity}</td><td>${_('Fax')}:</td><td>${company.partner_id.address and company.partner_id.address[0].fax or ''|entity} </td><td></td> + </tr> + <tr> + <td>${company.partner_id.address and company.partner_id.address[0].zip or ''|entity} ${company.partner_id.address and company.partner_id.address[0].city or ''|entity}</td><td>${_('e-mail')}:</td><td><a href="mailto:${company.partner_id.address and company.partner_id.address[0].email or ''|entity}">${company.partner_id.address and company.partner_id.address[0].email or ''|entity}</a></td><td></td> + </tr> + <tr> + <td>${company.partner_id.address and company.partner_id.address[0].country_id.name or ''|entity}</td><td></td><td style="text-align:right;font-size:12" ><span class="page"/></td><td style="text-align:left;font-size:12;"> / <span class="topage"/></td> + </tr> + </table> + </td> + </tr> + </table> + <br/> + ${_debug or ''} + <br/> + </body> +</html>]]> </field> <field eval="45" name="margin_top"/> <field eval="0.01" name="margin_bottom"/> diff --git a/addons/l10n_ch/sterchi_chart/account.xml b/addons/l10n_ch/sterchi_chart/account.xml index 8c907653b4a..f642b800493 100644 --- a/addons/l10n_ch/sterchi_chart/account.xml +++ b/addons/l10n_ch/sterchi_chart/account.xml @@ -1,40 +1,65 @@ <?xml version="1.0" encoding="UTF-8"?> <openerp> <data noupdate="True"> - <record id="account_type_view" model="account.account.type"> - <field name="name">Autre : Vue</field> + <record id="account_type_view" model="account.account.type"> + <field name="name">Autre : Vue</field> + <field name="code">view</field> + <field name="close_method">none</field> + <field name="report_type">none</field> + </record> + <record id="account_type_view_assets" model="account.account.type"> + <field name="name">Autre: Vue Actifs</field> <field name="code">view</field> <field name="close_method">none</field> + <field name="report_type">asset</field> + </record> + <record id="account_type_view_liability" model="account.account.type"> + <field name="name">Autre: Vue Passifs</field> + <field name="code">view</field> + <field name="close_method">none</field> + <field name="report_type">liability</field> + </record> + <record id="account_type_view_expense" model="account.account.type"> + <field name="name">Autre: Vue Charges</field> + <field name="code">view</field> + <field name="close_method">none</field> + <field name="report_type">expense</field> + </record> + <record id="account_type_view_income" model="account.account.type"> + <field name="name">Autre: Vue Produits</field> + <field name="code">view</field> + <field name="close_method">none</field> + <field name="report_type">income</field> </record> <record id="account_type_cash" model="account.account.type"> <field name="name">Bilan : Liquidites et titres</field> <field name="code">cash</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_adjusting_asset"> <field name="name">Bilan : Actif de regularisation</field> <field name="code">adjusting_asset</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_equity"> <field name="name">Bilan : Capitaux propres</field> <field name="code">equity</field> <field name="close_method">balance</field> - <field name="report_type">liability</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_income"> <field name="name">PP : Chiffre d'affaires</field> <field name="code">income</field> <field name="close_method">none</field> - <field name="report_type">income</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_adj_liability"> <field name="name">Bilan : Passifs de regularisation</field> <field name="code">adj_liability</field> <field name="close_method">balance</field> - <field name="report_type">liability</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_closing"> <field name="name">Autre : Cloture</field> @@ -45,123 +70,123 @@ <field name="name">PP : Amortissement</field> <field name="code">depreciation</field> <field name="close_method">none</field> - <field name="report_type">expense</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_financial_result"> <field name="name">PP : Resultat financier</field> <field name="code">financial_result</field> <field name="close_method">none</field> - <field name="report_type">income</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_financial_asset"> <field name="name">Bilan : Immobilisations financieres</field> <field name="code">financial_asset</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_building_asset"> <field name="name">Bilan : Immo corporelles immobilieres</field> <field name="code">building_asset</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_non_ope_asset"> <field name="name">Bilan : Actifs hors exploitation</field> <field name="code">non_ope_asset</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_other_ope_exp"> <field name="name">PP : Autres charges d'exploitation</field> <field name="code">other_ope_expense</field> <field name="close_method">none</field> - <field name="report_type">expense</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_non_ope_debts"> <field name="name">Bilan : Dettes hors exploitation</field> <field name="code">non_ope_debts</field> <field name="close_method">balance</field> - <field name="report_type">liability</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_fixed_asset"> <field name="name">Bilan : Immo corporelles mobilieres</field> <field name="code">fixed_asset</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_intangible_asset"> <field name="name">Bilan : Immo incorporelles</field> <field name="code">intangible_asset</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_inventory"> <field name="name">Bilan : Stocks</field> <field name="code">inventory</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_lt_liability"> <field name="name">Bilan : Dettes à LT</field> <field name="code">lt_liability</field> <field name="close_method">balance</field> - <field name="report_type">liability</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_non_ope_result"> <field name="name">PP : Resultat activites annexes</field> <field name="code">non_oper_result</field> <field name="close_method">none</field> - <field name="report_type">income</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_other_payable"> <field name="name">Bilan : Autres creanciers à CT</field> <field name="code">other_payable</field> <field name="close_method">balance</field> - <field name="report_type">liability</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_other_receivable"> <field name="name">Bilan : Autres créances</field> <field name="code">other_receivable</field> <field name="close_method">balance</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_personnal_exp"> <field name="name">PP : Charge de personnel</field> <field name="code">personnal_exp</field> <field name="close_method">none</field> - <field name="report_type">expense</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_prov_reserve"> <field name="name">Bilan : Provisions et reserves</field> <field name="code">provision_reserve</field> <field name="close_method">balance</field> - <field name="report_type">liability</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_purchase"> <field name="name">PP : Achat de marchandise</field> <field name="code">purchase</field> <field name="close_method">none</field> - <field name="report_type">expense</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_report_result"> <field name="name">Bilan : Resultat reporte</field> <field name="code">report_result</field> <field name="close_method">balance</field> - <field name="report_type">liability</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_receivable"> <field name="name">Bilan : Debiteurs</field> <field name="code">receivable</field> <field name="partner_account">True</field> <field name="close_method">unreconciled</field> - <field name="report_type">asset</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_payable"> <field name="name">Bilan : Fournisseurs</field> <field name="code">payable</field> <field name="partner_account">True</field> <field name="close_method">unreconciled</field> - <field name="report_type">liability</field> + <field name="report_type">none</field> </record> <record model="account.account.type" id="account_type_consolidation"> <field name="name">Autre : Consolidation</field> @@ -184,7 +209,7 @@ <field name="type">view</field> <field name="name">Bilan</field> <field name="code">1_2</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_minimal_0" name="parent_id"/> </record> @@ -192,7 +217,7 @@ <field name="type">view</field> <field name="name">Actif</field> <field name="code">1</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_1_2" name="parent_id"/> </record> @@ -200,7 +225,7 @@ <field name="type">view</field> <field name="name">Actifs circulants</field> <field name="code">10</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_1" name="parent_id"/> </record> @@ -208,7 +233,7 @@ <field name="type">view</field> <field name="name">Liquidités et titres</field> <field name="code">100</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_10" name="parent_id"/> </record> @@ -216,7 +241,7 @@ <field name="type">view</field> <field name="name">Caisse</field> <field name="code">100.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_100" name="parent_id"/> </record> @@ -272,7 +297,7 @@ <field name="type">view</field> <field name="name">Poste (CCP)</field> <field name="code">101.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_100" name="parent_id"/> </record> @@ -296,7 +321,7 @@ <field name="type">view</field> <field name="name">Banques</field> <field name="code">102.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_100" name="parent_id"/> </record> @@ -360,7 +385,7 @@ <field name="type">view</field> <field name="name">Chèques, effets à recevoir</field> <field name="code">104.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_100" name="parent_id"/> </record> @@ -392,7 +417,7 @@ <field name="type">view</field> <field name="name">Avoirs à court terme</field> <field name="code">105.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_100" name="parent_id"/> </record> @@ -432,7 +457,7 @@ <field name="type">view</field> <field name="name">Titres réalisables à court terme</field> <field name="code">106.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_100" name="parent_id"/> </record> @@ -480,7 +505,7 @@ <field name="type">view</field> <field name="name">Autres placements à court terme</field> <field name="code">107.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_100" name="parent_id"/> </record> @@ -520,7 +545,7 @@ <field name="type">view</field> <field name="name">Compte d'attente en monnaie</field> <field name="code">109.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_100" name="parent_id"/> </record> @@ -536,16 +561,15 @@ <field name="type">view</field> <field name="name">Créances</field> <field name="code">110</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_10" name="parent_id"/> </record> <record id="ch_110_0" model="account.account.template"> <field name="type">view</field> - <field name="name">Créances résultant de vente et de prestations de services - (débiteurs-clients)</field> + <field name="name">Créances résultant de vente et de prestations de services (débiteurs-clients)</field> <field name="code">110.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_110" name="parent_id"/> </record> @@ -553,7 +577,7 @@ <field name="type">view</field> <field name="name">Créances résultant prestations envers des tiers</field> <field name="code">110.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_110_0" name="parent_id"/> </record> @@ -587,7 +611,7 @@ <field name="type">view</field> <field name="name">Créances résultant prestations envers des sociétés du groupe</field> <field name="code">111.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_110_0" name="parent_id"/> </record> @@ -621,7 +645,7 @@ <field name="type">view</field> <field name="name">Créances résultant prestations envers actionnaires</field> <field name="code">112.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_110_0" name="parent_id"/> </record> @@ -655,7 +679,7 @@ <field name="type">view</field> <field name="name">Autres créances à court terme</field> <field name="code">114.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_110" name="parent_id"/> </record> @@ -663,7 +687,7 @@ <field name="type">view</field> <field name="name">Autres créances à court terme envers des tiers</field> <field name="code">114.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_114_0" name="parent_id"/> </record> @@ -703,7 +727,7 @@ <field name="type">view</field> <field name="name">Autres créances à court terme envers des sociétés du groupe</field> <field name="code">115.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_114_0" name="parent_id"/> </record> @@ -735,7 +759,7 @@ <field name="type">view</field> <field name="name">Autres créances à court terme envers actionnaires</field> <field name="code">116.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_114_0" name="parent_id"/> </record> @@ -767,7 +791,7 @@ <field name="type">view</field> <field name="name">Créances envers des institutions publiques</field> <field name="code">117.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_114_0" name="parent_id"/> </record> @@ -815,7 +839,7 @@ <field name="type">view</field> <field name="name">Capital-actions non libéré</field> <field name="code">118.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_114_0" name="parent_id"/> </record> @@ -831,7 +855,7 @@ <field name="type">view</field> <field name="name">Autres créances à court terme</field> <field name="code">119.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_114_0" name="parent_id"/> </record> @@ -887,7 +911,7 @@ <field name="type">view</field> <field name="name">Stocks et travaux en cours</field> <field name="code">120</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_10" name="parent_id"/> </record> @@ -895,7 +919,7 @@ <field name="type">view</field> <field name="name">Stocks de marchandises</field> <field name="code">120.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -935,7 +959,7 @@ <field name="type">view</field> <field name="name">Stocks de matières premières</field> <field name="code">121.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -975,7 +999,7 @@ <field name="type">view</field> <field name="name">Stocks d'autres approvisionnements</field> <field name="code">122.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -1015,7 +1039,7 @@ <field name="type">view</field> <field name="name">Stocks de matières auxiliaires et de fournitures</field> <field name="code">123.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -1063,7 +1087,7 @@ <field name="type">view</field> <field name="name">Stocks obligatoires</field> <field name="code">124.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -1095,7 +1119,7 @@ <field name="type">view</field> <field name="name">Marchandises en consignation</field> <field name="code">125.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -1111,7 +1135,7 @@ <field name="type">view</field> <field name="name">Stocks de produits finis</field> <field name="code">126.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -1135,7 +1159,7 @@ <field name="type">view</field> <field name="name">Stocks de produits semi-ouvrés</field> <field name="code">127.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -1159,7 +1183,7 @@ <field name="type">view</field> <field name="name">Stocks de produits en cours</field> <field name="code">128.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_120" name="parent_id"/> </record> @@ -1183,7 +1207,7 @@ <field name="type">view</field> <field name="name">Actifs de régularisation</field> <field name="code">130</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_10" name="parent_id"/> </record> @@ -1191,7 +1215,7 @@ <field name="type">view</field> <field name="name">Actifs de régularisation (Actifs transitoires)</field> <field name="code">130.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_130" name="parent_id"/> </record> @@ -1215,7 +1239,7 @@ <field name="type">view</field> <field name="name">Actifs immobilisés</field> <field name="code">14</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_1" name="parent_id"/> </record> @@ -1223,7 +1247,7 @@ <field name="type">view</field> <field name="name">Immobilisations financières</field> <field name="code">140</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_14" name="parent_id"/> </record> @@ -1231,7 +1255,7 @@ <field name="type">view</field> <field name="name">Titres à long terme</field> <field name="code">140.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_140" name="parent_id"/> </record> @@ -1287,7 +1311,7 @@ <field name="type">view</field> <field name="name">Autres placements à long terme</field> <field name="code">141.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_140" name="parent_id"/> </record> @@ -1319,7 +1343,7 @@ <field name="type">view</field> <field name="name">Participations</field> <field name="code">142.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_140" name="parent_id"/> </record> @@ -1359,7 +1383,7 @@ <field name="type">view</field> <field name="name">Créances à long terme envers des tiers</field> <field name="code">144.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_140" name="parent_id"/> </record> @@ -1391,7 +1415,7 @@ <field name="type">view</field> <field name="name">Créances à long terme envers des sociétés du groupe</field> <field name="code">145.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_140" name="parent_id"/> </record> @@ -1423,7 +1447,7 @@ <field name="type">view</field> <field name="name">Créances à long terme envers des actionnaires</field> <field name="code">146.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_140" name="parent_id"/> </record> @@ -1455,7 +1479,7 @@ <field name="type">view</field> <field name="name">Actions propres</field> <field name="code">149.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_140" name="parent_id"/> </record> @@ -1479,7 +1503,7 @@ <field name="type">view</field> <field name="name">Immobilisation corporelles meubles</field> <field name="code">150</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_14" name="parent_id"/> </record> @@ -1487,7 +1511,7 @@ <field name="type">view</field> <field name="name">Machines et appareils destinés à la production</field> <field name="code">150.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_150" name="parent_id"/> </record> @@ -1527,7 +1551,7 @@ <field name="type">view</field> <field name="name">Mobilier et installations</field> <field name="code">151.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_150" name="parent_id"/> </record> @@ -1583,7 +1607,7 @@ <field name="type">view</field> <field name="name">Machines de bureau, informatiques, communication</field> <field name="code">152.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_150" name="parent_id"/> </record> @@ -1663,7 +1687,7 @@ <field name="type">view</field> <field name="name">Véhicules</field> <field name="code">153.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_150" name="parent_id"/> </record> @@ -1719,7 +1743,7 @@ <field name="type">view</field> <field name="name">Instruments et outillage</field> <field name="code">154.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_150" name="parent_id"/> </record> @@ -1751,7 +1775,7 @@ <field name="type">view</field> <field name="name">Installations de stockage</field> <field name="code">155.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_150" name="parent_id"/> </record> @@ -1791,7 +1815,7 @@ <field name="type">view</field> <field name="name">Equipements et installations</field> <field name="code">157.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_150" name="parent_id"/> </record> @@ -1863,7 +1887,7 @@ <field name="type">view</field> <field name="name">Autres immobilisations corporelles meubles</field> <field name="code">159.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_150" name="parent_id"/> </record> @@ -1903,7 +1927,7 @@ <field name="type">view</field> <field name="name">Immobilisation corporelles immeubles</field> <field name="code">160</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_14" name="parent_id"/> </record> @@ -1911,7 +1935,7 @@ <field name="type">view</field> <field name="name">Bâtiments d'exploitation</field> <field name="code">160.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_160" name="parent_id"/> </record> @@ -1951,7 +1975,7 @@ <field name="type">view</field> <field name="name">Usines</field> <field name="code">161.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_160" name="parent_id"/> </record> @@ -1991,7 +2015,7 @@ <field name="type">view</field> <field name="name">Ateliers</field> <field name="code">162.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_160" name="parent_id"/> </record> @@ -2031,7 +2055,7 @@ <field name="type">view</field> <field name="name">Entrepôts</field> <field name="code">163.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_160" name="parent_id"/> </record> @@ -2071,7 +2095,7 @@ <field name="type">view</field> <field name="name">Bâtiments d'exposition et de vente</field> <field name="code">164.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_160" name="parent_id"/> </record> @@ -2119,7 +2143,7 @@ <field name="type">view</field> <field name="name">Bâtiments administratifs</field> <field name="code">165.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_160" name="parent_id"/> </record> @@ -2167,7 +2191,7 @@ <field name="type">view</field> <field name="name">Immeubles d'habitation</field> <field name="code">166.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_160" name="parent_id"/> </record> @@ -2215,7 +2239,7 @@ <field name="type">view</field> <field name="name">Immobilisations incorporelles</field> <field name="code">170</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_14" name="parent_id"/> </record> @@ -2223,7 +2247,7 @@ <field name="type">view</field> <field name="name">Brevets, know-how, recettes de fabrication</field> <field name="code">170.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_170" name="parent_id"/> </record> @@ -2263,7 +2287,7 @@ <field name="type">view</field> <field name="name">Marques commerciales, échantillons, modèles, plans</field> <field name="code">171.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_170" name="parent_id"/> </record> @@ -2311,7 +2335,7 @@ <field name="type">view</field> <field name="name">Droits de licences, concessions, etc.</field> <field name="code">172.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_170" name="parent_id"/> </record> @@ -2359,7 +2383,7 @@ <field name="type">view</field> <field name="name">Droits de propriétés, d'édition, conventionnels</field> <field name="code">173.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_170" name="parent_id"/> </record> @@ -2399,7 +2423,7 @@ <field name="type">view</field> <field name="name">Goodwill</field> <field name="code">177.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_170" name="parent_id"/> </record> @@ -2423,7 +2447,7 @@ <field name="type">view</field> <field name="name">Autres immobilisations incorporelles</field> <field name="code">179.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_170" name="parent_id"/> </record> @@ -2463,7 +2487,7 @@ <field name="type">view</field> <field name="name">Charges activées et comptes d'actif de corrections de valeur</field> <field name="code">18</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_1" name="parent_id"/> </record> @@ -2471,7 +2495,7 @@ <field name="type">view</field> <field name="name">Charges activées et comptes d'actif de corrections de valeur</field> <field name="code">180</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_18" name="parent_id"/> </record> @@ -2479,7 +2503,7 @@ <field name="type">view</field> <field name="name">Charges activées</field> <field name="code">180.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_180" name="parent_id"/> </record> @@ -2487,7 +2511,7 @@ <field name="type">view</field> <field name="name">Frais de fondation, augmentation de capital</field> <field name="code">180.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_180_0" name="parent_id"/> </record> @@ -2527,7 +2551,7 @@ <field name="type">view</field> <field name="name">Disagio s/emprunts et s/emprunts par obligations</field> <field name="code">181.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_180_0" name="parent_id"/> </record> @@ -2551,7 +2575,7 @@ <field name="type">view</field> <field name="name">Frais de recherche et de développement</field> <field name="code">182.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_180_0" name="parent_id"/> </record> @@ -2583,7 +2607,7 @@ <field name="type">view</field> <field name="name">Autres charges activées</field> <field name="code">184.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_180_0" name="parent_id"/> </record> @@ -2607,7 +2631,7 @@ <field name="type">view</field> <field name="name">Comptes d'actif de corrections de valeur</field> <field name="code">185.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_180" name="parent_id"/> </record> @@ -2615,7 +2639,7 @@ <field name="type">view</field> <field name="name">Capital-actions non libéré</field> <field name="code">185.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_185_0" name="parent_id"/> </record> @@ -2639,7 +2663,7 @@ <field name="type">view</field> <field name="name">Actifs hors exploitation</field> <field name="code">19</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_1" name="parent_id"/> </record> @@ -2647,7 +2671,7 @@ <field name="type">view</field> <field name="name">Actifs hors exploitation</field> <field name="code">190</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_19" name="parent_id"/> </record> @@ -2655,7 +2679,7 @@ <field name="type">view</field> <field name="name">Liquidités et titres</field> <field name="code">190.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2695,7 +2719,7 @@ <field name="type">view</field> <field name="name">Créances à court terme</field> <field name="code">191.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2719,7 +2743,7 @@ <field name="type">view</field> <field name="name">Stocks et travaux en cours</field> <field name="code">192.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2759,7 +2783,7 @@ <field name="type">view</field> <field name="name">Actifs de régularisation</field> <field name="code">193.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2775,7 +2799,7 @@ <field name="type">view</field> <field name="name">Immobilisations financières</field> <field name="code">194.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2807,7 +2831,7 @@ <field name="type">view</field> <field name="name">Immobilisations corporelles meubles</field> <field name="code">195.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2847,7 +2871,7 @@ <field name="type">view</field> <field name="name">Immobilisations corporelles immeubles</field> <field name="code">196.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2895,7 +2919,7 @@ <field name="type">view</field> <field name="name">Immobilisations incorporelles</field> <field name="code">197.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2943,7 +2967,7 @@ <field name="type">view</field> <field name="name">Charges activées</field> <field name="code">198.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_190" name="parent_id"/> </record> @@ -2967,7 +2991,7 @@ <field name="type">view</field> <field name="name">Passif</field> <field name="code">2</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_1_2" name="parent_id"/> </record> @@ -2975,7 +2999,7 @@ <field name="type">view</field> <field name="name">Dettes à court terme</field> <field name="code">20</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_2" name="parent_id"/> </record> @@ -2983,16 +3007,15 @@ <field name="type">view</field> <field name="name">Dettes à court terme résultant d'achats et prestations services</field> <field name="code">200</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_20" name="parent_id"/> </record> <record id="ch_200_0" model="account.account.template"> <field name="type">view</field> - <field name="name">Dettes à court terme résultant d'achats et prestations services - envers des tiers (fournisseurs)</field> + <field name="name">Dettes à court terme résultant d'achats et prestations services envers des tiers (fournisseurs)</field> <field name="code">200.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_200" name="parent_id"/> </record> @@ -3054,7 +3077,7 @@ <field name="type">view</field> <field name="name">Acomptes de clients</field> <field name="code">203.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_200" name="parent_id"/> </record> @@ -3071,7 +3094,7 @@ <field name="type">view</field> <field name="name">Dettes c/achats, prestations services stés groupe</field> <field name="code">205.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_200" name="parent_id"/> </record> @@ -3097,7 +3120,7 @@ <field name="type">view</field> <field name="name">Dettes c/achats, prestations services actionnaires</field> <field name="code">206.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_200" name="parent_id"/> </record> @@ -3123,7 +3146,7 @@ <field name="type">view</field> <field name="name">Dettes financières à court terme</field> <field name="code">210</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_20" name="parent_id"/> </record> @@ -3131,7 +3154,7 @@ <field name="type">view</field> <field name="name">Dettes bancaires à court terme</field> <field name="code">210.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_210" name="parent_id"/> </record> @@ -3147,7 +3170,7 @@ <field name="type">view</field> <field name="name">Dettes c/chèques postaux, sociétés de virement</field> <field name="code">211.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_210" name="parent_id"/> </record> @@ -3171,7 +3194,7 @@ <field name="type">view</field> <field name="name">Effets à payer</field> <field name="code">212.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_210" name="parent_id"/> </record> @@ -3195,7 +3218,7 @@ <field name="type">view</field> <field name="name">Autres dettes financières à court terme à tiers</field> <field name="code">214.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_210" name="parent_id"/> </record> @@ -3211,7 +3234,7 @@ <field name="type">view</field> <field name="name">Dettes financières à court terme stés du groupe</field> <field name="code">215.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_210" name="parent_id"/> </record> @@ -3235,7 +3258,7 @@ <field name="type">view</field> <field name="name">Dettes financières à court terme actionnaires</field> <field name="code">216.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_210" name="parent_id"/> </record> @@ -3259,7 +3282,7 @@ <field name="type">view</field> <field name="name">Dettes financières à court terme fonds prévoyance</field> <field name="code">217.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_210" name="parent_id"/> </record> @@ -3275,7 +3298,7 @@ <field name="type">view</field> <field name="name">Part à rembourser dettes financières à long terme</field> <field name="code">218.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_210" name="parent_id"/> </record> @@ -3299,7 +3322,7 @@ <field name="type">view</field> <field name="name">Autres dettes à court terme</field> <field name="code">220</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_20" name="parent_id"/> </record> @@ -3307,7 +3330,7 @@ <field name="type">view</field> <field name="name">Dettes envers des institutions publiques</field> <field name="code">220.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_220" name="parent_id"/> </record> @@ -3348,7 +3371,7 @@ <field name="type">view</field> <field name="name">Autres dettes à court terme envers des tiers</field> <field name="code">221.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_220" name="parent_id"/> </record> @@ -3372,7 +3395,7 @@ <field name="type">view</field> <field name="name">Dividendes et coupons d'obligations non encaissés</field> <field name="code">223.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_220" name="parent_id"/> </record> @@ -3404,7 +3427,7 @@ <field name="type">view</field> <field name="name">Obligations à rembourser</field> <field name="code">224.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_220" name="parent_id"/> </record> @@ -3420,7 +3443,7 @@ <field name="type">view</field> <field name="name">Autres dettes à court terme c/stés du groupe</field> <field name="code">225.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_220" name="parent_id"/> </record> @@ -3444,7 +3467,7 @@ <field name="type">view</field> <field name="name">Autres dettes à court terme envers actionnaires</field> <field name="code">226.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_220" name="parent_id"/> </record> @@ -3468,7 +3491,7 @@ <field name="type">view</field> <field name="name">Autres dettes à court terme c/fonds prévoyance</field> <field name="code">227.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_220" name="parent_id"/> </record> @@ -3484,7 +3507,7 @@ <field name="type">view</field> <field name="name">Résultat à verser</field> <field name="code">229.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_220" name="parent_id"/> </record> @@ -3500,7 +3523,7 @@ <field name="type">view</field> <field name="name">Passifs de régularisation, provisions court terme</field> <field name="code">230</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_20" name="parent_id"/> </record> @@ -3508,7 +3531,7 @@ <field name="type">view</field> <field name="name">Passifs de régularisation</field> <field name="code">230.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_230" name="parent_id"/> </record> @@ -3532,7 +3555,7 @@ <field name="type">view</field> <field name="name">Provisions à court terme c/ventes, services</field> <field name="code">233.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_230" name="parent_id"/> </record> @@ -3556,7 +3579,7 @@ <field name="type">view</field> <field name="name">Provisions à court terme pour impôts</field> <field name="code">234.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_230" name="parent_id"/> </record> @@ -3580,7 +3603,7 @@ <field name="type">view</field> <field name="name">Dettes à long terme</field> <field name="code">24</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_2" name="parent_id"/> </record> @@ -3588,7 +3611,7 @@ <field name="type">view</field> <field name="name">Dettes financière à long terme</field> <field name="code">240</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_24" name="parent_id"/> </record> @@ -3596,7 +3619,7 @@ <field name="type">view</field> <field name="name">Dettes bancaires à long terme</field> <field name="code">240.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_240" name="parent_id"/> </record> @@ -3612,7 +3635,7 @@ <field name="type">view</field> <field name="name">Dettes résultant d'opérations de crédit-bail</field> <field name="code">242.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_240" name="parent_id"/> </record> @@ -3628,7 +3651,7 @@ <field name="type">view</field> <field name="name">Dettes hypothécaires</field> <field name="code">244.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_240" name="parent_id"/> </record> @@ -3700,7 +3723,7 @@ <field name="type">view</field> <field name="name">Emprunts par obligations</field> <field name="code">246.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_240" name="parent_id"/> </record> @@ -3716,7 +3739,7 @@ <field name="type">view</field> <field name="name">Autres dettes à long terme</field> <field name="code">250</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_24" name="parent_id"/> </record> @@ -3724,7 +3747,7 @@ <field name="type">view</field> <field name="name">Emprunts à long terme à des tiers</field> <field name="code">250.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_250" name="parent_id"/> </record> @@ -3740,7 +3763,7 @@ <field name="type">view</field> <field name="name">Dettes à long terme envers des sociétés du groupe</field> <field name="code">255.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_250" name="parent_id"/> </record> @@ -3764,7 +3787,7 @@ <field name="type">view</field> <field name="name">Dettes à long terme envers des actionnaires</field> <field name="code">256.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_250" name="parent_id"/> </record> @@ -3788,7 +3811,7 @@ <field name="type">view</field> <field name="name">Dettes à long terme envers des institutions LPP</field> <field name="code">257.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_250" name="parent_id"/> </record> @@ -3812,7 +3835,7 @@ <field name="type">view</field> <field name="name">Provisions à long terme</field> <field name="code">260</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_24" name="parent_id"/> </record> @@ -3820,7 +3843,7 @@ <field name="type">view</field> <field name="name">Provisions réparation, assainissements, rénovation</field> <field name="code">260.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_260" name="parent_id"/> </record> @@ -3852,7 +3875,7 @@ <field name="type">view</field> <field name="name">Provisions pour recherche et développement</field> <field name="code">261.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_260" name="parent_id"/> </record> @@ -3876,7 +3899,7 @@ <field name="type">view</field> <field name="name">Provisions pour restructuration de l'entreprise</field> <field name="code">262.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_260" name="parent_id"/> </record> @@ -3892,7 +3915,7 @@ <field name="type">view</field> <field name="name">Provisions résultant de ventes/prestations service</field> <field name="code">263.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_260" name="parent_id"/> </record> @@ -3908,7 +3931,7 @@ <field name="type">view</field> <field name="name">Provisions pour impôts (long terme)</field> <field name="code">264.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_260" name="parent_id"/> </record> @@ -3924,7 +3947,7 @@ <field name="type">view</field> <field name="name">Provisions pour la protection de l'environnement</field> <field name="code">265.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_260" name="parent_id"/> </record> @@ -3940,7 +3963,7 @@ <field name="type">view</field> <field name="name">Provisions pour prestations en cas de vieillesse</field> <field name="code">267.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_260" name="parent_id"/> </record> @@ -3956,7 +3979,7 @@ <field name="type">view</field> <field name="name">Autres provisions</field> <field name="code">269.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_260" name="parent_id"/> </record> @@ -3972,7 +3995,7 @@ <field name="type">view</field> <field name="name">Dettes hors exploitation</field> <field name="code">27</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_2" name="parent_id"/> </record> @@ -3980,7 +4003,7 @@ <field name="type">view</field> <field name="name">Dettes hors exploitation</field> <field name="code">270</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_27" name="parent_id"/> </record> @@ -3988,7 +4011,7 @@ <field name="type">view</field> <field name="name">Dettes à court terme résultant prestations service</field> <field name="code">270.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_270" name="parent_id"/> </record> @@ -4004,7 +4027,7 @@ <field name="type">view</field> <field name="name">Dettes financières à court terme</field> <field name="code">271.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_270" name="parent_id"/> </record> @@ -4036,7 +4059,7 @@ <field name="type">view</field> <field name="name">Autres dettes à court terme</field> <field name="code">272.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_270" name="parent_id"/> </record> @@ -4052,7 +4075,7 @@ <field name="type">view</field> <field name="name">Passifs de régularisation, provisions court terme</field> <field name="code">273.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_270" name="parent_id"/> </record> @@ -4076,7 +4099,7 @@ <field name="type">view</field> <field name="name">Dettes financières à long terme</field> <field name="code">274.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_270" name="parent_id"/> </record> @@ -4100,7 +4123,7 @@ <field name="type">view</field> <field name="name">Autres dettes à long terme</field> <field name="code">275.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_270" name="parent_id"/> </record> @@ -4132,7 +4155,7 @@ <field name="type">view</field> <field name="name">Provisions</field> <field name="code">276.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_270" name="parent_id"/> </record> @@ -4148,7 +4171,7 @@ <field name="type">view</field> <field name="name">Capitaux propres</field> <field name="code">28</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_2" name="parent_id"/> </record> @@ -4156,7 +4179,7 @@ <field name="type">view</field> <field name="name">Capital/Privé</field> <field name="code">280</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_28" name="parent_id"/> </record> @@ -4164,7 +4187,7 @@ <field name="type">view</field> <field name="name">Capital</field> <field name="code">280.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_280" name="parent_id"/> </record> @@ -4172,7 +4195,7 @@ <field name="type">view</field> <field name="name">Capital propre des entreprises raison individuelle</field> <field name="code">280.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_280_0" name="parent_id"/> </record> @@ -4196,7 +4219,7 @@ <field name="type">view</field> <field name="name">Capital propre des sociétés de personnes</field> <field name="code">281.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_280_0" name="parent_id"/> </record> @@ -4228,7 +4251,7 @@ <field name="type">view</field> <field name="name">Capital social de la S.à.r.l</field> <field name="code">282.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_280_0" name="parent_id"/> </record> @@ -4244,7 +4267,7 @@ <field name="type">view</field> <field name="name">Capital de la société coopérative</field> <field name="code">283.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_280_0" name="parent_id"/> </record> @@ -4260,7 +4283,7 @@ <field name="type">view</field> <field name="name">Capital-actions et participation</field> <field name="code">284.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_280_0" name="parent_id"/> </record> @@ -4284,7 +4307,7 @@ <field name="type">view</field> <field name="name">Privé</field> <field name="code">285.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_280" name="parent_id"/> </record> @@ -4292,7 +4315,7 @@ <field name="type">view</field> <field name="name">Compte privé</field> <field name="code">285.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_285_0" name="parent_id"/> </record> @@ -4356,7 +4379,7 @@ <field name="type">view</field> <field name="name">Comptes pour immeubles et biens-fonds privés</field> <field name="code">288.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_285_0" name="parent_id"/> </record> @@ -4380,7 +4403,7 @@ <field name="type">view</field> <field name="name">Réserves, Bénéfice/Perte résultant du bilan</field> <field name="code">290</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_28" name="parent_id"/> </record> @@ -4388,7 +4411,7 @@ <field name="type">view</field> <field name="name">Réserves</field> <field name="code">290.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_290" name="parent_id"/> </record> @@ -4396,7 +4419,7 @@ <field name="type">view</field> <field name="name">Réserves légales</field> <field name="code">290.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_290_0" name="parent_id"/> </record> @@ -4436,7 +4459,7 @@ <field name="type">view</field> <field name="name">Autres réserves</field> <field name="code">291.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_290_0" name="parent_id"/> </record> @@ -4492,7 +4515,7 @@ <field name="type">view</field> <field name="name">Bénéfice/Perte résultant du bilan</field> <field name="code">299.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_290" name="parent_id"/> </record> @@ -4500,7 +4523,7 @@ <field name="type">view</field> <field name="name">Bénéfice/Perte résultant du bilan</field> <field name="code">299.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_liability"/> <field name="note"/> <field ref="ch_299_0" name="parent_id"/> </record> @@ -4524,7 +4547,7 @@ <field name="type">view</field> <field name="name">Compte de résultat</field> <field name="code">3_9</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_minimal_0" name="parent_id"/> </record> @@ -4532,7 +4555,7 @@ <field name="type">view</field> <field name="name">Chiffre d'affaires ventes, prestations services</field> <field name="code">3</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3_9" name="parent_id"/> </record> @@ -4540,7 +4563,7 @@ <field name="type">view</field> <field name="name">Chiffre d'affaires brut de la production vendue</field> <field name="code">30</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3" name="parent_id"/> </record> @@ -4548,7 +4571,7 @@ <field name="type">view</field> <field name="name">Caf brut de la production vendue secteur A</field> <field name="code">300</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_30" name="parent_id"/> </record> @@ -4596,7 +4619,7 @@ <field name="type">view</field> <field name="name">Caf brut de la production vendue secteur B</field> <field name="code">301</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_30" name="parent_id"/> </record> @@ -4628,7 +4651,7 @@ <field name="type">view</field> <field name="name">Caf brut de la production vendue secteur C</field> <field name="code">302</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_30" name="parent_id"/> </record> @@ -4676,7 +4699,7 @@ <field name="type">view</field> <field name="name">Caf brut de la production livrée à des stés groupe</field> <field name="code">305</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_30" name="parent_id"/> </record> @@ -4692,7 +4715,7 @@ <field name="type">view</field> <field name="name">Variations des stocks de produits en cours/finis</field> <field name="code">308</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_30" name="parent_id"/> </record> @@ -4708,7 +4731,7 @@ <field name="type">view</field> <field name="name">Déductions sur le caf de la production vendue</field> <field name="code">309</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_30" name="parent_id"/> </record> @@ -4780,7 +4803,7 @@ <field name="type">view</field> <field name="name">Ventes de marchandises</field> <field name="code">32</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3" name="parent_id"/> </record> @@ -4788,7 +4811,7 @@ <field name="type">view</field> <field name="name">Ventes brutes de marchandises secteur A</field> <field name="code">320</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_32" name="parent_id"/> </record> @@ -4820,7 +4843,7 @@ <field name="type">view</field> <field name="name">Ventes brutes de marchandises secteur B</field> <field name="code">321</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_32" name="parent_id"/> </record> @@ -4852,7 +4875,7 @@ <field name="type">view</field> <field name="name">Ventes brutes de marchandises secteur C</field> <field name="code">322</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_32" name="parent_id"/> </record> @@ -4900,7 +4923,7 @@ <field name="type">view</field> <field name="name">Ventes brutes de marchandises stés groupe</field> <field name="code">325</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_32" name="parent_id"/> </record> @@ -4916,7 +4939,7 @@ <field name="type">view</field> <field name="name">Déductions sur les ventes de marchandises</field> <field name="code">329</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_32" name="parent_id"/> </record> @@ -4988,7 +5011,7 @@ <field name="type">view</field> <field name="name">Ventes de prestations de services</field> <field name="code">34</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3" name="parent_id"/> </record> @@ -4996,7 +5019,7 @@ <field name="type">view</field> <field name="name">Ventes brutes de prestations de service secteur A</field> <field name="code">340</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_34" name="parent_id"/> </record> @@ -5036,7 +5059,7 @@ <field name="type">view</field> <field name="name">Ventes brutes de prestations de services secteur B</field> <field name="code">341</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_34" name="parent_id"/> </record> @@ -5060,7 +5083,7 @@ <field name="type">view</field> <field name="name">Ventes brutes prestations de services du secteur C</field> <field name="code">342</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_34" name="parent_id"/> </record> @@ -5108,7 +5131,7 @@ <field name="type">view</field> <field name="name">Ventes brutes prestations services à stés groupe</field> <field name="code">345</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_34" name="parent_id"/> </record> @@ -5124,7 +5147,7 @@ <field name="type">view</field> <field name="name">Déductions s/ventes prestations de services</field> <field name="code">349</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_34" name="parent_id"/> </record> @@ -5196,7 +5219,7 @@ <field name="type">view</field> <field name="name">Autres produits</field> <field name="code">36</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3" name="parent_id"/> </record> @@ -5204,7 +5227,7 @@ <field name="type">view</field> <field name="name">Autres produits c/ventes et prestations services</field> <field name="code">360</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_36" name="parent_id"/> </record> @@ -5260,7 +5283,7 @@ <field name="type">view</field> <field name="name">Produits des licences, des brevets, etc.</field> <field name="code">361</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_36" name="parent_id"/> </record> @@ -5300,7 +5323,7 @@ <field name="type">view</field> <field name="name">Autres produits prestations services stés groupe</field> <field name="code">365</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_36" name="parent_id"/> </record> @@ -5316,7 +5339,7 @@ <field name="type">view</field> <field name="name">Produits c/mise à disposition du personnel</field> <field name="code">367</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_36" name="parent_id"/> </record> @@ -5332,7 +5355,7 @@ <field name="type">view</field> <field name="name">Autres produits c/ventes et prestations services</field> <field name="code">368</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_36" name="parent_id"/> </record> @@ -5356,7 +5379,7 @@ <field name="type">view</field> <field name="name">Déductions s/les autres produits</field> <field name="code">369</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_36" name="parent_id"/> </record> @@ -5380,7 +5403,7 @@ <field name="type">view</field> <field name="name">Prestations propres et consommations propres</field> <field name="code">37</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3" name="parent_id"/> </record> @@ -5388,7 +5411,7 @@ <field name="type">view</field> <field name="name">Prestations propres</field> <field name="code">370</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_37" name="parent_id"/> </record> @@ -5428,7 +5451,7 @@ <field name="type">view</field> <field name="name">Consommations propres pour propre production</field> <field name="code">371</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_37" name="parent_id"/> </record> @@ -5452,7 +5475,7 @@ <field name="type">view</field> <field name="name">Consommations propres de marchandises</field> <field name="code">372</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_37" name="parent_id"/> </record> @@ -5476,7 +5499,7 @@ <field name="type">view</field> <field name="name">Consommations propres de services</field> <field name="code">374</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_37" name="parent_id"/> </record> @@ -5500,7 +5523,7 @@ <field name="type">view</field> <field name="name">Variations de stocks de produits et services</field> <field name="code">38</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3" name="parent_id"/> </record> @@ -5508,7 +5531,7 @@ <field name="type">view</field> <field name="name">Variations de stocks de produits et services</field> <field name="code">380</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_38" name="parent_id"/> </record> @@ -5532,7 +5555,7 @@ <field name="type">view</field> <field name="name">Variations de stocks de services</field> <field name="code">384</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_38" name="parent_id"/> </record> @@ -5556,7 +5579,7 @@ <field name="type">view</field> <field name="name">Déductions s/produits des ventes</field> <field name="code">39</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3" name="parent_id"/> </record> @@ -5564,7 +5587,7 @@ <field name="type">view</field> <field name="name">Déductions s/produits</field> <field name="code">390</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_39" name="parent_id"/> </record> @@ -5604,7 +5627,7 @@ <field name="type">view</field> <field name="name">Charges de matières, marchandises et services</field> <field name="code">4</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_3_9" name="parent_id"/> </record> @@ -5612,7 +5635,7 @@ <field name="type">view</field> <field name="name">Charges de matières</field> <field name="code">40</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_4" name="parent_id"/> </record> @@ -5620,7 +5643,7 @@ <field name="type">view</field> <field name="name">Charges de matières du secteur A</field> <field name="code">400</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_40" name="parent_id"/> </record> @@ -5660,7 +5683,7 @@ <field name="type">view</field> <field name="name">Charges de matières du secteur B</field> <field name="code">401</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_40" name="parent_id"/> </record> @@ -5716,7 +5739,7 @@ <field name="type">view</field> <field name="name">Charges de matières du secteur C</field> <field name="code">402</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_40" name="parent_id"/> </record> @@ -5772,7 +5795,7 @@ <field name="type">view</field> <field name="name">Travaux de tiers</field> <field name="code">406</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_40" name="parent_id"/> </record> @@ -5804,7 +5827,7 @@ <field name="type">view</field> <field name="name">Charges directes d'achat</field> <field name="code">407</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_40" name="parent_id"/> </record> @@ -5836,7 +5859,7 @@ <field name="type">view</field> <field name="name">Variations de stocks, pertes de matières</field> <field name="code">408</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_40" name="parent_id"/> </record> @@ -5892,7 +5915,7 @@ <field name="type">view</field> <field name="name">Déductions obtenues s/achats de matières</field> <field name="code">409</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_40" name="parent_id"/> </record> @@ -5940,7 +5963,7 @@ <field name="type">view</field> <field name="name">Charges de marchandises</field> <field name="code">42</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_4" name="parent_id"/> </record> @@ -5948,7 +5971,7 @@ <field name="type">view</field> <field name="name">Charges de marchandises du secteur A</field> <field name="code">420</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_42" name="parent_id"/> </record> @@ -5988,7 +6011,7 @@ <field name="type">view</field> <field name="name">Charges de marchandises du secteur B</field> <field name="code">421</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_42" name="parent_id"/> </record> @@ -6036,7 +6059,7 @@ <field name="type">view</field> <field name="name">Charges directes d'achat s/marchandises</field> <field name="code">427</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_42" name="parent_id"/> </record> @@ -6068,7 +6091,7 @@ <field name="type">view</field> <field name="name">Variations de stocks de marchandises, pertes</field> <field name="code">428</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_42" name="parent_id"/> </record> @@ -6124,7 +6147,7 @@ <field name="type">view</field> <field name="name">Déductions obtenues s/achats liés aux marchandises</field> <field name="code">429</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_42" name="parent_id"/> </record> @@ -6172,7 +6195,7 @@ <field name="type">view</field> <field name="name">Charges pour prestations de tiers (services)</field> <field name="code">44</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_4" name="parent_id"/> </record> @@ -6180,7 +6203,7 @@ <field name="type">view</field> <field name="name">Charges pour prestations de services de tiers A</field> <field name="code">440</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_44" name="parent_id"/> </record> @@ -6220,7 +6243,7 @@ <field name="type">view</field> <field name="name">Charges directes d'achat s/prestations de services</field> <field name="code">447</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_44" name="parent_id"/> </record> @@ -6252,7 +6275,7 @@ <field name="type">view</field> <field name="name">Déductions obtenues s/achats de prestations tiers</field> <field name="code">449</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_44" name="parent_id"/> </record> @@ -6292,7 +6315,7 @@ <field name="type">view</field> <field name="name">Charges d'énergie</field> <field name="code">45</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_4" name="parent_id"/> </record> @@ -6300,7 +6323,7 @@ <field name="type">view</field> <field name="name">Electricité</field> <field name="code">450</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_45" name="parent_id"/> </record> @@ -6324,7 +6347,7 @@ <field name="type">view</field> <field name="name">Gaz</field> <field name="code">451</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_45" name="parent_id"/> </record> @@ -6348,7 +6371,7 @@ <field name="type">view</field> <field name="name">Combustibles</field> <field name="code">452</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_45" name="parent_id"/> </record> @@ -6372,7 +6395,7 @@ <field name="type">view</field> <field name="name">Carburants</field> <field name="code">453</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_45" name="parent_id"/> </record> @@ -6404,7 +6427,7 @@ <field name="type">view</field> <field name="name">Eau</field> <field name="code">454</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_45" name="parent_id"/> </record> @@ -6420,7 +6443,7 @@ <field name="type">view</field> <field name="name">Autres charges</field> <field name="code">46</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_4" name="parent_id"/> </record> @@ -6428,7 +6451,7 @@ <field name="type">view</field> <field name="name">Autres charges de matières pour la production</field> <field name="code">460</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_46" name="parent_id"/> </record> @@ -6444,7 +6467,7 @@ <field name="type">view</field> <field name="name">Autres charges de marchandises</field> <field name="code">462</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_46" name="parent_id"/> </record> @@ -6460,7 +6483,7 @@ <field name="type">view</field> <field name="name">Autres charges pour prestations de tiers</field> <field name="code">464</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_46" name="parent_id"/> </record> @@ -6476,7 +6499,7 @@ <field name="type">view</field> <field name="name">Charges d'emballage</field> <field name="code">465</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_46" name="parent_id"/> </record> @@ -6492,7 +6515,7 @@ <field name="type">view</field> <field name="name">Charges directes d'achat</field> <field name="code">47</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_4" name="parent_id"/> </record> @@ -6500,7 +6523,7 @@ <field name="type">view</field> <field name="name">Charges directes d'achat</field> <field name="code">470</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_47" name="parent_id"/> </record> @@ -6532,7 +6555,7 @@ <field name="type">view</field> <field name="name">Variations de stocks, pertes de matières et march.</field> <field name="code">48</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_4" name="parent_id"/> </record> @@ -6540,7 +6563,7 @@ <field name="type">view</field> <field name="name">Variations de stocks des matières de production</field> <field name="code">480</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_48" name="parent_id"/> </record> @@ -6556,7 +6579,7 @@ <field name="type">view</field> <field name="name">Variations de stocks de marchandises</field> <field name="code">482</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_48" name="parent_id"/> </record> @@ -6572,7 +6595,7 @@ <field name="type">view</field> <field name="name">Pertes de matières et de marchandises</field> <field name="code">488</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_48" name="parent_id"/> </record> @@ -6596,7 +6619,7 @@ <field name="type">view</field> <field name="name">Déductions obtenues s/charges</field> <field name="code">49</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_4" name="parent_id"/> </record> @@ -6604,7 +6627,7 @@ <field name="type">view</field> <field name="name">Déductions s/charges</field> <field name="code">490</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_49" name="parent_id"/> </record> @@ -6652,7 +6675,7 @@ <field name="type">view</field> <field name="name">Charges de personnel</field> <field name="code">5</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_3_9" name="parent_id"/> </record> @@ -6660,7 +6683,7 @@ <field name="type">view</field> <field name="name">Charges de personnel de production</field> <field name="code">50</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_5" name="parent_id"/> </record> @@ -6668,7 +6691,7 @@ <field name="type">view</field> <field name="name">Charges de personnel de production du secteur A</field> <field name="code">500</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_50" name="parent_id"/> </record> @@ -6748,7 +6771,7 @@ <field name="type">view</field> <field name="name">Charges sociales de production</field> <field name="code">507</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_50" name="parent_id"/> </record> @@ -6804,7 +6827,7 @@ <field name="type">view</field> <field name="name">Autres charges de personnel de production</field> <field name="code">508</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_50" name="parent_id"/> </record> @@ -6852,7 +6875,7 @@ <field name="type">view</field> <field name="name">Prestations de travail de tiers dans la production</field> <field name="code">509</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_50" name="parent_id"/> </record> @@ -6876,7 +6899,7 @@ <field name="type">view</field> <field name="name">Charges de personnel pour le commerce des march.</field> <field name="code">52</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_5" name="parent_id"/> </record> @@ -6884,7 +6907,7 @@ <field name="type">view</field> <field name="name">Charges de personnel pour le commerce A</field> <field name="code">520</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_52" name="parent_id"/> </record> @@ -6964,7 +6987,7 @@ <field name="type">view</field> <field name="name">Charges sociales pour le commerce des marchandises</field> <field name="code">527</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_52" name="parent_id"/> </record> @@ -7020,7 +7043,7 @@ <field name="type">view</field> <field name="name">Autres charges de personnel pour le commerce march</field> <field name="code">528</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_52" name="parent_id"/> </record> @@ -7068,7 +7091,7 @@ <field name="type">view</field> <field name="name">Prestations de travail de tiers dans le commerce</field> <field name="code">529</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_52" name="parent_id"/> </record> @@ -7084,7 +7107,7 @@ <field name="type">view</field> <field name="name">Charges de personnel pour la fourniture</field> <field name="code">54</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_5" name="parent_id"/> </record> @@ -7092,7 +7115,7 @@ <field name="type">view</field> <field name="name">Salaires pour la fourniture des prestations serv.</field> <field name="code">540</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_54" name="parent_id"/> </record> @@ -7172,7 +7195,7 @@ <field name="type">view</field> <field name="name">Charges sociales pour les prestations de services</field> <field name="code">547</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_54" name="parent_id"/> </record> @@ -7228,7 +7251,7 @@ <field name="type">view</field> <field name="name">Autres charges de personnel pour les prestations</field> <field name="code">548</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_54" name="parent_id"/> </record> @@ -7276,7 +7299,7 @@ <field name="type">view</field> <field name="name">Prestations de tiers pour les prestations service</field> <field name="code">549</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_54" name="parent_id"/> </record> @@ -7292,7 +7315,7 @@ <field name="type">view</field> <field name="name">Charges de personnel dans l'administration</field> <field name="code">56</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_5" name="parent_id"/> </record> @@ -7300,7 +7323,7 @@ <field name="type">view</field> <field name="name">Salaires pour l'administration</field> <field name="code">560</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_56" name="parent_id"/> </record> @@ -7388,7 +7411,7 @@ <field name="type">view</field> <field name="name">Charges sociales pour l'administration</field> <field name="code">567</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_56" name="parent_id"/> </record> @@ -7444,7 +7467,7 @@ <field name="type">view</field> <field name="name">Autres charges de personnel pour l'administration</field> <field name="code">568</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_56" name="parent_id"/> </record> @@ -7492,7 +7515,7 @@ <field name="type">view</field> <field name="name">Prestations de travail de tiers c/l'administration</field> <field name="code">569</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_56" name="parent_id"/> </record> @@ -7508,7 +7531,7 @@ <field name="type">view</field> <field name="name">Charges sociales</field> <field name="code">57</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_5" name="parent_id"/> </record> @@ -7516,7 +7539,7 @@ <field name="type">view</field> <field name="name">AVS, AI, APG, assurance-chômage</field> <field name="code">570</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_57" name="parent_id"/> </record> @@ -7532,7 +7555,7 @@ <field name="type">view</field> <field name="name">Caisse de compensation familiale</field> <field name="code">571</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_57" name="parent_id"/> </record> @@ -7548,7 +7571,7 @@ <field name="type">view</field> <field name="name">Prévoyance professionnelle</field> <field name="code">572</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_57" name="parent_id"/> </record> @@ -7564,7 +7587,7 @@ <field name="type">view</field> <field name="name">Assurance-accidents</field> <field name="code">573</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_57" name="parent_id"/> </record> @@ -7580,7 +7603,7 @@ <field name="type">view</field> <field name="name">Assurance indemnités journalières en cas maladie</field> <field name="code">574</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_57" name="parent_id"/> </record> @@ -7596,7 +7619,7 @@ <field name="type">view</field> <field name="name">Impôts à la source</field> <field name="code">579</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_57" name="parent_id"/> </record> @@ -7612,7 +7635,7 @@ <field name="type">view</field> <field name="name">Autres charges de personnel</field> <field name="code">58</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_5" name="parent_id"/> </record> @@ -7620,7 +7643,7 @@ <field name="type">view</field> <field name="name">Recherche de personnel</field> <field name="code">580</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_58" name="parent_id"/> </record> @@ -7644,7 +7667,7 @@ <field name="type">view</field> <field name="name">Formation et formation continue</field> <field name="code">581</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_58" name="parent_id"/> </record> @@ -7668,7 +7691,7 @@ <field name="type">view</field> <field name="name">Indemnités effectives</field> <field name="code">582</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_58" name="parent_id"/> </record> @@ -7700,7 +7723,7 @@ <field name="type">view</field> <field name="name">Indemnités forfaitaires</field> <field name="code">583</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_58" name="parent_id"/> </record> @@ -7732,7 +7755,7 @@ <field name="type">view</field> <field name="name">Restaurant du personnel</field> <field name="code">584</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_58" name="parent_id"/> </record> @@ -7772,7 +7795,7 @@ <field name="type">view</field> <field name="name">Autres charges de personnel</field> <field name="code">588</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_58" name="parent_id"/> </record> @@ -7796,7 +7819,7 @@ <field name="type">view</field> <field name="name">Charges de personnel comme prélèvements privés</field> <field name="code">589</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_58" name="parent_id"/> </record> @@ -7812,7 +7835,7 @@ <field name="type">view</field> <field name="name">Prestations de travail de tiers</field> <field name="code">59</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_5" name="parent_id"/> </record> @@ -7820,7 +7843,7 @@ <field name="type">view</field> <field name="name">Prestations de travail de tiers</field> <field name="code">590</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_59" name="parent_id"/> </record> @@ -7844,7 +7867,7 @@ <field name="type">view</field> <field name="name">Autres charges d'exploitation</field> <field name="code">6</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_3_9" name="parent_id"/> </record> @@ -7852,7 +7875,7 @@ <field name="type">view</field> <field name="name">Charges de locaux</field> <field name="code">60</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -7860,7 +7883,7 @@ <field name="type">view</field> <field name="name">Loyers pour locaux de tiers</field> <field name="code">600</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_60" name="parent_id"/> </record> @@ -7924,7 +7947,7 @@ <field name="type">view</field> <field name="name">Loyers pour locaux propres</field> <field name="code">601</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_60" name="parent_id"/> </record> @@ -7988,7 +8011,7 @@ <field name="type">view</field> <field name="name">Charges accessoires</field> <field name="code">603</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_60" name="parent_id"/> </record> @@ -8076,7 +8099,7 @@ <field name="type">view</field> <field name="name">Charges de nettoyage</field> <field name="code">604</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_60" name="parent_id"/> </record> @@ -8156,7 +8179,7 @@ <field name="type">view</field> <field name="name">Charges d'entretien des locaux</field> <field name="code">605</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_60" name="parent_id"/> </record> @@ -8244,7 +8267,7 @@ <field name="type">view</field> <field name="name">Charges pour immobilisations en crédit-bail</field> <field name="code">606</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_60" name="parent_id"/> </record> @@ -8308,7 +8331,7 @@ <field name="type">view</field> <field name="name">Charges de locaux comme prélèvements privés</field> <field name="code">609</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_60" name="parent_id"/> </record> @@ -8324,7 +8347,7 @@ <field name="type">view</field> <field name="name">Entretien, réparations, remplacements (ERR)</field> <field name="code">61</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -8332,7 +8355,7 @@ <field name="type">view</field> <field name="name">Entretien, réparations, remplacements (ERR)</field> <field name="code">610</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_61" name="parent_id"/> </record> @@ -8340,7 +8363,7 @@ <field name="type">view</field> <field name="name">ERR d'installations de production</field> <field name="code">610.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_610" name="parent_id"/> </record> @@ -8372,7 +8395,7 @@ <field name="type">view</field> <field name="name">ERR d'installations pour le commerce des march.</field> <field name="code">611.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_610" name="parent_id"/> </record> @@ -8396,7 +8419,7 @@ <field name="type">view</field> <field name="name">ERR d'installations d'entreposage</field> <field name="code">612.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_610" name="parent_id"/> </record> @@ -8420,7 +8443,7 @@ <field name="type">view</field> <field name="name">ERR d'installations de bureau</field> <field name="code">613.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_610" name="parent_id"/> </record> @@ -8444,7 +8467,7 @@ <field name="type">view</field> <field name="name">ERR d'installations pour le personnel</field> <field name="code">614.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_610" name="parent_id"/> </record> @@ -8468,7 +8491,7 @@ <field name="type">view</field> <field name="name">Charges c/immobi. corporelles meubles crédit-bail</field> <field name="code">616</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_61" name="parent_id"/> </record> @@ -8476,7 +8499,7 @@ <field name="type">view</field> <field name="name">Charges c/immobi. corporelles meubles crédit-bail</field> <field name="code">616.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_616" name="parent_id"/> </record> @@ -8524,7 +8547,7 @@ <field name="type">view</field> <field name="name">Charges de véhicules et de transport</field> <field name="code">62</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -8532,7 +8555,7 @@ <field name="type">view</field> <field name="name">Charges de véhicules</field> <field name="code">620</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_62" name="parent_id"/> </record> @@ -8540,7 +8563,7 @@ <field name="type">view</field> <field name="name">Réparation, service et nettoyage des véhicules</field> <field name="code">620.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_620" name="parent_id"/> </record> @@ -8604,7 +8627,7 @@ <field name="type">view</field> <field name="name">Carburants</field> <field name="code">621.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_620" name="parent_id"/> </record> @@ -8668,7 +8691,7 @@ <field name="type">view</field> <field name="name">Assurances</field> <field name="code">622.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_620" name="parent_id"/> </record> @@ -8732,7 +8755,7 @@ <field name="type">view</field> <field name="name">Droits de circulation, cotisations, taxes</field> <field name="code">623.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_620" name="parent_id"/> </record> @@ -8788,7 +8811,7 @@ <field name="type">view</field> <field name="name">Charges de location pour véhicules en crédit-bail</field> <field name="code">626.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_620" name="parent_id"/> </record> @@ -8836,7 +8859,7 @@ <field name="type">view</field> <field name="name">Charges de véhicules comme prélèvements privés</field> <field name="code">627.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_620" name="parent_id"/> </record> @@ -8852,7 +8875,7 @@ <field name="type">view</field> <field name="name">Charges de transport</field> <field name="code">628</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_62" name="parent_id"/> </record> @@ -8860,7 +8883,7 @@ <field name="type">view</field> <field name="name">Frets, frais de transport, cargo domicile</field> <field name="code">628.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_628" name="parent_id"/> </record> @@ -8908,7 +8931,7 @@ <field name="type">view</field> <field name="name">Assurances-choses, droits, taxes, autorisations</field> <field name="code">63</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -8916,7 +8939,7 @@ <field name="type">view</field> <field name="name">Assurances-choses</field> <field name="code">630</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_63" name="parent_id"/> </record> @@ -8924,7 +8947,7 @@ <field name="type">view</field> <field name="name">Primes d'assurance c/dommages, bris de glace, vols</field> <field name="code">630.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_630" name="parent_id"/> </record> @@ -8956,7 +8979,7 @@ <field name="type">view</field> <field name="name">Primes d'assurance responsabilité civile /garantie</field> <field name="code">631.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_630" name="parent_id"/> </record> @@ -8988,7 +9011,7 @@ <field name="type">view</field> <field name="name">Primes d'assurance pour arrêts d'exploitation</field> <field name="code">632.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_630" name="parent_id"/> </record> @@ -9004,7 +9027,7 @@ <field name="type">view</field> <field name="name">Primes pour assurances liées aux crédits</field> <field name="code">633.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_630" name="parent_id"/> </record> @@ -9028,7 +9051,7 @@ <field name="type">view</field> <field name="name">Droits, taxes, autorisations, patentes</field> <field name="code">636</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_63" name="parent_id"/> </record> @@ -9036,7 +9059,7 @@ <field name="type">view</field> <field name="name">Droits et taxes</field> <field name="code">636.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_636" name="parent_id"/> </record> @@ -9060,7 +9083,7 @@ <field name="type">view</field> <field name="name">Autorisations et patentes</field> <field name="code">637.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_636" name="parent_id"/> </record> @@ -9084,7 +9107,7 @@ <field name="type">view</field> <field name="name">Charges d'énergie et évacuation des déchets</field> <field name="code">64</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -9092,7 +9115,7 @@ <field name="type">view</field> <field name="name">Charges d'énergie</field> <field name="code">640</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_64" name="parent_id"/> </record> @@ -9100,7 +9123,7 @@ <field name="type">view</field> <field name="name">Electricité</field> <field name="code">640.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_640" name="parent_id"/> </record> @@ -9132,7 +9155,7 @@ <field name="type">view</field> <field name="name">Gaz</field> <field name="code">641.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_640" name="parent_id"/> </record> @@ -9156,7 +9179,7 @@ <field name="type">view</field> <field name="name">Combustibles et matériaux de chauffage</field> <field name="code">642.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_640" name="parent_id"/> </record> @@ -9180,7 +9203,7 @@ <field name="type">view</field> <field name="name">Eau</field> <field name="code">643.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_640" name="parent_id"/> </record> @@ -9196,7 +9219,7 @@ <field name="type">view</field> <field name="name">Evacuation de déchets</field> <field name="code">646</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_64" name="parent_id"/> </record> @@ -9204,7 +9227,7 @@ <field name="type">view</field> <field name="name">Evacuation de déchets</field> <field name="code">646.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_646" name="parent_id"/> </record> @@ -9236,7 +9259,7 @@ <field name="type">view</field> <field name="name">Charges d'administration et d'informatique</field> <field name="code">65</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -9244,7 +9267,7 @@ <field name="type">view</field> <field name="name">Charges d'administration</field> <field name="code">650</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_65" name="parent_id"/> </record> @@ -9252,7 +9275,7 @@ <field name="type">view</field> <field name="name">Matériel de bureau, imprimés, photocopies</field> <field name="code">650.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_650" name="parent_id"/> </record> @@ -9292,7 +9315,7 @@ <field name="type">view</field> <field name="name">Téléphone, téléfax, Internet, frais de port</field> <field name="code">651.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_650" name="parent_id"/> </record> @@ -9332,7 +9355,7 @@ <field name="type">view</field> <field name="name">Cotisations, dons, cadeaux et pourboires</field> <field name="code">652.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_650" name="parent_id"/> </record> @@ -9364,7 +9387,7 @@ <field name="type">view</field> <field name="name">Honoraires pour fiduciaire et conseil</field> <field name="code">653.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_650" name="parent_id"/> </record> @@ -9396,7 +9419,7 @@ <field name="type">view</field> <field name="name">Conseil d'administration, AG, OR</field> <field name="code">654.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_650" name="parent_id"/> </record> @@ -9428,7 +9451,7 @@ <field name="type">view</field> <field name="name">Charges d'administration comme prélèvements privés</field> <field name="code">655.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_650" name="parent_id"/> </record> @@ -9444,7 +9467,7 @@ <field name="type">view</field> <field name="name">Informatique</field> <field name="code">656</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_65" name="parent_id"/> </record> @@ -9452,7 +9475,7 @@ <field name="type">view</field> <field name="name">Locations en crédit-bail et locations de hard/soft</field> <field name="code">656.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_656" name="parent_id"/> </record> @@ -9484,7 +9507,7 @@ <field name="type">view</field> <field name="name">Licences et entretien</field> <field name="code">657.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_656" name="parent_id"/> </record> @@ -9540,7 +9563,7 @@ <field name="type">view</field> <field name="name">Conseils et développements</field> <field name="code">658.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_656" name="parent_id"/> </record> @@ -9588,7 +9611,7 @@ <field name="type">view</field> <field name="name">Publicité</field> <field name="code">66</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -9596,7 +9619,7 @@ <field name="type">view</field> <field name="name">Publicité, médias électroniques</field> <field name="code">660</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_66" name="parent_id"/> </record> @@ -9684,7 +9707,7 @@ <field name="type">view</field> <field name="name">Imprimés, matériel, articles de publicité</field> <field name="code">661</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_66" name="parent_id"/> </record> @@ -9708,7 +9731,7 @@ <field name="type">view</field> <field name="name">Vitrines, décoration, foires, expositions</field> <field name="code">662</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_66" name="parent_id"/> </record> @@ -9732,7 +9755,7 @@ <field name="type">view</field> <field name="name">Frais de voyage, conseils à la clientèle</field> <field name="code">664</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_66" name="parent_id"/> </record> @@ -9764,7 +9787,7 @@ <field name="type">view</field> <field name="name">Publicité, sponsoring</field> <field name="code">666</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_66" name="parent_id"/> </record> @@ -9788,7 +9811,7 @@ <field name="type">view</field> <field name="name">Relations publiques</field> <field name="code">667</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_66" name="parent_id"/> </record> @@ -9820,7 +9843,7 @@ <field name="type">view</field> <field name="name">Conseils en publicité, études de marché</field> <field name="code">668</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_66" name="parent_id"/> </record> @@ -9844,7 +9867,7 @@ <field name="type">view</field> <field name="name">Autres charges d'exploitation</field> <field name="code">67</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -9852,7 +9875,7 @@ <field name="type">view</field> <field name="name">Informations économiques, poursuites</field> <field name="code">670</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_67" name="parent_id"/> </record> @@ -9876,7 +9899,7 @@ <field name="type">view</field> <field name="name">Sécurité et surveillance</field> <field name="code">671</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_67" name="parent_id"/> </record> @@ -9900,7 +9923,7 @@ <field name="type">view</field> <field name="name">Recherche et développement</field> <field name="code">672</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_67" name="parent_id"/> </record> @@ -9924,7 +9947,7 @@ <field name="type">view</field> <field name="name">Résultat financier</field> <field name="code">68</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -9932,7 +9955,7 @@ <field name="type">view</field> <field name="name">Charges financières</field> <field name="code">680</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_68" name="parent_id"/> </record> @@ -9940,7 +9963,7 @@ <field name="type">view</field> <field name="name">Charges financières pour financement par des tiers</field> <field name="code">680.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_680" name="parent_id"/> </record> @@ -9988,7 +10011,7 @@ <field name="type">view</field> <field name="name">Charges financières pour financement par des stés</field> <field name="code">681.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_680" name="parent_id"/> </record> @@ -10012,7 +10035,7 @@ <field name="type">view</field> <field name="name">Charges financières pour financement actionnaires</field> <field name="code">682.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_680" name="parent_id"/> </record> @@ -10036,7 +10059,7 @@ <field name="type">view</field> <field name="name">Charges financières pour financement LPP</field> <field name="code">683.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_680" name="parent_id"/> </record> @@ -10052,7 +10075,7 @@ <field name="type">view</field> <field name="name">Autres charges financières</field> <field name="code">684.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_680" name="parent_id"/> </record> @@ -10108,7 +10131,7 @@ <field name="type">view</field> <field name="name">Produits financiers</field> <field name="code">685</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_68" name="parent_id"/> </record> @@ -10116,7 +10139,7 @@ <field name="type">view</field> <field name="name">Produits financiers des liquidités et des titres</field> <field name="code">685.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_685" name="parent_id"/> </record> @@ -10164,7 +10187,7 @@ <field name="type">view</field> <field name="name">Produits financiers c/immobilisations financières</field> <field name="code">686.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_685" name="parent_id"/> </record> @@ -10212,7 +10235,7 @@ <field name="type">view</field> <field name="name">Produits financiers de placement auprès des stés</field> <field name="code">687.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_685" name="parent_id"/> </record> @@ -10236,7 +10259,7 @@ <field name="type">view</field> <field name="name">Produits financiers placement auprès actionnaires</field> <field name="code">688.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_685" name="parent_id"/> </record> @@ -10260,7 +10283,7 @@ <field name="type">view</field> <field name="name">Autres produits financiers</field> <field name="code">689.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_685" name="parent_id"/> </record> @@ -10316,7 +10339,7 @@ <field name="type">view</field> <field name="name">Amortissement</field> <field name="code">69</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_6" name="parent_id"/> </record> @@ -10324,7 +10347,7 @@ <field name="type">view</field> <field name="name">Dépréciations s/immobilisations financières</field> <field name="code">690</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_69" name="parent_id"/> </record> @@ -10348,7 +10371,7 @@ <field name="type">view</field> <field name="name">Dépréciations s/participations à des stés groupe</field> <field name="code">691</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_69" name="parent_id"/> </record> @@ -10372,7 +10395,7 @@ <field name="type">view</field> <field name="name">Amortissements s/immobilisations corporelles</field> <field name="code">692</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_69" name="parent_id"/> </record> @@ -10412,7 +10435,7 @@ <field name="type">view</field> <field name="name">Amortissements s/immobilisations corporelles imm.</field> <field name="code">693</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_69" name="parent_id"/> </record> @@ -10436,7 +10459,7 @@ <field name="type">view</field> <field name="name">Amortissements s/immobilisations incorporelles</field> <field name="code">694</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_69" name="parent_id"/> </record> @@ -10468,7 +10491,7 @@ <field name="type">view</field> <field name="name">Amortissements s/charges activées</field> <field name="code">695</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_69" name="parent_id"/> </record> @@ -10492,7 +10515,7 @@ <field name="type">view</field> <field name="name">Résultat des activités annexes d'exploitation</field> <field name="code">7</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3_9" name="parent_id"/> </record> @@ -10500,7 +10523,7 @@ <field name="type">view</field> <field name="name">Résultat des activités annexes</field> <field name="code">70</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_7" name="parent_id"/> </record> @@ -10508,7 +10531,7 @@ <field name="type">view</field> <field name="name">Résultat de l'activité annexe 1</field> <field name="code">700</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_70" name="parent_id"/> </record> @@ -10516,7 +10539,7 @@ <field name="type">view</field> <field name="name">Produits de l'activité annexe 1</field> <field name="code">700.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_700" name="parent_id"/> </record> @@ -10540,7 +10563,7 @@ <field name="type">view</field> <field name="name">Charges de l'activité annexe 1</field> <field name="code">701.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_700" name="parent_id"/> </record> @@ -10628,7 +10651,7 @@ <field name="type">view</field> <field name="name">Résultat de l'activité annexe 2</field> <field name="code">700</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_70" name="parent_id"/> </record> @@ -10636,7 +10659,7 @@ <field name="type">view</field> <field name="name">Résultat de l'activité annexe 2</field> <field name="code">702.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_700" name="parent_id"/> </record> @@ -10660,7 +10683,7 @@ <field name="type">view</field> <field name="name">Charges de l'activité annexe 2</field> <field name="code">703.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_700" name="parent_id"/> </record> @@ -10748,7 +10771,7 @@ <field name="type">view</field> <field name="name">Résultat des placements financiers</field> <field name="code">74</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_7" name="parent_id"/> </record> @@ -10756,7 +10779,7 @@ <field name="type">view</field> <field name="name">Produits de placements financiers</field> <field name="code">740.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_74" name="parent_id"/> </record> @@ -10796,7 +10819,7 @@ <field name="type">view</field> <field name="name">Charges s/placements financiers</field> <field name="code">741.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_74" name="parent_id"/> </record> @@ -10836,7 +10859,7 @@ <field name="type">view</field> <field name="name">Résultat d'immeuble</field> <field name="code">75</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_7" name="parent_id"/> </record> @@ -10844,7 +10867,7 @@ <field name="type">view</field> <field name="name">Résultat de l'immeuble d'exploitation 1</field> <field name="code">750</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_75" name="parent_id"/> </record> @@ -10852,7 +10875,7 @@ <field name="type">view</field> <field name="name">Produits de l'immeuble d'exploitation 1</field> <field name="code">750.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_750" name="parent_id"/> </record> @@ -10900,7 +10923,7 @@ <field name="type">view</field> <field name="name">Charges de l'immeuble d'exploitation 1</field> <field name="code">751.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_750" name="parent_id"/> </record> @@ -10964,7 +10987,7 @@ <field name="type">view</field> <field name="name">Bénéfices provenant de l'aliénation d'actifs immob</field> <field name="code">79</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_7" name="parent_id"/> </record> @@ -10972,7 +10995,7 @@ <field name="type">view</field> <field name="name">Bénéfices s/immobilisations financières</field> <field name="code">790</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_79" name="parent_id"/> </record> @@ -11004,7 +11027,7 @@ <field name="type">view</field> <field name="name">Bénéfices s/immobilisations corporelles meubles</field> <field name="code">791</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_79" name="parent_id"/> </record> @@ -11020,7 +11043,7 @@ <field name="type">view</field> <field name="name">Bénéfice s/immobilisations corporelles immeubles</field> <field name="code">792</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_79" name="parent_id"/> </record> @@ -11036,7 +11059,7 @@ <field name="type">view</field> <field name="name">Bénéfices s/immobilisations incorporelles</field> <field name="code">793</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_79" name="parent_id"/> </record> @@ -11052,7 +11075,7 @@ <field name="type">view</field> <field name="name">Résultats exceptionnel et hors exploitation impôts</field> <field name="code">8</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3_9" name="parent_id"/> </record> @@ -11060,7 +11083,7 @@ <field name="type">view</field> <field name="name">Résultat exceptionnel</field> <field name="code">80</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_8" name="parent_id"/> </record> @@ -11068,7 +11091,7 @@ <field name="type">view</field> <field name="name">Produits exceptionnels</field> <field name="code">800</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_80" name="parent_id"/> </record> @@ -11132,7 +11155,7 @@ <field name="type">view</field> <field name="name">Charges exceptionnelles</field> <field name="code">801</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_80" name="parent_id"/> </record> @@ -11212,7 +11235,7 @@ <field name="type">view</field> <field name="name">Résultat hors exploitation</field> <field name="code">82</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_8" name="parent_id"/> </record> @@ -11220,7 +11243,7 @@ <field name="type">view</field> <field name="name">Résultat de l'activité hors exploitation</field> <field name="code">820</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_82" name="parent_id"/> </record> @@ -11228,7 +11251,7 @@ <field name="type">view</field> <field name="name">Résultat de l'activité hors exploitation 1</field> <field name="code">820.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_820" name="parent_id"/> </record> @@ -11236,7 +11259,7 @@ <field name="type">view</field> <field name="name">Produits de l'activité hors exploitation 1</field> <field name="code">820.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_820_0" name="parent_id"/> </record> @@ -11260,7 +11283,7 @@ <field name="type">view</field> <field name="name">Charges de l'activité hors exploitation 1</field> <field name="code">821.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_820_0" name="parent_id"/> </record> @@ -11348,7 +11371,7 @@ <field name="type">view</field> <field name="name">Résultat des placements financiers hors exploitation</field> <field name="code">840</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_82" name="parent_id"/> </record> @@ -11356,7 +11379,7 @@ <field name="type">view</field> <field name="name">Produits financiers s/placements financiers hors exploitation</field> <field name="code">840.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_840" name="parent_id"/> </record> @@ -11380,7 +11403,7 @@ <field name="type">view</field> <field name="name">Charges financières s/placements financiers hors exploitation</field> <field name="code">841.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_840" name="parent_id"/> </record> @@ -11420,7 +11443,7 @@ <field name="type">view</field> <field name="name">Résultat de l'immeuble hors exploitation</field> <field name="code">850</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_82" name="parent_id"/> </record> @@ -11428,7 +11451,7 @@ <field name="type">view</field> <field name="name">Résultat de l'immeuble hors exploitation 1</field> <field name="code">850.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_850" name="parent_id"/> </record> @@ -11436,7 +11459,7 @@ <field name="type">view</field> <field name="name">Produits de l'immeuble hors exploitation 1</field> <field name="code">850.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_850_0" name="parent_id"/> </record> @@ -11476,7 +11499,7 @@ <field name="type">view</field> <field name="name">Charges de l'immeuble hors exploitation 1</field> <field name="code">851.00</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_850_0" name="parent_id"/> </record> @@ -11540,7 +11563,7 @@ <field name="type">view</field> <field name="name">Autres résultats hors exploitation</field> <field name="code">870</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_82" name="parent_id"/> </record> @@ -11548,7 +11571,7 @@ <field name="type">view</field> <field name="name">Autres produits hors exploitation</field> <field name="code">870.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_870" name="parent_id"/> </record> @@ -11572,7 +11595,7 @@ <field name="type">view</field> <field name="name">Autres charges hors exploitation</field> <field name="code">871.0</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_870" name="parent_id"/> </record> @@ -11588,7 +11611,7 @@ <field name="type">view</field> <field name="name">Charges d'impôt</field> <field name="code">89</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_8" name="parent_id"/> </record> @@ -11596,7 +11619,7 @@ <field name="type">view</field> <field name="name">Impôts directs de l'entreprise</field> <field name="code">890</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_expense"/> <field name="note"/> <field ref="ch_89" name="parent_id"/> </record> @@ -11628,7 +11651,7 @@ <field name="type">view</field> <field name="name">Clôture</field> <field name="code">9</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_3_9" name="parent_id"/> </record> @@ -11636,7 +11659,7 @@ <field name="type">view</field> <field name="name">Compte de résultat</field> <field name="code">90</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_9" name="parent_id"/> </record> @@ -11644,7 +11667,7 @@ <field name="type">view</field> <field name="name">Compte de résultat</field> <field name="code">900</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_90" name="parent_id"/> </record> @@ -11660,7 +11683,7 @@ <field name="type">view</field> <field name="name">Bilan</field> <field name="code">91</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_9" name="parent_id"/> </record> @@ -11668,7 +11691,7 @@ <field name="type">view</field> <field name="name">Bilan</field> <field name="code">910</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_assets"/> <field name="note"/> <field ref="ch_91" name="parent_id"/> </record> @@ -11692,7 +11715,7 @@ <field name="type">view</field> <field name="name">Utilisation du bénéfice</field> <field name="code">92</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_9" name="parent_id"/> </record> @@ -11700,7 +11723,7 @@ <field name="type">view</field> <field name="name">Utilisation du bénéfice</field> <field name="code">920</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_92" name="parent_id"/> </record> @@ -11724,7 +11747,7 @@ <field name="type">view</field> <field name="name">Ecriture de regroupements et de corrections</field> <field name="code">99</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_9" name="parent_id"/> </record> @@ -11732,7 +11755,7 @@ <field name="type">view</field> <field name="name">Ecritures de regroupements</field> <field name="code">990</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_99" name="parent_id"/> </record> @@ -11756,7 +11779,7 @@ <field name="type">view</field> <field name="name">Ecritures de corrections</field> <field name="code">991</field> - <field name="user_type" ref="account_type_view"/> + <field name="user_type" ref="account_type_view_income"/> <field name="note"/> <field ref="ch_99" name="parent_id"/> </record> @@ -11773,10 +11796,10 @@ <field name="parent_id" eval="False"/> </record> <record id="l10nch_chart_template" model="account.chart.template"> - <field name="name">Swiss PCG</field> + <field name="name">Plan comptable STERCHI</field> <field name="account_root_id" ref="ch_minimal_0"/> <field name="tax_code_root_id" ref="vat_code_chart_root"/> - <field name="bank_account_view_id" ref="ch_3400"/> + <field name="bank_account_view_id" ref="ch_102_0"/> <field name="property_account_receivable" ref="ch_1100"/> <field name="property_account_payable" ref="ch_2000"/> <field name="property_account_expense_categ" ref="ch_4200"/> diff --git a/addons/l10n_ch/sterchi_chart/fiscal_position.xml b/addons/l10n_ch/sterchi_chart/fiscal_position.xml index e6b95fb7e68..d8a70325ba5 100644 --- a/addons/l10n_ch/sterchi_chart/fiscal_position.xml +++ b/addons/l10n_ch/sterchi_chart/fiscal_position.xml @@ -1,5 +1,5 @@ <openerp> - <data> + <data noupdate="1"> <!-- Fiscal Position Templates --> <record id="fiscal_position_template_import" model="account.fiscal.position.template"> @@ -115,4 +115,4 @@ <field name="tax_dest_id" ref="vat_XO" /> </record> </data> -</openerp>
\ No newline at end of file +</openerp> diff --git a/addons/l10n_ch/test/l10n_ch_dta.yml b/addons/l10n_ch/test/l10n_ch_dta.yml new file mode 100644 index 00000000000..3f1dbacfd86 --- /dev/null +++ b/addons/l10n_ch/test/l10n_ch_dta.yml @@ -0,0 +1,221 @@ +- + In order to test DTA generation I make an invoice and create the DTA from it. +- + I create an invoice on 1st January for 7000 EUR + ########################### + # Creating 1 invoice # +########################### +- + !record {model: account.invoice, id: dta_account_invoice}: + company_id: base.main_company + journal_id: account.bank_journal + currency_id: base.EUR + account_id: account.a_pay + type : in_invoice + partner_id: base.res_partner_agrolait + address_contact_id: base.res_partner_address_8 + address_invoice_id: base.res_partner_address_8 + reference_type: bvr + reference: 111111111111111111111111111111 + date_invoice: !eval "'%s-01-01' %(datetime.now().year)" + period_id: account.period_1 + #invoice_line: + partner_bank_id: main_partner_bank + check_total : 7000 +- + I add an invoice line +- + !record {model: account.invoice.line, id: dta_invoice_line}: + account_id: account.a_expense + name: '[PC1] Basic PC' + price_unit: 700.0 + quantity: 10.0 + product_id: product.product_product_pc1 + uos_id: product.product_uom_unit + invoice_id: dta_account_invoice + + +- + I Validate invoice by clicking on Validate button +- + !workflow {model: account.invoice, action: invoice_open, ref: dta_account_invoice} + +- + I create my payment order to pay my invoice + ########################### + # Doing payment order # +########################### +- + !record {model: payment.order, id: dta_payment_order}: + #date_created + #date_done + date_prefered: due + #date_scheduled + #line_ids: + mode: l10n_ch.payment_mode_dta + #reference + state: draft + total: 7000 + #user_id +- + I add a payment line to my payment order +- + !record {model: payment.line, id: dta_pay_line}: + amount: 7000 + amount_currency: 7000 + bank_id: l10n_ch.agro_bank + #bank_statement_line_id + communication: "111111111111111111111111111111" + #communication2 + company_currency: base.EUR + #create_date + currency: base.EUR + #date + #info_owner + #info_partner + #ml_date_created + #ml_inv_ref + #ml_maturity_date + move_line_id: !ref {model: account.move.line, search: "[('ref','=','111111111111111111111111111111')]"} + #name (reference) + order_id: dta_payment_order + partner_id: base.res_partner_agrolait + state: normal + +- + I generate a DTA file by using the wizard "Create DTA" for my payment order +- + !python {model: create.dta.wizard}: | + import base64 + wiz_id = self.create(cr,uid,[]) + wiz = self.browse(cr, uid, wiz_id) + pay_order_id = ref("dta_payment_order") + #set the payment order as the active id + context['active_ids'] = [pay_order_id] + context['active_id'] = pay_order_id + result = wiz.create_dta(context=context) + assert result, "No result returned" + + data = wiz.read(['dta_file']) + dta_file = base64.decodestring(data[0]['dta_file'] or '') + assert dta_file, "File is empty" + + #check that file starts with 1st segment characters "01" + assert dta_file[:2] == "01", "File is not a DTA file" + + payment_obj = self.pool.get('payment.order') + payment_obj.set_done(cr, uid, [ref('dta_payment_order')], context) + #force state in open state (confirmed) + payment_obj.write(cr, uid, [ref('dta_payment_order')], {'state': 'open'}) + +- + I check the execution date is today +- + !assert {model: payment.order, id: dta_payment_order}: + - date_done == datetime.now().date().strftime('%Y-%m-%d') + +- + I check my payment order state is Confirmed +- + !assert {model: payment.order, id: dta_payment_order, string: state is done}: + - state == 'open' + +- + I create a Bank Statment in order to confirm the payment line +- + !record {model: account.bank.statement, id: dta_bank_statement}: + #account_id: + #balance_end: + #balance_end_cash: + #balance_end_real: + #balance_start: + #closing_date: + #company_id: + #currency: + date: !eval "'%s-01-01' %(datetime.now().year)" + #ending_details_ids: + journal_id: account.bank_journal + #line_ids: + #move_line_ids + name: "/" + period_id: account.period_1 + #starting_details_ids + state: draft + #total_entry_encoding + #user_id + +#- +# I import the payment line +#- +# !python {model: account.payment.populate.statement}: | +# wiz_id = self.create(cr,uid,[]) +# wiz = self.browse(cr, uid, wiz_id) +# +# line_obj = self.pool.get('payment.line') +# pay_line_ids = line_obj.search(cr, uid, [('communication','=','111111111111111111111111111111'),('amount','=','7000')]) +# +# data = { 'lines': [(6, 0, [pay_line_ids[0]])],} +# wiz.write(data) +# +# context['active_id'] = ref('dta_bank_statement') +# context['active_ids'] = [ref('dta_bank_statement')] +# +# self.populate_statement(cr, uid, [wiz_id], context=context) +# +# +#- +# I check the statement line is created +#- +# !assert {model: account.bank.statement, id: dta_bank_statement, string: statement_line_ids is not empty}: +# - line_ids +# +#- +# I check the voucher line is created +#- +# !python {model: account.bank.statement}: | +# statement = self.browse(cr, uid, ref('dta_bank_statement')) +# +# assert statement.line_ids[0].voucher_id.line_ids, "Voucher line is missing" +# assert len(statement.line_ids[0].voucher_id.line_ids) == 1, "There are too many voucher lines" +# +#- +# In order to confirm my bank statement, I enter the closing balance and press on compute button +#- +# !python {model: account.bank.statement}: | +# statement = self.browse(cr, uid, ref('dta_bank_statement')) +# statement.write({'balance_end_real': -7000.0}) +# self.button_dummy(cr, uid, [ref('dta_bank_statement')], context=context) +# statement = self.browse(cr, uid, ref('dta_bank_statement')) +# +#- +# I confirm my bank statement +#- +# !python {model: account.bank.statement}: | +# self.button_confirm_bank(cr, uid, [ref('dta_bank_statement')], context=context) +# +# +#- +# I check the move lines have been defined +#- +# !assert {model: account.bank.statement, id: dta_bank_statement, string: move_line_ids is not empty}: +# - move_line_ids +# +# +#- +# I check bank statement is Closed and balance is -7000 +#- +# !assert {model: account.bank.statement, id: dta_bank_statement, string: state is Closed and balance is -7000}: +# - state == 'confirm' +# - balance_end == -7000.0 +# +#- +# I check the residual amount of invoice, should be 0 in residual currency and 0 in amount_residual and paid +#- +# !python {model: account.invoice}: | +# invoice_id = self.browse(cr, uid, ref("dta_account_invoice")) +# move_line_obj = self.pool.get('account.move.line') +# move_lines = move_line_obj.search(cr, uid, [('move_id', '=', invoice_id.move_id.id), ('invoice', '=', invoice_id.id), ('account_id', '=', invoice_id.account_id.id)]) +# move_line = move_line_obj.browse(cr, uid, move_lines[0]) +# assert move_line.amount_residual_currency == 0.0, "Residual amount currency is not correct : %.2f" % move_line.amount_residual_currency +# assert move_line.amount_residual == 0.0 , "Residual amount of invoice is not correct : %.2f" % move_line.amount_residual +# assert invoice_id.state == 'paid', "Invoice state is not Paid" diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml index a730bdc82bd..e5b570fe58f 100644 --- a/addons/l10n_ch/test/l10n_ch_report.yml +++ b/addons/l10n_ch/test/l10n_ch_report.yml @@ -1,5 +1,5 @@ - - In order to test BVR printing. I create Partner data. + In order to test BVR printing. I create Partner data . - !record {model: res.partner.category, id: res_partner_category_bvr}: name: Customers @@ -57,4 +57,4 @@ !python {model: account.invoice}: | from tools.test_reports import try_report company = self.pool.get('res.users').browse(cr, uid, uid).company_id - company.lib_path and try_report(cr, uid, 'report.invoice_web_bvr', [ref('l10n_ch_invoice')]) or 'Webkit lib not set' + company.lib_path and try_report(cr, uid, 'report.invoice_web_bvr', [ref('l10n_ch_invoice')]) or 'Webkit lib not set'
\ No newline at end of file diff --git a/addons/l10n_ch/test/l10n_ch_v11.yml b/addons/l10n_ch/test/l10n_ch_v11.yml new file mode 100644 index 00000000000..35e9870fe69 --- /dev/null +++ b/addons/l10n_ch/test/l10n_ch_v11.yml @@ -0,0 +1,160 @@ +- + In order to test the V11 import, + I will create an invoice with a specified reference that I will reconcile with the moves imported from a V11 +- + I create an invoice ref 1234567 +- + !record {model: account.invoice, id: v11_test_invoice}: + name: V11 YAML invoice + number: 1234567 + company_id: base.main_company + journal_id: account.bank_journal + currency_id: base.EUR + account_id: account.a_recv + type : out_invoice + partner_id: base.res_partner_agrolait + address_contact_id: base.res_partner_address_8 + address_invoice_id: base.res_partner_address_8 + reference_type: bvr + reference: 12345676 + date_invoice: !eval "'%s-01-01' %(datetime.now().year)" + period_id: account.period_1 + #invoice_line: + partner_bank_id: main_partner_bank + check_total : 888.00 + +- + I create an invoice line +- + !record {model: account.invoice.line, id: v11_test_invoice_line}: + account_id: account.a_expense + name: '[PC1] Basic PC' + price_unit: 888.00 + quantity: 1.0 + product_id: product.product_product_pc1 + uos_id: product.product_uom_unit + invoice_id: v11_test_invoice + +- + I Validate invoice by clicking on Validate button +- + !workflow {model: account.invoice, action: invoice_open, ref: v11_test_invoice} + +- + I specify the invoice number to fit with my v11 +- + !python {model: account.invoice}: | + invoice = self.browse(cr, uid, ref('v11_test_invoice')) + invoice.write({'number': 1234567}) + + +- + I create a bank statement +- + !record {model: account.bank.statement, id: v11_test_bank_statement}: + #account_id: + #balance_end: + #balance_end_cash: + #balance_end_real: + #balance_start: + #closing_date: + #company_id: + #currency: + date: !eval "'%s-01-01' %(datetime.now().year)" + #ending_details_ids: + journal_id: account.bank_journal + #line_ids: + #move_line_ids + name: "/" + period_id: account.period_1 + #starting_details_ids + state: draft + #total_entry_encoding + #user_id + +- + I import the V11 +- + !python {model: bvr.import.wizard}: | + import base64 + import addons + import os + # create our wizard + wiz_id = self.create(cr,uid,[]) + wiz = self.browse(cr, uid, wiz_id) + + test_file_path = addons.get_module_resource(os.path.join('l10n_ch', 'test', 'test.v11')) + + # get our test file to test it + f_v11 = open(test_file_path) + + str64_v11 = base64.encodestring(f_v11.read()) + + wiz.write({'file': str64_v11}) + + # set the file in the wizard field + bank_statement_id = ref('v11_test_bank_statement') + + context['active_id'] = bank_statement_id + context['active_ids'] = [bank_statement_id] + # launch the import + self.import_bvr(cr, uid, [wiz_id], context=context) + + +- + I check my bank statement got a statement line +- + !assert {model: account.bank.statement, id: v11_test_bank_statement, string: statement has 1 and only 1 statement line id}: + - len(line_ids) == 1 + +- + I check the voucher linked to the statement line contains a line with an amount of 888.00 +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_test_bank_statement')) + + voucher_line_ids = statement.line_ids[0].voucher_id.line_ids + + assert voucher_line_ids, "No voucher line found" + + voucher_line_amount = voucher_line_ids[0].amount + assert voucher_line_amount == 888.00, "Amount isn't correct : %d" %(voucher_line_amount) + +- + I check amount of account voucher is equal to the bank statement line amount +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_test_bank_statement')) + + statement_line_amount = statement.line_ids[0].amount + voucher_amount = statement.line_ids[0].voucher_id.amount + + assert statement_line_amount == voucher_amount, "Mismatch of amounts" + +- + I enter the closing balance and press on compute button +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_test_bank_statement')) + statement.write({'balance_end_real': 888.00}) + self.button_dummy(cr, uid, [ref('v11_test_bank_statement')], context=context) + +- + I check that the statement Balance is 888.00 +- + !assert {model: account.bank.statement, id: v11_test_bank_statement, string: balance is 888.0}: + - balance_end == 888.0 + +- + I confirm my bank statement +- + !python {model: account.bank.statement}: | + self.button_confirm_bank(cr, uid, [ref('v11_test_bank_statement')], context=context) + +- + I check my invoice is paid, reconciled and has no residual +- + !assert {model: account.invoice, id: v11_test_invoice, string: 'invoice is paid, reconciled and has no residual'}: + - state == "paid" + - reconciled + - residual == 0.0 diff --git a/addons/l10n_ch/test/l10n_ch_v11_part.yml b/addons/l10n_ch/test/l10n_ch_v11_part.yml new file mode 100644 index 00000000000..ea0b88eff79 --- /dev/null +++ b/addons/l10n_ch/test/l10n_ch_v11_part.yml @@ -0,0 +1,292 @@ +- + In order to test the V11 import, + I will create an invoice with a specified reference that I will partialy reconcile with a 1st V11 + And then I will complete the reconcile with a second V11 +- + I create an invoice ref 2000999 of EUR 250.00 +- + !record {model: account.invoice, id: v11_part_test_invoice}: + name: V11 YAML invoice + number: 2000999 + company_id: base.main_company + journal_id: account.bank_journal + currency_id: base.EUR + account_id: account.a_recv + type : out_invoice + partner_id: base.res_partner_agrolait + address_contact_id: base.res_partner_address_8 + address_invoice_id: base.res_partner_address_8 + reference_type: bvr + reference: 20009997 + date_invoice: !eval "'%s-01-01' %(datetime.now().year)" + period_id: account.period_1 + #invoice_line: + partner_bank_id: main_partner_bank + check_total : 250.00 + +- + I create an invoice line +- + !record {model: account.invoice.line, id: v11_part_test_invoice_line}: + account_id: account.a_expense + name: '[PC1] Basic PC' + price_unit: 250.00 + quantity: 1.0 + product_id: product.product_product_pc1 + uos_id: product.product_uom_unit + invoice_id: v11_part_test_invoice + +- + I Validate invoice by clicking on Validate button +- + !workflow {model: account.invoice, action: invoice_open, ref: v11_part_test_invoice} + +- + I specify the invoice number to fit with my v11 +- + !python {model: account.invoice}: | + invoice = self.browse(cr, uid, ref('v11_part_test_invoice')) + invoice.write({'number': 2000999}) + + +- + I create a 1st bank statement + ######################################### + # Creating 1st bank statement # +######################################### +- + !record {model: account.bank.statement, id: v11_part_test_bank_statement_1}: + #account_id: + #balance_end: + #balance_end_cash: + #balance_end_real: + #balance_start: + #closing_date: + #company_id: + #currency: + date: !eval "'%s-01-01' %(datetime.now().year)" + #ending_details_ids: + journal_id: account.bank_journal + #line_ids: + #move_line_ids + name: "/" + period_id: account.period_1 + #starting_details_ids + state: draft + #total_entry_encoding + #user_id + +- + I import the 1st V11 +- + !python {model: bvr.import.wizard}: | + import base64 + import addons + import os + + # create our wizard + wiz_id = self.create(cr,uid,[]) + wiz = self.browse(cr, uid, wiz_id) + + test_file_path = addons.get_module_resource(os.path.join('l10n_ch', 'test', 'test_part_1.v11')) + + # get our test file to test it + f_v11 = open(test_file_path) + + str64_v11 = base64.encodestring(f_v11.read()) + + wiz.write({'file': str64_v11}) + + # set the file in the wizard field + bank_statement_id = ref('v11_part_test_bank_statement_1') + + context['active_id'] = bank_statement_id + context['active_ids'] = [bank_statement_id] + # launch the import + self.import_bvr(cr, uid, [wiz_id], context=context) + + +- + I check my bank statement got a statement line +- + !assert {model: account.bank.statement, id: v11_part_test_bank_statement_1, string: statement has 1 and only 1 statement line id}: + - len(line_ids) == 1 + +- + I check the voucher linked to the statement line contains a line with an amount of EUR 150.00 +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_1')) + + voucher_line_ids = statement.line_ids[0].voucher_id.line_ids + + assert voucher_line_ids, "No voucher line found" + + voucher_line_amount = voucher_line_ids[0].amount + assert voucher_line_amount == 150.00, "Amount isn't correct : %d" %(voucher_line_amount) + +- + I check amount of account voucher is equal to the bank statement line amount +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_1')) + + statement_line_amount = statement.line_ids[0].amount + voucher_amount = statement.line_ids[0].voucher_id.amount + + assert statement_line_amount == voucher_amount, "Mismatch of amounts" + +- + I enter the closing balance and press on compute button +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_1')) + statement.write({'balance_end_real': 150.00}) + self.button_dummy(cr, uid, [ref('v11_part_test_bank_statement_1')], context=context) + +- + I check that the statement Balance is EUR 150.00 +- + !assert {model: account.bank.statement, id: v11_part_test_bank_statement_1, string: balance is 150.0}: + - balance_end == 150.0 + +- + I confirm my 1st bank statement +- + !python {model: account.bank.statement}: | + self.button_confirm_bank(cr, uid, [ref('v11_part_test_bank_statement_1')], context=context) + + +- + I check that my invoice is partially paid in open state, not reconciled, with a residual amount of EUR 100.0 + ######################################### + # Checking partial result # +######################################### +- + !assert {model: account.invoice, id: v11_part_test_invoice, string: 'invoice is open, reconciled and has no residual'}: + - state == "open" + - not reconciled + - residual == 100.0 + + + +- + I create a 2nd bank statement + ######################################### + # Creating 2nd bank statement # +######################################### +- + !record {model: account.bank.statement, id: v11_part_test_bank_statement_2}: + #account_id: + #balance_end: + #balance_end_cash: + #balance_end_real: + #balance_start: + #closing_date: + #company_id: + #currency: + date: !eval "'%s-01-01' %(datetime.now().year)" + #ending_details_ids: + journal_id: account.bank_journal + #line_ids: + #move_line_ids + name: "/" + period_id: account.period_1 + #starting_details_ids + state: draft + #total_entry_encoding + #user_id + +- + I import the 2nd V11 +- + !python {model: bvr.import.wizard}: | + import base64 + import addons + import os + + # create our wizard + wiz_id = self.create(cr,uid,[]) + wiz = self.browse(cr, uid, wiz_id) + + test_file_path = addons.get_module_resource(os.path.join('l10n_ch', 'test', 'test_part_2.v11')) + + # get our test file to test it + f_v11 = open(test_file_path) + + str64_v11 = base64.encodestring(f_v11.read()) + + wiz.write({'file': str64_v11}) + + # set the file in the wizard field + bank_statement_id = ref('v11_part_test_bank_statement_2') + + context['active_id'] = bank_statement_id + context['active_ids'] = [bank_statement_id] + # launch the import + self.import_bvr(cr, uid, [wiz_id], context=context) + + +- + I check my bank statement got a statement line +- + !assert {model: account.bank.statement, id: v11_part_test_bank_statement_2, string: statement has 1 and only 1 statement line id}: + - len(line_ids) == 1 + +- + I check the voucher linked to the statement line contains a line with an amount of EUR 100.00 +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_2')) + + voucher_line_ids = statement.line_ids[0].voucher_id.line_ids + + assert voucher_line_ids, "No voucher line found" + + voucher_line_amount = voucher_line_ids[0].amount + assert voucher_line_amount == 100.00, "Amount isn't correct : %d" %(voucher_line_amount) + +- + I check amount of account voucher is equal to the bank statement line amount +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_2')) + + statement_line_amount = statement.line_ids[0].amount + voucher_amount = statement.line_ids[0].voucher_id.amount + + assert statement_line_amount == voucher_amount, "Mismatch of amounts" + + +- + I enter the closing balance and press on compute button +- + !python {model: account.bank.statement}: | + statement = self.browse(cr, uid, ref('v11_part_test_bank_statement_2')) + statement.write({'balance_end_real': 100.00}) + self.button_dummy(cr, uid, [ref('v11_part_test_bank_statement_2')], context=context) + +- + I check that the statement Balance is EUR 100.00 +- + !assert {model: account.bank.statement, id: v11_part_test_bank_statement_2, string: balance is 100.0}: + - balance_end == 100.0 + +- + I confirm my 2nd bank statement +- + !python {model: account.bank.statement}: | + self.button_confirm_bank(cr, uid, [ref('v11_part_test_bank_statement_2')], context=context) + + + +- + I check my invoice is paid, reconciled and has no residual + ######################################### + # Checking finale state # +######################################### +- + !assert {model: account.invoice, id: v11_part_test_invoice, string: 'invoice is paid, reconciled and has no residual'}: + - state == "paid" + - reconciled + - residual == 0.0 diff --git a/addons/l10n_ch/test/test.v11 b/addons/l10n_ch/test/test.v11 new file mode 100755 index 00000000000..74f3e3217e7 --- /dev/null +++ b/addons/l10n_ch/test/test.v11 @@ -0,0 +1,2 @@ +00201012162700000000000000000001234567600000888000001 000111010111010111010100000000010000000000000
+999010121627999999999999999999999999999000000088800000000000001110102000000000000000000
diff --git a/addons/l10n_ch/test/test_part_1.v11 b/addons/l10n_ch/test/test_part_1.v11 new file mode 100755 index 00000000000..0d20a3e631a --- /dev/null +++ b/addons/l10n_ch/test/test_part_1.v11 @@ -0,0 +1,2 @@ +00201012162700000000000000000002000999700000150000001 000111010111010111010100000000010000000000000
+999010121627999999999999999999999999999000000015000000000000001110102000000000000000000
diff --git a/addons/l10n_ch/test/test_part_2.v11 b/addons/l10n_ch/test/test_part_2.v11 new file mode 100755 index 00000000000..6a336dbd91e --- /dev/null +++ b/addons/l10n_ch/test/test_part_2.v11 @@ -0,0 +1,2 @@ +00201012162700000000000000000002000999700000100000001 000111010511010511010500000000010000000000000
+999010121627999999999999999999999999999000000010000000000000001110106000000000000000000
diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml index 531202cc05d..084159aa36d 100644 --- a/addons/l10n_ch/wizard.xml +++ b/addons/l10n_ch/wizard.xml @@ -7,7 +7,6 @@ Accounts/Generate Chart of Accounts from a Chart Template.</field> <field name="action_id" ref="account.action_wizard_multi_chart"/> <field name="sequence">4</field> - <field name="category_id" ref="account.category_accounting_configuration"/> <field name="type">automatic</field> </record> </data> diff --git a/addons/l10n_ch/wizard/__init__.py b/addons/l10n_ch/wizard/__init__.py index b8530855159..aa1d22666b6 100644 --- a/addons/l10n_ch/wizard/__init__.py +++ b/addons/l10n_ch/wizard/__init__.py @@ -19,7 +19,8 @@ # ############################################################################## -import create_dta -import bvr_import +from . import create_dta +from . import bvr_import +from . import unicode2ascii # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/wizard/bvr_import.py b/addons/l10n_ch/wizard/bvr_import.py index 5fb7bda2a12..31c1e9ab96f 100644 --- a/addons/l10n_ch/wizard/bvr_import.py +++ b/addons/l10n_ch/wizard/bvr_import.py @@ -36,7 +36,9 @@ def _reconstruct_invoice_ref(cursor, user, reference, context=None): user_current=user_obj.browse(cursor, user, user) ## - cursor.execute("SELECT inv.id,inv.number from account_invoice AS inv where inv.company_id = %s" ,(user_current.company_id.id,)) + cursor.execute("SELECT inv.id,inv.number from account_invoice " + "AS inv where inv.company_id = %s and type='out_invoice'", + (user_current.company_id.id,)) result_invoice = cursor.fetchall() REF = re.compile('[^0-9]') for inv_id,inv_name in result_invoice: @@ -60,7 +62,6 @@ def _reconstruct_invoice_ref(cursor, user, reference, context=None): def _import(self, cursor, user, data, context=None): statement_line_obj = self.pool.get('account.bank.statement.line') -# statement_reconcile_obj = pool.get('account.bank.statement.reconcile') voucher_obj = self.pool.get('account.voucher') voucher_line_obj = self.pool.get('account.voucher.line') move_line_obj = self.pool.get('account.move.line') @@ -191,8 +192,8 @@ def _import(self, cursor, user, data, context=None): voucher_line_dict = line_dict if voucher_line_dict: voucher_line_dict.update({'voucher_id':voucher_id}) - voucher_line_obj.create(cursor, user, voucher_line_dict, context=context) - + voucher_line_obj.create(cursor, user, voucher_line_dict, context=context) + if not account_id: if record['amount'] >= 0: account_id = account_receivable @@ -204,10 +205,10 @@ def _import(self, cursor, user, data, context=None): if record['amount'] < 0: name = "property_account_payable" prop = property_obj.search( - cursor, + cursor, user, [ - ('name','=','property_account_receivable'), + ('name','=',name), ('company_id','=',statement.company_id.id), ('res_id', '=', False) ] @@ -226,9 +227,9 @@ def _import(self, cursor, user, data, context=None): values['partner_id'] = partner_id statement_line_obj.create(cursor, user, values, context=context) attachment_obj.create(cursor, user, { - 'name': 'BVR', + 'name': 'BVR %s'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()), 'datas': file, - 'datas_fname': 'BVR.txt', + 'datas_fname': 'BVR %s.txt'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()), 'res_model': 'account.bank.statement', 'res_id': statement_id, }, context=context) @@ -238,7 +239,7 @@ def _import(self, cursor, user, data, context=None): class bvr_import_wizard(osv.osv_memory): _name = 'bvr.import.wizard' _columns = { - 'file':fields.binary('BVR File', required=True) + 'file':fields.binary('BVR File', readonly=True) } def import_bvr(self, cr, uid, ids, context=None): diff --git a/addons/l10n_ch/wizard/create_dta.py b/addons/l10n_ch/wizard/create_dta.py index add32f26e01..7abb1d7ca7c 100644 --- a/addons/l10n_ch/wizard/create_dta.py +++ b/addons/l10n_ch/wizard/create_dta.py @@ -26,6 +26,7 @@ import base64 from osv import osv, fields import pooler from tools.translate import _ +import unicode2ascii TRANS=[ (u'é','e'), @@ -38,6 +39,24 @@ TRANS=[ (u'ä','a'), ] +def _u2a(text) : + """Tries to convert unicode charactere to asci equivalence""" + if not text : return "" + txt = "" + for c in text: + if ord(c) < 128 : + txt += c + elif c in unicode2ascii.EXTRA_LATIN_NAMES : + txt += unicode2ascii.EXTRA_LATIN_NAMES[c] + elif c in unicode2ascii.UNI2ASCII_CONVERSIONS : + txt += unicode2ascii.UNI2ASCII_CONVERSIONS[c] + elif c in unicode2ascii.EXTRA_CHARACTERS : + txt += unicode2ascii.EXTRA_CHARACTERS[c] + elif c in unicode2ascii.FG_HACKS : + txt += unicode2ascii.FG_HACKS[c] + else : txt+= "_" + return txt + def tr(string_in): try: string_in= string_in.decode('utf-8') @@ -339,7 +358,9 @@ def _create_dta(obj, cr, uid, data, context=None): if context is None: context = {} payment = payment_obj.browse(cr, uid, data['id'], context=context) - + # if payment.state != 'done': + # raise osv.except_osv(_('Order not confirmed'), + # _('Please confirm it')) if not payment.mode: raise osv.except_osv(_('Error'), _('No payment mode')) @@ -365,11 +386,13 @@ def _create_dta(obj, cr, uid, data, context=None): v['comp_name'] = co_addr.name v['comp_dta'] = bank.dta_code or '' #XXX not mandatory in pratice - v['comp_bank_number'] = bank.acc_number or '' - if bank.iban: - v['comp_bank_iban'] = bank.iban.replace(' ','') or '' - else: - v['comp_bank_iban'] = '' + # iban and account number are the same field and depends only on the type of account + v['comp_bank_iban'] = v['comp_bank_number'] = bank.acc_number or '' + + #if bank.iban: + # v['comp_bank_iban'] = bank.iban.replace(' ','') or '' + #else: + # v['comp_bank_iban'] = '' if not v['comp_bank_iban']: raise osv.except_osv(_('Error'), _('No IBAN for the company bank account.')) @@ -403,7 +426,7 @@ def _create_dta(obj, cr, uid, data, context=None): 'on the partner: %s\n' \ 'on line: %s') % (pline.bank_id.state, pline.partner_id.name, pline.name)) - v['partner_bank_iban'] = pline.bank_id.iban or False + v['partner_bank_iban'] = pline.bank_id.acc_number or False v['partner_bank_number'] = pline.bank_id.acc_number \ and pline.bank_id.acc_number.replace('.','').replace('-','') \ or False @@ -468,7 +491,7 @@ def _create_dta(obj, cr, uid, data, context=None): # si payment structure -> bvr (826) # si non -> (827) - if elec_pay == 'dta_iban': + if elec_pay == 'iban': # If iban => country=country code for space reason v['comp_country'] = co_addr.country_id and co_addr.country_id.code+'-' or '' record_type = record_gt836 @@ -512,13 +535,10 @@ def _create_dta(obj, cr, uid, data, context=None): elif elec_pay == 'bvbank': if not v['partner_bank_number'] : - if v['partner_bank_iban'] : - v['partner_bank_number']= v['partner_bank_iban'] - else: - raise osv.except_osv(_('Error'), _('You must provide ' \ - 'a bank number \n' \ - 'for the partner bank: %s\n' \ - 'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name)) + raise osv.except_osv(_('Error'), _('You must provide ' \ + 'a bank number \n' \ + 'for the partner bank: %s\n' \ + 'on line: %s') % (res_partner_bank_obj.name_get(cr, uid, [pline.bank_id.id], context)[0][1] , pline.name)) if not v['partner_bank_clearing']: raise osv.except_osv(_('Error'), _('You must provide ' \ 'a Clearing Number\n' \ @@ -551,17 +571,17 @@ def _create_dta(obj, cr, uid, data, context=None): v['sequence'] = str(seq).rjust(5).replace(' ','0') if dta : dta = dta + record_gt890(v).generate() - + dta_data = _u2a(dta) dta_data = base64.encodestring(dta) payment_obj.set_done(cr, uid, [data['id']], context) attachment_obj.create(cr, uid, { - 'name': 'DTA', + 'name': 'DTA%s'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()), 'datas': dta_data, - 'datas_fname': 'DTA.txt', + 'datas_fname': 'DTA%s.txt'%time.strftime("%Y-%m-%d_%H:%M:%S", time.gmtime()), 'res_model': 'payment.order', 'res_id': data['id'], }, context=context) - return {'dta': dta_data} + return dta_data class create_dta_wizard(osv.osv_memory): _name="create.dta.wizard" @@ -572,6 +592,11 @@ class create_dta_wizard(osv.osv_memory): def create_dta(self, cr, uid, ids, context=None): if not context: context = {} + if isinstance(ids, list): + req_id = ids[0] + else: + req_id = ids + current = self.browse(cr, uid, req_id, context) data = {} active_ids = context.get('active_ids', []) active_id = context.get('active_id', []) @@ -579,26 +604,9 @@ class create_dta_wizard(osv.osv_memory): data['ids'] = active_ids data['id'] = active_id dta_file = _create_dta(self, cr, uid, data, context) - context.update({'dta_file':dta_file}) - return self.save_dta(cr, uid, ids, context) - - def save_dta(self, cr, uid, ids, context=None): - obj_model = self.pool.get('ir.model.data') - if context is None: - context = {} - model_data_ids = obj_model.search(cr,uid,[('model','=','ir.ui.view'), ('name','=','dta_save_view')]) - resource_id = obj_model.read(cr, uid, model_data_ids, fields=['res_id'])[0]['res_id'] - return { - 'view_type': 'form', - 'view_mode': 'form', - 'res_model': 'create.dta.wizard', - 'views': [(resource_id, 'form')], - 'type': 'ir.actions.act_window', - 'target': 'new', - 'context': context, - } - + current.write({'dta_file': dta_file}) + return True create_dta_wizard() -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/wizard/create_dta_view.xml b/addons/l10n_ch/wizard/create_dta_view.xml index 6a0732c56e9..53d0cdc42d8 100644 --- a/addons/l10n_ch/wizard/create_dta_view.xml +++ b/addons/l10n_ch/wizard/create_dta_view.xml @@ -9,10 +9,11 @@ <field name="arch" type="xml"> <form string="DTA file creation - Results"> <group width="300" colspan="4"> - <separator string="Create DTA" colspan="4"/> + <separator string="Create DTA - (DTA file will appear after you click on create)" colspan="4"/> + <field name="dta_file"/> <group colspan="4"> <button special="cancel" string="Cancel" icon="gtk-cancel" colspan="2"/> - <button name="create_dta" string="Create DTA" type="object" icon="gtk-ok" colspan="2"/> + <button name="create_dta" string="Create DTA" type="object" icon="gtk-execute" colspan="2"/> </group> </group> </form> @@ -38,21 +39,5 @@ <field name="key">action</field> <field name="model">payment.order</field> </record> - - <!-- Save DTA --> - <record id="dta_save_view" model="ir.ui.view"> - <field name="name">Save DTA</field> - <field name="model">create.dta.wizard</field> - <field name="type">form</field> - <field name="arch" type="xml"> - <form string="DTA file creation - Results"> - <group width="500" colspan="4"> - <separator colspan="4" string="Click on 'Save as' to save the DTA file :" /> - <field name="dta_file"/> - </group> - </form> - </field> - </record> - </data> </openerp>
\ No newline at end of file diff --git a/addons/l10n_ch/wizard/unicode2ascii.py b/addons/l10n_ch/wizard/unicode2ascii.py new file mode 100644 index 00000000000..7d95a4ab714 --- /dev/null +++ b/addons/l10n_ch/wizard/unicode2ascii.py @@ -0,0 +1,592 @@ +# -*- encoding: utf-8 -*- + +"""Convert many unicode characters to ascii characters that are like them. + +I want to collate names, with the property that a last name starting with +O-umlaut will be in with the last name's starting with O. Horrors! + +So I want that many Latin-1 characters have their umlaute's, etc., stripped. +Some of it can be done automatically but some needs to be done by hand, that +I can tell. +""" +__version__='1.0.1' +__author__='Jim Hefferon: ftpmaint at tug.ctan.org' +__date__='2008-July-15' +__notes__="""As sources, used effbot's web site, and + http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/251871 +and + man uni2ascii +""" + +import os, os.path, sys, re +import unicodedata + +# These characters that are not done automatically by NFKD, and +# have a name starting with "LATIN". Some of these I found on the interwebs, +# but some I did by eye. Corrections or additions appreciated. +EXTRA_LATIN_NAMES={ + # First are ones I got off the interweb + u"\N{LATIN CAPITAL LETTER O WITH STROKE}": u"O", + u"\N{LATIN SMALL LETTER A WITH GRAVE}": u"a", + u"\N{LATIN SMALL LETTER A WITH ACUTE}": u"a", + u"\N{LATIN SMALL LETTER A WITH CIRCUMFLEX}": u"a", + u"\N{LATIN SMALL LETTER A WITH TILDE}": u"a", + u"\N{LATIN SMALL LETTER A WITH DIAERESIS}": u"ae", + u"\N{LATIN SMALL LETTER A WITH RING ABOVE}": u"a", + u"\N{LATIN SMALL LETTER C WITH CEDILLA}": u"c", + u"\N{LATIN SMALL LETTER E WITH GRAVE}": u"e", + u"\N{LATIN SMALL LETTER E WITH ACUTE}": u"e", + u"\N{LATIN SMALL LETTER E WITH CIRCUMFLEX}": u"e", + u"\N{LATIN SMALL LETTER E WITH DIAERESIS}": u"e", + u"\N{LATIN SMALL LETTER I WITH GRAVE}": u"i", + u"\N{LATIN SMALL LETTER I WITH ACUTE}": u"i", + u"\N{LATIN SMALL LETTER I WITH CIRCUMFLEX}": u"i", + u"\N{LATIN SMALL LETTER I WITH DIAERESIS}": u"i", + u"\N{LATIN SMALL LETTER N WITH TILDE}": u"n", + u"\N{LATIN SMALL LETTER O WITH GRAVE}": u"o", + u"\N{LATIN SMALL LETTER O WITH ACUTE}": u"o", + u"\N{LATIN SMALL LETTER O WITH CIRCUMFLEX}": u"o", + u"\N{LATIN SMALL LETTER O WITH TILDE}": u"o", + u"\N{LATIN SMALL LETTER O WITH DIAERESIS}": u"oe", + u"\N{LATIN SMALL LETTER O WITH STROKE}": u"o", + u"\N{LATIN SMALL LETTER U WITH GRAVE}": u"u", + u"\N{LATIN SMALL LETTER U WITH ACUTE}": u"u", + u"\N{LATIN SMALL LETTER U WITH CIRCUMFLEX}": u"u", + u"\N{LATIN SMALL LETTER U WITH DIAERESIS}": u"ue", + u"\N{LATIN SMALL LETTER Y WITH ACUTE}": u"y", + u"\N{LATIN SMALL LETTER Y WITH DIAERESIS}": u"y", + u"\N{LATIN SMALL LETTER A WITH MACRON}": u"a", + u"\N{LATIN SMALL LETTER A WITH BREVE}": u"a", + u"\N{LATIN SMALL LETTER C WITH ACUTE}": u"c", + u"\N{LATIN SMALL LETTER C WITH CIRCUMFLEX}": u"c", + u"\N{LATIN SMALL LETTER E WITH MACRON}": u"e", + u"\N{LATIN SMALL LETTER E WITH BREVE}": u"e", + u"\N{LATIN SMALL LETTER G WITH CIRCUMFLEX}": u"g", + u"\N{LATIN SMALL LETTER G WITH BREVE}": u"g", + u"\N{LATIN SMALL LETTER G WITH CEDILLA}": u"g", + u"\N{LATIN SMALL LETTER H WITH CIRCUMFLEX}": u"h", + u"\N{LATIN SMALL LETTER I WITH TILDE}": u"i", + u"\N{LATIN SMALL LETTER I WITH MACRON}": u"i", + u"\N{LATIN SMALL LETTER I WITH BREVE}": u"i", + u"\N{LATIN SMALL LETTER J WITH CIRCUMFLEX}": u"j", + u"\N{LATIN SMALL LETTER K WITH CEDILLA}": u"k", + u"\N{LATIN SMALL LETTER L WITH ACUTE}": u"l", + u"\N{LATIN SMALL LETTER L WITH CEDILLA}": u"l", + u"\N{LATIN CAPITAL LETTER L WITH STROKE}": u"L", + u"\N{LATIN SMALL LETTER L WITH STROKE}": u"l", + u"\N{LATIN SMALL LETTER N WITH ACUTE}": u"n", + u"\N{LATIN SMALL LETTER N WITH CEDILLA}": u"n", + u"\N{LATIN SMALL LETTER O WITH MACRON}": u"o", + u"\N{LATIN SMALL LETTER O WITH BREVE}": u"o", + u"\N{LATIN SMALL LETTER R WITH ACUTE}": u"r", + u"\N{LATIN SMALL LETTER R WITH CEDILLA}": u"r", + u"\N{LATIN SMALL LETTER S WITH ACUTE}": u"s", + u"\N{LATIN SMALL LETTER S WITH CIRCUMFLEX}": u"s", + u"\N{LATIN SMALL LETTER S WITH CEDILLA}": u"s", + u"\N{LATIN SMALL LETTER T WITH CEDILLA}": u"t", + u"\N{LATIN SMALL LETTER U WITH TILDE}": u"u", + u"\N{LATIN SMALL LETTER U WITH MACRON}": u"u", + u"\N{LATIN SMALL LETTER U WITH BREVE}": u"u", + u"\N{LATIN SMALL LETTER U WITH RING ABOVE}": u"u", + u"\N{LATIN SMALL LETTER W WITH CIRCUMFLEX}": u"w", + u"\N{LATIN SMALL LETTER Y WITH CIRCUMFLEX}": u"y", + u"\N{LATIN SMALL LETTER Z WITH ACUTE}": u"z", + u"\N{LATIN SMALL LETTER W WITH GRAVE}": u"w", + u"\N{LATIN SMALL LETTER W WITH ACUTE}": u"w", + u"\N{LATIN SMALL LETTER W WITH DIAERESIS}": u"w", + u"\N{LATIN SMALL LETTER Y WITH GRAVE}": u"y", + # Below are the ones that failed automated conversion + u'\N{LATIN CAPITAL LETTER AE}': u'AE', + u'\N{LATIN CAPITAL LETTER ETH}': u'D', + u"\N{LATIN CAPITAL LETTER A WITH DIAERESIS}": u"Ae", + u"\N{LATIN CAPITAL LETTER O WITH DIAERESIS}": u"Oe", + u"\N{LATIN CAPITAL LETTER U WITH DIAERESIS}": u"Ue", + u'\N{LATIN CAPITAL LETTER O WITH STROKE}': u'O', + u'\N{LATIN CAPITAL LETTER THORN}': u'TH', + u'\N{LATIN SMALL LETTER SHARP S}': u'ss', + u'\N{LATIN SMALL LETTER AE}': u'ae', + u'\N{LATIN SMALL LETTER ETH}': u'd', + u'\N{LATIN SMALL LETTER O WITH STROKE}': u'o', + u'\N{LATIN SMALL LETTER THORN}': 'th', + u'\N{LATIN CAPITAL LETTER D WITH STROKE}': u'D', + u'\N{LATIN SMALL LETTER D WITH STROKE}': u'd', + u'\N{LATIN CAPITAL LETTER H WITH STROKE}': u'H', + u'\N{LATIN SMALL LETTER H WITH STROKE}': u'h', + u'\N{LATIN SMALL LETTER DOTLESS I}': u'i', + u'\N{LATIN SMALL LETTER KRA}': u'q', + u'\N{LATIN CAPITAL LETTER L WITH STROKE}': u'L', + u'\N{LATIN SMALL LETTER L WITH STROKE}': u'l', + u'\N{LATIN CAPITAL LETTER ENG}': u'N', + u'\N{LATIN SMALL LETTER ENG}': u'n', + u'\N{LATIN CAPITAL LIGATURE OE}': u'OE', + u'\N{LATIN SMALL LIGATURE OE}': u'oe', + u'\N{LATIN CAPITAL LETTER T WITH STROKE}': u'T', + u'\N{LATIN SMALL LETTER T WITH STROKE}': u't', + u'\N{LATIN SMALL LETTER B WITH STROKE}': u'b', + u'\N{LATIN CAPITAL LETTER B WITH HOOK}': u'B', + u'\N{LATIN CAPITAL LETTER B WITH TOPBAR}': u'B', + u'\N{LATIN SMALL LETTER B WITH TOPBAR}': u'b', + # u'\N{LATIN CAPITAL LETTER TONE SIX}': u'', # ?B + # u'\N{LATIN SMALL LETTER TONE SIX}': u'', # ?b + u'\N{LATIN CAPITAL LETTER OPEN O}': u'O', + u'\N{LATIN CAPITAL LETTER C WITH HOOK}': u'C', + u'\N{LATIN SMALL LETTER C WITH HOOK}': u'c', + u'\N{LATIN CAPITAL LETTER AFRICAN D}': u'D', + u'\N{LATIN CAPITAL LETTER D WITH HOOK}': u'D', + u'\N{LATIN CAPITAL LETTER D WITH TOPBAR}': u'D', + u'\N{LATIN SMALL LETTER D WITH TOPBAR}': u'd', + # u'\N{LATIN SMALL LETTER TURNED DELTA}': u'', + u'\N{LATIN CAPITAL LETTER REVERSED E}': u'E', + # u'\N{LATIN CAPITAL LETTER SCHWA}': u'', + u'\N{LATIN CAPITAL LETTER OPEN E}': u'E', + u'\N{LATIN CAPITAL LETTER F WITH HOOK}': u'F', + u'\N{LATIN SMALL LETTER F WITH HOOK}': u'f', + u'\N{LATIN CAPITAL LETTER G WITH HOOK}': u'G', + # u'\N{LATIN CAPITAL LETTER GAMMA}': u'', + u'\N{LATIN SMALL LETTER HV}': u'hv', + u'\N{LATIN CAPITAL LETTER IOTA}': u'i', + u'\N{LATIN CAPITAL LETTER I WITH STROKE}': u'I', + u'\N{LATIN CAPITAL LETTER K WITH HOOK}': u'K', + u'\N{LATIN SMALL LETTER K WITH HOOK}': u'k', + u'\N{LATIN SMALL LETTER L WITH BAR}': u'l', + # u'\N{LATIN SMALL LETTER LAMBDA WITH STROKE}': u'', + # u'\N{LATIN CAPITAL LETTER TURNED M}': u'', + u'\N{LATIN CAPITAL LETTER N WITH LEFT HOOK}': u'N', + u'\N{LATIN SMALL LETTER N WITH LONG RIGHT LEG}': u'N', + u'\N{LATIN CAPITAL LETTER O WITH MIDDLE TILDE}': u'O', + u'\N{LATIN CAPITAL LETTER OI}': u'OI', + u'\N{LATIN SMALL LETTER OI}': u'oi', + u'\N{LATIN CAPITAL LETTER P WITH HOOK}': u'P', + u'\N{LATIN SMALL LETTER P WITH HOOK}': u'p', + # u'\N{LATIN LETTER YR}': u'', + # u'\N{LATIN CAPITAL LETTER TONE TWO}': u'', + # u'\N{LATIN SMALL LETTER TONE TWO}': u'', + u'\N{LATIN CAPITAL LETTER ESH}': u'SH', + # u'\N{LATIN LETTER REVERSED ESH LOOP}': u'', + u'\N{LATIN SMALL LETTER T WITH PALATAL HOOK}': u't', + u'\N{LATIN CAPITAL LETTER T WITH HOOK}': u'T', + u'\N{LATIN SMALL LETTER T WITH HOOK}': u't', + u'\N{LATIN CAPITAL LETTER T WITH RETROFLEX HOOK}': u'T', + # u'\N{LATIN CAPITAL LETTER UPSILON}': u'', + u'\N{LATIN CAPITAL LETTER V WITH HOOK}': u'V', + u'\N{LATIN CAPITAL LETTER Y WITH HOOK}': u'Y', + u'\N{LATIN SMALL LETTER Y WITH HOOK}': u'y', + u'\N{LATIN CAPITAL LETTER Z WITH STROKE}': u'Z', + u'\N{LATIN SMALL LETTER Z WITH STROKE}': u'z', + u'\N{LATIN CAPITAL LETTER EZH}': u'S', + # u'\N{LATIN CAPITAL LETTER EZH REVERSED}': u'', + # u'\N{LATIN SMALL LETTER EZH REVERSED}': u'', + u'\N{LATIN SMALL LETTER EZH WITH TAIL}': u's', + # u'\N{LATIN LETTER TWO WITH STROKE}': u'', + # u'\N{LATIN CAPITAL LETTER TONE FIVE}': u'', + # u'\N{LATIN SMALL LETTER TONE FIVE}': u'', + # u'\N{LATIN LETTER INVERTED GLOTTAL STOP WITH STROKE}': u'', + u'\N{LATIN LETTER WYNN}': u'w', + # u'\N{LATIN LETTER DENTAL CLICK}': u'', + # u'\N{LATIN LETTER LATERAL CLICK}': u'', + # u'\N{LATIN LETTER ALVEOLAR CLICK}': u'', + # u'\N{LATIN LETTER RETROFLEX CLICK}': u'', + # u'\N{LATIN SMALL LETTER TURNED E}': u'', + u'\N{LATIN CAPITAL LETTER AE WITH MACRON}': u'AE', + u'\N{LATIN SMALL LETTER AE WITH MACRON}': u'ae', + u'\N{LATIN CAPITAL LETTER G WITH STROKE}': u'G', + u'\N{LATIN SMALL LETTER G WITH STROKE}': u'g', + u'\N{LATIN CAPITAL LETTER EZH WITH CARON}': u'S', + u'\N{LATIN SMALL LETTER EZH WITH CARON}': u's', + u'\N{LATIN CAPITAL LETTER HWAIR}': u'HW', + u'\N{LATIN CAPITAL LETTER WYNN}': u'W', + u'\N{LATIN CAPITAL LETTER AE WITH ACUTE}': u'AE', + u'\N{LATIN SMALL LETTER AE WITH ACUTE}': u'AE', + u'\N{LATIN CAPITAL LETTER O WITH STROKE AND ACUTE}': u'O', + u'\N{LATIN SMALL LETTER O WITH STROKE AND ACUTE}': u'o', + u'\N{LATIN CAPITAL LETTER YOGH}': u'J', + u'\N{LATIN SMALL LETTER YOGH}': u'j', + u'\N{LATIN CAPITAL LETTER N WITH LONG RIGHT LEG}': u'N', + u'\N{LATIN SMALL LETTER D WITH CURL}': u'd', + u'\N{LATIN CAPITAL LETTER OU}': u'OU', + u'\N{LATIN SMALL LETTER OU}': u'ou', + u'\N{LATIN CAPITAL LETTER Z WITH HOOK}': u'Z', + u'\N{LATIN SMALL LETTER Z WITH HOOK}': u'z', + u'\N{LATIN SMALL LETTER L WITH CURL}': u'l', + u'\N{LATIN SMALL LETTER N WITH CURL}': u'n', + u'\N{LATIN SMALL LETTER T WITH CURL}': u't', + u'\N{LATIN SMALL LETTER DOTLESS J}': u'j', + u'\N{LATIN SMALL LETTER DB DIGRAPH}': u'db', + u'\N{LATIN SMALL LETTER QP DIGRAPH}': u'qp', + u'\N{LATIN CAPITAL LETTER A WITH STROKE}': u'A', + u'\N{LATIN CAPITAL LETTER C WITH STROKE}': u'C', + u'\N{LATIN SMALL LETTER C WITH STROKE}': u'C', + u'\N{LATIN CAPITAL LETTER L WITH BAR}': u'L', + u'\N{LATIN CAPITAL LETTER T WITH DIAGONAL STROKE}': u'T', + u'\N{LATIN SMALL LETTER S WITH SWASH TAIL}': u'S', + u'\N{LATIN SMALL LETTER Z WITH SWASH TAIL}': u'Z', + # u'\N{LATIN CAPITAL LETTER GLOTTAL STOP}': u'', + # u'\N{LATIN SMALL LETTER TURNED A}': u'', + # u'\N{LATIN SMALL LETTER ALPHA}': u'', + # u'\N{LATIN SMALL LETTER TURNED ALPHA}': u'', + u'\N{LATIN SMALL LETTER B WITH HOOK}': u'b', + u'\N{LATIN SMALL LETTER OPEN O}': u'o', + u'\N{LATIN SMALL LETTER C WITH CURL}': u'c', + u'\N{LATIN SMALL LETTER D WITH TAIL}': u'd', + u'\N{LATIN SMALL LETTER D WITH HOOK}': u'd', + # u'\N{LATIN SMALL LETTER REVERSED E}': u'', + # u'\N{LATIN SMALL LETTER SCHWA}': u'', + # u'\N{LATIN SMALL LETTER SCHWA WITH HOOK}': u'', + u'\N{LATIN SMALL LETTER OPEN E}': u'e', + # u'\N{LATIN SMALL LETTER REVERSED OPEN E}': u'', + # u'\N{LATIN SMALL LETTER REVERSED OPEN E WITH HOOK}': u'', + # u'\N{LATIN SMALL LETTER CLOSED REVERSED OPEN E}': u'', + u'\N{LATIN SMALL LETTER DOTLESS J WITH STROKE}': u'j', + u'\N{LATIN SMALL LETTER G WITH HOOK}': u'g', + u'\N{LATIN SMALL LETTER SCRIPT G}': u'g', + u'\N{LATIN LETTER SMALL CAPITAL G}': u'G', + # u'\N{LATIN SMALL LETTER GAMMA}': u'', + # u'\N{LATIN SMALL LETTER RAMS HORN}': u'', + # u'\N{LATIN SMALL LETTER TURNED H}': u'', + u'\N{LATIN SMALL LETTER H WITH HOOK}': u'h', + u'\N{LATIN SMALL LETTER HENG WITH HOOK}': u'h', + u'\N{LATIN SMALL LETTER I WITH STROKE}': u'i', + # u'\N{LATIN SMALL LETTER IOTA}': u'', + u'\N{LATIN LETTER SMALL CAPITAL I}': u'I', + u'\N{LATIN SMALL LETTER L WITH MIDDLE TILDE}': u'L', + u'\N{LATIN SMALL LETTER L WITH BELT}': u'L', + u'\N{LATIN SMALL LETTER L WITH RETROFLEX HOOK}': u'L', + # u'\N{LATIN SMALL LETTER LEZH}': u'', + # u'\N{LATIN SMALL LETTER TURNED M}': u'', + # u'\N{LATIN SMALL LETTER TURNED M WITH LONG LEG}': u'', + u'\N{LATIN SMALL LETTER M WITH HOOK}': u'm', + u'\N{LATIN SMALL LETTER N WITH LEFT HOOK}': u'n', + u'\N{LATIN SMALL LETTER N WITH RETROFLEX HOOK}': u'n', + u'\N{LATIN LETTER SMALL CAPITAL N}': u'N', + u'\N{LATIN SMALL LETTER BARRED O}': u'o', + u'\N{LATIN LETTER SMALL CAPITAL OE}': u'OE', + # u'\N{LATIN SMALL LETTER CLOSED OMEGA}': u'', + # u'\N{LATIN SMALL LETTER PHI}': u'', + # u'\N{LATIN SMALL LETTER TURNED R}': u'', + # u'\N{LATIN SMALL LETTER TURNED R WITH LONG LEG}': u'', + # u'\N{LATIN SMALL LETTER TURNED R WITH HOOK}': u'', + u'\N{LATIN SMALL LETTER R WITH LONG LEG}': u'r', + u'\N{LATIN SMALL LETTER R WITH TAIL}': u'r', + u'\N{LATIN SMALL LETTER R WITH FISHHOOK}': u'r', + # u'\N{LATIN SMALL LETTER REVERSED R WITH FISHHOOK}': u'', + u'\N{LATIN LETTER SMALL CAPITAL R}': u'R', + # u'\N{LATIN LETTER SMALL CAPITAL INVERTED R}': u'', + u'\N{LATIN SMALL LETTER S WITH HOOK}': u's', + u'\N{LATIN SMALL LETTER ESH}': u'sh', + u'\N{LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK}': u'j', + # u'\N{LATIN SMALL LETTER SQUAT REVERSED ESH}': u'', + u'\N{LATIN SMALL LETTER ESH WITH CURL}': u'sh', + # u'\N{LATIN SMALL LETTER TURNED T}': u'', + u'\N{LATIN SMALL LETTER T WITH RETROFLEX HOOK}': u't', + u'\N{LATIN SMALL LETTER U BAR}': u'u', + # u'\N{LATIN SMALL LETTER UPSILON}': u'', + u'\N{LATIN SMALL LETTER V WITH HOOK}': u'v', + # u'\N{LATIN SMALL LETTER TURNED V}': u'', + # u'\N{LATIN SMALL LETTER TURNED W}': u'', + # u'\N{LATIN SMALL LETTER TURNED Y}': u'', + u'\N{LATIN LETTER SMALL CAPITAL Y}': u'Y', + u'\N{LATIN SMALL LETTER Z WITH RETROFLEX HOOK}': u'z', + u'\N{LATIN SMALL LETTER Z WITH CURL}': u'z', + u'\N{LATIN SMALL LETTER EZH}': u's', + u'\N{LATIN SMALL LETTER EZH WITH CURL}': u's', + # u'\N{LATIN LETTER GLOTTAL STOP}': u'', + # u'\N{LATIN LETTER PHARYNGEAL VOICED FRICATIVE}': u'', + # u'\N{LATIN LETTER INVERTED GLOTTAL STOP}': u'', + u'\N{LATIN LETTER STRETCHED C}': u'c', + # u'\N{LATIN LETTER BILABIAL CLICK}': u'', + u'\N{LATIN LETTER SMALL CAPITAL B}': u'B', + u'\N{LATIN SMALL LETTER CLOSED OPEN E}': u'e', + u'\N{LATIN LETTER SMALL CAPITAL G WITH HOOK}': u'G', + u'\N{LATIN LETTER SMALL CAPITAL H}': u'H', + u'\N{LATIN SMALL LETTER J WITH CROSSED-TAIL}': u'j', + # u'\N{LATIN SMALL LETTER TURNED K}': u'', + u'\N{LATIN LETTER SMALL CAPITAL L}': u'L', + u'\N{LATIN SMALL LETTER Q WITH HOOK}': u'q', + # u'\N{LATIN LETTER GLOTTAL STOP WITH STROKE}': u'', + # u'\N{LATIN LETTER REVERSED GLOTTAL STOP WITH STROKE}': u'', + # u'\N{LATIN SMALL LETTER DZ DIGRAPH}': u'', + # u'\N{LATIN SMALL LETTER DEZH DIGRAPH}': u'', + # u'\N{LATIN SMALL LETTER DZ DIGRAPH WITH CURL}': u'', + # u'\N{LATIN SMALL LETTER TS DIGRAPH}': u'', + # u'\N{LATIN SMALL LETTER TESH DIGRAPH}': u'', + # u'\N{LATIN SMALL LETTER TC DIGRAPH WITH CURL}': u'', + # u'\N{LATIN SMALL LETTER FENG DIGRAPH}': u'', + # u'\N{LATIN SMALL LETTER LS DIGRAPH}': u'', + # u'\N{LATIN SMALL LETTER LZ DIGRAPH}': u'', + # u'\N{LATIN LETTER BILABIAL PERCUSSIVE}': u'', + # u'\N{LATIN LETTER BIDENTAL PERCUSSIVE}': u'', + # u'\N{LATIN SMALL LETTER TURNED H WITH FISHHOOK}': u'', + # u'\N{LATIN SMALL LETTER TURNED H WITH FISHHOOK AND TAIL}': u'', + u'\N{LATIN LETTER SMALL CAPITAL A}': u'A', + u'\N{LATIN LETTER SMALL CAPITAL AE}': u'AE', + # u'\N{LATIN SMALL LETTER TURNED AE}': u'', + u'\N{LATIN LETTER SMALL CAPITAL BARRED B}': u'B', + u'\N{LATIN LETTER SMALL CAPITAL C}': u'C', + u'\N{LATIN LETTER SMALL CAPITAL D}': u'D', + u'\N{LATIN LETTER SMALL CAPITAL ETH}': u'D', + u'\N{LATIN LETTER SMALL CAPITAL E}': u'E', + # u'\N{LATIN SMALL LETTER TURNED OPEN E}': u'', + # u'\N{LATIN SMALL LETTER TURNED I}': u'', + u'\N{LATIN LETTER SMALL CAPITAL J}': u'J', + u'\N{LATIN LETTER SMALL CAPITAL K}': u'K', + u'\N{LATIN LETTER SMALL CAPITAL L WITH STROKE}': u'L', + u'\N{LATIN LETTER SMALL CAPITAL M}': u'M', + # u'\N{LATIN LETTER SMALL CAPITAL REVERSED N}': u'', + u'\N{LATIN LETTER SMALL CAPITAL O}': u'O', + u'\N{LATIN LETTER SMALL CAPITAL OPEN O}': u'O', + # u'\N{LATIN SMALL LETTER SIDEWAYS O}': u'', + # u'\N{LATIN SMALL LETTER SIDEWAYS OPEN O}': u'', + # u'\N{LATIN SMALL LETTER SIDEWAYS O WITH STROKE}': u'', + # u'\N{LATIN SMALL LETTER TURNED OE}': u'', + u'\N{LATIN LETTER SMALL CAPITAL OU}': u'OU', + # u'\N{LATIN SMALL LETTER TOP HALF O}': u'', + # u'\N{LATIN SMALL LETTER BOTTOM HALF O}': u'', + u'\N{LATIN LETTER SMALL CAPITAL P}': u'P', + # u'\N{LATIN LETTER SMALL CAPITAL REVERSED R}': u'', + # u'\N{LATIN LETTER SMALL CAPITAL TURNED R}': u'', + u'\N{LATIN LETTER SMALL CAPITAL T}': u'T', + u'\N{LATIN LETTER SMALL CAPITAL U}': u'U', + # u'\N{LATIN SMALL LETTER SIDEWAYS U}': u'', + # u'\N{LATIN SMALL LETTER SIDEWAYS DIAERESIZED U}': u'', + # u'\N{LATIN SMALL LETTER SIDEWAYS TURNED M}': u'', + u'\N{LATIN LETTER SMALL CAPITAL V}': u'V', + u'\N{LATIN LETTER SMALL CAPITAL W}': u'W', + u'\N{LATIN LETTER SMALL CAPITAL Z}': u'', + u'\N{LATIN LETTER SMALL CAPITAL EZH}': u'S', + # u'\N{LATIN LETTER VOICED LARYNGEAL SPIRANT}': u'', + # u'\N{LATIN LETTER AIN}': u'', + u'\N{LATIN SMALL LETTER UE}': u'ue', + u'\N{LATIN SMALL LETTER B WITH MIDDLE TILDE}': u'b', + u'\N{LATIN SMALL LETTER D WITH MIDDLE TILDE}': u'd', + u'\N{LATIN SMALL LETTER F WITH MIDDLE TILDE}': u'f', + u'\N{LATIN SMALL LETTER M WITH MIDDLE TILDE}': u'm', + u'\N{LATIN SMALL LETTER N WITH MIDDLE TILDE}': u'n', + u'\N{LATIN SMALL LETTER P WITH MIDDLE TILDE}': u'p', + u'\N{LATIN SMALL LETTER R WITH MIDDLE TILDE}': u'r', + u'\N{LATIN SMALL LETTER R WITH FISHHOOK AND MIDDLE TILDE}': u'r', + u'\N{LATIN SMALL LETTER S WITH MIDDLE TILDE}': u's', + u'\N{LATIN SMALL LETTER T WITH MIDDLE TILDE}': u't', + u'\N{LATIN SMALL LETTER Z WITH MIDDLE TILDE}': u'z', + # u'\N{LATIN SMALL LETTER TURNED G}': u'', + # u'\N{LATIN SMALL LETTER INSULAR G}': u'', + u'\N{LATIN SMALL LETTER TH WITH STRIKETHROUGH}': u'th', + u'\N{LATIN SMALL CAPITAL LETTER I WITH STROKE}': u'I', + # u'\N{LATIN SMALL LETTER IOTA WITH STROKE}': u'', + u'\N{LATIN SMALL LETTER P WITH STROKE}': u'p', + u'\N{LATIN SMALL CAPITAL LETTER U WITH STROKE}': u'U', + # u'\N{LATIN SMALL LETTER UPSILON WITH STROKE}': u'', + u'\N{LATIN SMALL LETTER B WITH PALATAL HOOK}': u'b', + u'\N{LATIN SMALL LETTER D WITH PALATAL HOOK}': u'd', + u'\N{LATIN SMALL LETTER F WITH PALATAL HOOK}': u'f', + u'\N{LATIN SMALL LETTER G WITH PALATAL HOOK}': u'g', + u'\N{LATIN SMALL LETTER K WITH PALATAL HOOK}': u'k', + u'\N{LATIN SMALL LETTER L WITH PALATAL HOOK}': u'l', + u'\N{LATIN SMALL LETTER M WITH PALATAL HOOK}': u'm', + u'\N{LATIN SMALL LETTER N WITH PALATAL HOOK}': u'n', + u'\N{LATIN SMALL LETTER P WITH PALATAL HOOK}': u'p', + u'\N{LATIN SMALL LETTER R WITH PALATAL HOOK}': u'r', + u'\N{LATIN SMALL LETTER S WITH PALATAL HOOK}': u's', + u'\N{LATIN SMALL LETTER ESH WITH PALATAL HOOK}': u'sh', + u'\N{LATIN SMALL LETTER V WITH PALATAL HOOK}': u'v', + u'\N{LATIN SMALL LETTER X WITH PALATAL HOOK}': u'x', + u'\N{LATIN SMALL LETTER Z WITH PALATAL HOOK}': u'z', + u'\N{LATIN SMALL LETTER A WITH RETROFLEX HOOK}': u'a', + # u'\N{LATIN SMALL LETTER ALPHA WITH RETROFLEX HOOK}': u'', + u'\N{LATIN SMALL LETTER D WITH HOOK AND TAIL}': u'd', + u'\N{LATIN SMALL LETTER E WITH RETROFLEX HOOK}': u'e', + u'\N{LATIN SMALL LETTER OPEN E WITH RETROFLEX HOOK}': u'e', + u'\N{LATIN SMALL LETTER REVERSED OPEN E WITH RETROFLEX HOOK}': u'e', + # u'\N{LATIN SMALL LETTER SCHWA WITH RETROFLEX HOOK}': u'', + u'\N{LATIN SMALL LETTER I WITH RETROFLEX HOOK}': u'i', + u'\N{LATIN SMALL LETTER OPEN O WITH RETROFLEX HOOK}': u'o', + u'\N{LATIN SMALL LETTER ESH WITH RETROFLEX HOOK}': u'sh', + u'\N{LATIN SMALL LETTER U WITH RETROFLEX HOOK}': u'u', + u'\N{LATIN SMALL LETTER EZH WITH RETROFLEX HOOK}': u's', + # u'\N{LATIN SUBSCRIPT SMALL LETTER SCHWA}': u'', + # u'\N{LATIN CROSS}': u'' + } + +# Additional ones; see "man uni2ascii" +UNI2ASCII_CONVERSIONS={ + u'\N{NO-BREAK SPACE}': u' ', + u'\N{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}': u'"', + u'\N{SOFT HYPHEN}': u'', # Controversial: see http://www.cs.tut.fi/~jkorpela/shy.html + u'\N{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}': u'"', + u'\N{ETHIOPIC WORDSPACE}': u' ', + u'\N{OGHAM SPACE MARK}': u' ', + u'\N{EN QUAD}': u' ', + u'\N{EM QUAD}': u' ', + u'\N{EN SPACE}': u' ', + u'\N{EM SPACE}': u' ', + u'\N{THREE-PER-EM SPACE}': u' ', + u'\N{FOUR-PER-EM SPACE}': u' ', + u'\N{SIX-PER-EM SPACE}': u' ', + u'\N{FIGURE SPACE}': u' ', + u'\N{PUNCTUATION SPACE}': u' ', + u'\N{THIN SPACE}': u' ', + u'\N{HAIR SPACE}': u' ', + u'\N{ZERO WIDTH SPACE}': u' ', + u'\N{ZERO WIDTH NO-BREAK SPACE}': u' ', + u'\N{HYPHEN}': u'-', + u'\N{NON-BREAKING HYPHEN}': u'-', + u'\N{FIGURE DASH}': u'-', + u'\N{EN DASH}': u'-', + u'\N{EM DASH}': u'-', + u'\N{LEFT SINGLE QUOTATION MARK}': u'`', + u'\N{RIGHT SINGLE QUOTATION MARK}': u"'", + u'\N{SINGLE LOW-9 QUOTATION MARK}': u'`', + u'\N{SINGLE HIGH-REVERSED-9 QUOTATION MARK}': u'`', + u'\N{LEFT DOUBLE QUOTATION MARK}': u'"', + u'\N{RIGHT DOUBLE QUOTATION MARK}': u'"', + u'\N{DOUBLE LOW-9 QUOTATION MARK}': u'"', + u'\N{DOUBLE HIGH-REVERSED-9 QUOTATION MARK}': u'"', + u'\N{SINGLE LEFT-POINTING ANGLE QUOTATION MARK}': u'`', + u'\N{SINGLE RIGHT-POINTING ANGLE QUOTATION MARK}': u"'", + u'\N{LOW ASTERISK}': u'*', + u'\N{MINUS SIGN}': u'-', + u'\N{ASTERISK OPERATOR}': u'*', + u'\N{BOX DRAWINGS LIGHT HORIZONTAL}': u'-', + u'\N{BOX DRAWINGS HEAVY HORIZONTAL}': u'-', + u'\N{BOX DRAWINGS LIGHT VERTICAL}': u'|', + u'\N{BOX DRAWINGS HEAVY VERTICAL}': u'|', + u'\N{HEAVY ASTERISK}': u'*', + u'\N{HEAVY DOUBLE TURNED COMMA QUOTATION MARK ORNAMENT}': u'"', + u'\N{HEAVY DOUBLE COMMA QUOTATION MARK ORNAMENT}': u'"', + u'\N{IDEOGRAPHIC SPACE}': u' ', + u'\N{SMALL AMPERSAND}': u'&', + u'\N{SMALL ASTERISK}': u'*', + u'\N{SMALL PLUS SIGN}': u'+', + u'\N{CENT SIGN}': u'cent', + u'\N{POUND SIGN}': u'pound', + u'\N{YEN SIGN}': u'yen', + u'\N{COPYRIGHT SIGN}': u'(c)', + u'\N{REGISTERED SIGN}': u'(R)', + u'\N{VULGAR FRACTION ONE QUARTER}': u'1/4', + u'\N{VULGAR FRACTION ONE HALF}': u'1/2', + u'\N{VULGAR FRACTION THREE QUARTERS}': u'3/4', + # u'\N{CAPITAL LETTER ASH}': u'AE', + u'\N{LATIN SMALL LETTER SHARP S}': u'ss', + # u'\N{SMALL LETTER ASH}': u'ae', + u'\N{LATIN CAPITAL LIGATURE IJ}': u'IJ', + u'\N{LATIN SMALL LIGATURE IJ}': u'ij', + u'\N{LATIN CAPITAL LIGATURE OE}': u'OE', + u'\N{LATIN SMALL LIGATURE oe}': u'oe', + u'\N{LATIN CAPITAL LETTER DZ}': u'DZ', + u'\N{LATIN CAPITAL LETTER DZ WITH CARON}': u'DZ', + u'\N{LATIN CAPITAL LETTER D WITH SMALL LETTER Z}': u'Dz', + u'\N{LATIN CAPITAL LETTER D WITH SMALL LETTER Z WITH CARON}': u'Dz', + u'\N{LATIN SMALL LETTER DZ}': u'dz', + u'\N{LATIN SMALL LETTER TS DIGRAPH}': u'ts', + u'\N{HORIZONTAL ELLIPSIS}': u'...', + u'\N{MIDLINE HORIZONTAL ELLIPSIS}': u'...', + u'\N{LEFTWARDS ARROW}': u'<-', + u'\N{RIGHTWARDS ARROW}': u'->', + u'\N{LEFTWARDS DOUBLE ARROW}': u'<=', + u'\N{RIGHTWARDS DOUBLE ARROW}': u'=>', + } + +# More from "man uni2ascii", in a different category. +EXTRA_CHARACTERS={ + u'\N{ACUTE ACCENT}': u"'", + u'\N{BROKEN BAR}': u'|', + # u'\N{CEDILLA}': u'{cedilla}', + u'\N{CENT SIGN}': u' cents ', + u'\N{COPYRIGHT SIGN}': u'(C)', + u'\N{CURRENCY SIGN}': u' currency ', + u'\N{DEGREE SIGN}': u' degrees ', + # u'\N{DIAERESIS}': u'{umlaut}', + u'\N{DIVISION SIGN}': u'/', + # u'\N{FEMININE ORDINAL INDICATOR}': u'{^a}', + u'\N{INVERTED EXCLAMATION MARK}': u'!', + u'\N{INVERTED QUESTION MARK}': u'?', + # wrong? u'\N{LEFT-POINTING DOUBLE ANGLE QUOTATION MARK}': u'<<', + u'\N{MACRON}': u'_', + # u'\N{MASCULINE ORDINAL INDICATOR}': u'{^o}', + u'\N{MICRO SIGN}': u'micro', + u'\N{MIDDLE DOT}': u'*', + u'\N{MULTIPLICATION SIGN}': u'*', + u'\N{NOT SIGN}': u'not', + u'\N{PILCROW SIGN}': u'paragraph', + u'\N{PLUS-MINUS SIGN}': u'+/-', + u'\N{POUND SIGN}': u'pound', + u'\N{REGISTERED SIGN}': u'(R)', + # wrong? u'\N{RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK}': u'>>', + u'\N{SECTION SIGN}': u'section', + u'\N{SOFT HYPHEN}': u'', + u'\N{SUPERSCRIPT ONE}': u'^1', + u'\N{SUPERSCRIPT THREE}': u'^3', + u'\N{SUPERSCRIPT TWO}': u'^2', + u'\N{VULGAR FRACTION ONE HALF}': u'1/2', + u'\N{VULGAR FRACTION ONE QUARTER}': u'1/4', + u'\N{VULGAR FRACTION THREE QUARTERS}': u'3/4', + u'\N{YEN SIGN}': u'yen' +} +FG_HACKS={ + u'\u0082': u'', # "break permitted here" symbol + u'\u2022': u'*', # Bullet +} + + +def build_dictionary(): + 'Return the translation dictionary.' + d = dict() + # First do what can be done automatically + for i in range(0xffff): + u=unichr(i) + try: + n=unicodedata.name(u) + if n.startswith('LATIN '): + k=unicodedata.normalize('NFKD', u).encode('ASCII', 'ignore') + if k: d[i]=unicode(k) # i=ord(u) + except ValueError: pass + # Next, add some by-hand ones (overlap possible, so order matters) + for m in [EXTRA_LATIN_NAMES,EXTRA_CHARACTERS,UNI2ASCII_CONVERSIONS,FG_HACKS]: + for i in m: + try: d[ord(i)]=unicode(m[i]) + except Exception, err: pass + return d + + + +udict = build_dictionary() +convert = lambda s: s.translate(udict) + +def coroutine(func): + def start(*argz, **kwz): + cr = func(*argz, **kwz) + cr.next() + return cr + return start + +@coroutine +def co_filter(drain, in_enc='utf-8', out_enc='ascii'): + bs = None + while True: + chunk = (yield bs) + bs = drain(convert(unicode(chunk)).encode('utf-8')) + +def uc_filter(sin, sout, bs=8192, in_enc='utf-8', out_enc='ascii'): + sout = co_filter(sout.write, in_enc, out_enc) + while True: + dta = sin.read(bs) + if not dta: break + else: sout.send(dta) + + +if __name__ == '__main__': + from optparse import OptionParser + parser = OptionParser(usage='%prog [options]', + description='utf8 stdin -> ascii stdout') + parser.add_option('-s', '--src-enc', + action='store', type='str', dest='src_enc', metavar='ENC', default='utf-8', + help='source encoding (utf-8)') + parser.add_option('-d', '--dst-enc', + action='store', type='str', dest='dst_enc', metavar='ENC', default='ascii', + help='destination encoding (ascii)') + parser.add_option('-c', '--chunk', + action='store', type='int', dest='bs', metavar='BYTES', default=8192, + help='read/write in chunks of a given size (8192)') + optz, argz = parser.parse_args() + if argz: parser.error('Only stdin -> stdout conversion suported') + + uc_filter(sys.stdin, sys.stdout, bs=optz.bs, in_enc=optz.src_enc, out_enc=optz.dst_enc) diff --git a/addons/marketing_campaign/i18n/ru.po b/addons/marketing_campaign/i18n/ru.po index a51b8994cee..f4c85881403 100644 --- a/addons/marketing_campaign/i18n/ru.po +++ b/addons/marketing_campaign/i18n/ru.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-10-10 07:30+0000\n" -"Last-Translator: OpenERP Administrators <Unknown>\n" +"PO-Revision-Date: 2011-11-07 22:35+0000\n" +"Last-Translator: Stanislav Hanzhin <Unknown>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 05:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: marketing_campaign @@ -809,7 +809,7 @@ msgstr "" #: selection:marketing.campaign.segment,state:0 #: selection:marketing.campaign.workitem,state:0 msgid "Done" -msgstr "Сделано" +msgstr "Выполнено" #. module: marketing_campaign #: code:addons/marketing_campaign/marketing_campaign.py:209 @@ -861,7 +861,7 @@ msgstr "" #: view:marketing.campaign.workitem:0 #: selection:marketing.campaign.workitem,state:0 msgid "To Do" -msgstr "Задача" +msgstr "Сделать" #. module: marketing_campaign #: view:marketing.campaign.workitem:0 diff --git a/addons/point_of_sale/report/pos_order_report_view.xml b/addons/point_of_sale/report/pos_order_report_view.xml index 41fe2c3b4d6..ab6e9f73df4 100644 --- a/addons/point_of_sale/report/pos_order_report_view.xml +++ b/addons/point_of_sale/report/pos_order_report_view.xml @@ -86,7 +86,7 @@ <field name="name">Point of Sale Analysis</field> <field name="res_model">report.pos.order</field> <field name="view_type">form</field> - <field name="view_mode">tree,graph</field> + <field name="view_mode">tree</field> <field name="search_view_id" ref="view_report_pos_order_search"/> <field name="context">{'search_default_today':1,'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}</field> </record> diff --git a/addons/product/i18n/ar.po b/addons/product/i18n/ar.po index b436660d6e3..190b779751e 100644 --- a/addons/product/i18n/ar.po +++ b/addons/product/i18n/ar.po @@ -1618,7 +1618,7 @@ msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/bg.po b/addons/product/i18n/bg.po index 92c343bb693..65331e56263 100644 --- a/addons/product/i18n/bg.po +++ b/addons/product/i18n/bg.po @@ -1689,7 +1689,7 @@ msgstr "Продукти по категория" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Категории продукти" #. module: product diff --git a/addons/product/i18n/bs.po b/addons/product/i18n/bs.po index 28249bb21cc..0a58371bc55 100644 --- a/addons/product/i18n/bs.po +++ b/addons/product/i18n/bs.po @@ -1643,7 +1643,7 @@ msgstr "Proizvodi po kategoriji" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorije proizvoda" #. module: product diff --git a/addons/product/i18n/ca.po b/addons/product/i18n/ca.po index 613017cd767..dcea39c2350 100644 --- a/addons/product/i18n/ca.po +++ b/addons/product/i18n/ca.po @@ -1752,7 +1752,7 @@ msgstr "Productes per categoria" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categories de productes" #. module: product diff --git a/addons/product/i18n/cs.po b/addons/product/i18n/cs.po index 05d22130bc3..3d998b718ce 100644 --- a/addons/product/i18n/cs.po +++ b/addons/product/i18n/cs.po @@ -1644,7 +1644,7 @@ msgstr "Výrobky podle kategorie" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorie výrobků" #. module: product diff --git a/addons/product/i18n/de.po b/addons/product/i18n/de.po index 26f31ca0aec..ec2920ec288 100644 --- a/addons/product/i18n/de.po +++ b/addons/product/i18n/de.po @@ -1765,7 +1765,7 @@ msgstr "Produkte nach Kategorien" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Produkte Kategorien" #. module: product diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po index 13c91457f4c..9c1e97debf1 100644 --- a/addons/product/i18n/el.po +++ b/addons/product/i18n/el.po @@ -1674,7 +1674,7 @@ msgstr "Προϊόντα κατα Κατηγορία" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Κατηγορίες Προϊόντων" #. module: product diff --git a/addons/product/i18n/es.po b/addons/product/i18n/es.po index be6eb215425..5eee21b4203 100644 --- a/addons/product/i18n/es.po +++ b/addons/product/i18n/es.po @@ -1754,7 +1754,7 @@ msgstr "Productos por categoría" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorías de productos" #. module: product diff --git a/addons/product/i18n/es_AR.po b/addons/product/i18n/es_AR.po index 59bbd200c52..62f5dd1a34d 100644 --- a/addons/product/i18n/es_AR.po +++ b/addons/product/i18n/es_AR.po @@ -1649,7 +1649,7 @@ msgstr "Productos por categoría" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorías de productos" #. module: product diff --git a/addons/product/i18n/es_CL.po b/addons/product/i18n/es_CL.po index cb2cf16dab2..94bd3d3bdce 100644 --- a/addons/product/i18n/es_CL.po +++ b/addons/product/i18n/es_CL.po @@ -1723,7 +1723,7 @@ msgstr "Productos por categoría" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorías de productos" #. module: product diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po index b5f9aeb8eb1..d8a8c4bae38 100644 --- a/addons/product/i18n/es_EC.po +++ b/addons/product/i18n/es_EC.po @@ -1754,7 +1754,7 @@ msgstr "Productos por categoría" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorías de productos" #. module: product diff --git a/addons/product/i18n/et.po b/addons/product/i18n/et.po index d4f8deca78d..bfee0f38548 100644 --- a/addons/product/i18n/et.po +++ b/addons/product/i18n/et.po @@ -1641,7 +1641,7 @@ msgstr "Tooted kategooria järgi" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Toodete kategooriad" #. module: product diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po index 7289804cc74..7f6cf0c02f6 100644 --- a/addons/product/i18n/eu.po +++ b/addons/product/i18n/eu.po @@ -1621,7 +1621,7 @@ msgstr "Produktuak Kategoriaka" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Produktuen Kategoriak" #. module: product diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po index f6471f7bff5..356403ad34f 100644 --- a/addons/product/i18n/fi.po +++ b/addons/product/i18n/fi.po @@ -1690,7 +1690,7 @@ msgstr "Tuotteet kategorioittain" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Tuotteiden kategoriat" #. module: product diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po index ab3300a256c..23ed20bcd46 100644 --- a/addons/product/i18n/fr.po +++ b/addons/product/i18n/fr.po @@ -1778,7 +1778,7 @@ msgstr "Produits par catégorie" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Catégories de produits" #. module: product diff --git a/addons/product/i18n/gl.po b/addons/product/i18n/gl.po index 377cb0edcc7..419cf491e14 100644 --- a/addons/product/i18n/gl.po +++ b/addons/product/i18n/gl.po @@ -1619,7 +1619,7 @@ msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/hr.po b/addons/product/i18n/hr.po index 500125bdf73..80599b46259 100644 --- a/addons/product/i18n/hr.po +++ b/addons/product/i18n/hr.po @@ -1678,7 +1678,7 @@ msgstr "Proizvodi po kategorijama" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorije proizvoda" #. module: product diff --git a/addons/product/i18n/hu.po b/addons/product/i18n/hu.po index 3395afbb6bb..57ba5549e7e 100644 --- a/addons/product/i18n/hu.po +++ b/addons/product/i18n/hu.po @@ -1672,7 +1672,7 @@ msgstr "Termékek kategóriánként" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Termék kategóriák" #. module: product diff --git a/addons/product/i18n/id.po b/addons/product/i18n/id.po index d35c18bce8f..9603fff37a4 100644 --- a/addons/product/i18n/id.po +++ b/addons/product/i18n/id.po @@ -1747,7 +1747,7 @@ msgstr "Produk berdasarkan kategori" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategori Produk" #. module: product diff --git a/addons/product/i18n/it.po b/addons/product/i18n/it.po index 766f776b8f4..03b11b14363 100644 --- a/addons/product/i18n/it.po +++ b/addons/product/i18n/it.po @@ -1753,7 +1753,7 @@ msgstr "Prodotti per Categoria" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorie Prodotti" #. module: product diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po index f53b11983d9..9c5cca89bc0 100644 --- a/addons/product/i18n/ko.po +++ b/addons/product/i18n/ko.po @@ -1623,7 +1623,7 @@ msgstr "카테고리 별 상품" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "상품 카테고리" #. module: product diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po index 13fedd31539..4ffab08f569 100644 --- a/addons/product/i18n/lt.po +++ b/addons/product/i18n/lt.po @@ -1641,7 +1641,7 @@ msgstr "Produktai pagal kategorijas" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Produktų kategorijos" #. module: product diff --git a/addons/product/i18n/lv.po b/addons/product/i18n/lv.po index c0366c53c61..dc6d73f56f5 100644 --- a/addons/product/i18n/lv.po +++ b/addons/product/i18n/lv.po @@ -1704,7 +1704,7 @@ msgstr "Preces pa Kategorijām" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Preču kategorijas" #. module: product diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po index 918ce472040..6902709c58b 100644 --- a/addons/product/i18n/mn.po +++ b/addons/product/i18n/mn.po @@ -1671,7 +1671,7 @@ msgstr "Бараа, ангиллаар" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Барааны ангилал" #. module: product diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po index 00ced0ebb4d..3b8513dad10 100644 --- a/addons/product/i18n/nb.po +++ b/addons/product/i18n/nb.po @@ -1636,7 +1636,7 @@ msgstr "Produkter per produktgruppe" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Produktkategorier" #. module: product diff --git a/addons/product/i18n/nb_NB.po b/addons/product/i18n/nb_NB.po index 74e08e40d52..fee211ea66f 100644 --- a/addons/product/i18n/nb_NB.po +++ b/addons/product/i18n/nb_NB.po @@ -1506,7 +1506,7 @@ msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/nl.po b/addons/product/i18n/nl.po index a90e145f21c..369c75e60e6 100644 --- a/addons/product/i18n/nl.po +++ b/addons/product/i18n/nl.po @@ -1755,7 +1755,7 @@ msgstr "Producten op categorie" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Productcategoriën" #. module: product diff --git a/addons/product/i18n/nl_BE.po b/addons/product/i18n/nl_BE.po index 1b7340ba9fd..374d222f30b 100644 --- a/addons/product/i18n/nl_BE.po +++ b/addons/product/i18n/nl_BE.po @@ -1619,7 +1619,7 @@ msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/pl.po b/addons/product/i18n/pl.po index 60a6754562d..af15aaf0f5a 100644 --- a/addons/product/i18n/pl.po +++ b/addons/product/i18n/pl.po @@ -1713,7 +1713,7 @@ msgstr "Produkty wg kategorii" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorie produktów" #. module: product diff --git a/addons/product/i18n/product.pot b/addons/product/i18n/product.pot index b4739e0a98c..675d515d8e3 100644 --- a/addons/product/i18n/product.pot +++ b/addons/product/i18n/product.pot @@ -1511,7 +1511,7 @@ msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/pt.po b/addons/product/i18n/pt.po index b474c581a61..1c4bd145d6d 100644 --- a/addons/product/i18n/pt.po +++ b/addons/product/i18n/pt.po @@ -1748,7 +1748,7 @@ msgstr "Produtos por Categoria" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorias de Produtos" #. module: product diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po index 1c8da77ec48..833f9fcd9fd 100644 --- a/addons/product/i18n/pt_BR.po +++ b/addons/product/i18n/pt_BR.po @@ -1754,7 +1754,7 @@ msgstr "Produtos por categoria" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorias de produtos" #. module: product diff --git a/addons/product/i18n/ro.po b/addons/product/i18n/ro.po index a943650ad1e..e4fbea3b172 100644 --- a/addons/product/i18n/ro.po +++ b/addons/product/i18n/ro.po @@ -1665,7 +1665,7 @@ msgstr "Produse după categorie" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorii Produse" #. module: product diff --git a/addons/product/i18n/ru.po b/addons/product/i18n/ru.po index 5bc59580617..daad08a7abb 100644 --- a/addons/product/i18n/ru.po +++ b/addons/product/i18n/ru.po @@ -1711,7 +1711,7 @@ msgstr "ТМЦ по категориям" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Категории ТМЦ" #. module: product diff --git a/addons/product/i18n/sk.po b/addons/product/i18n/sk.po index 23decc49762..a358facbc8e 100644 --- a/addons/product/i18n/sk.po +++ b/addons/product/i18n/sk.po @@ -1656,7 +1656,7 @@ msgstr "Produkty podľa kategórie" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/sl.po b/addons/product/i18n/sl.po index 27f180ce2fd..07cc3ed271c 100644 --- a/addons/product/i18n/sl.po +++ b/addons/product/i18n/sl.po @@ -1632,7 +1632,7 @@ msgstr "Izdelki po kategorijah" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorije proizvodov" #. module: product diff --git a/addons/product/i18n/sq.po b/addons/product/i18n/sq.po index 4da27c24e94..fba3b9e9df4 100644 --- a/addons/product/i18n/sq.po +++ b/addons/product/i18n/sq.po @@ -1619,7 +1619,7 @@ msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po index e6ce309cd96..fe484cf3433 100644 --- a/addons/product/i18n/sr.po +++ b/addons/product/i18n/sr.po @@ -1676,7 +1676,7 @@ msgstr "Proizvodi po kategoriji" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorije proizvoda" #. module: product diff --git a/addons/product/i18n/sr@latin.po b/addons/product/i18n/sr@latin.po index edc0933d87a..539886a9548 100644 --- a/addons/product/i18n/sr@latin.po +++ b/addons/product/i18n/sr@latin.po @@ -1676,7 +1676,7 @@ msgstr "Proizvodi po kategoriji" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorije proizvoda" #. module: product diff --git a/addons/product/i18n/sv.po b/addons/product/i18n/sv.po index 198f11d9e35..16ee9b9aa89 100644 --- a/addons/product/i18n/sv.po +++ b/addons/product/i18n/sv.po @@ -1663,7 +1663,7 @@ msgstr "Produkter per kategori" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Produktkategorier" #. module: product diff --git a/addons/product/i18n/th.po b/addons/product/i18n/th.po index a561f5fd162..e8482253471 100644 --- a/addons/product/i18n/th.po +++ b/addons/product/i18n/th.po @@ -1619,7 +1619,7 @@ msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/tlh.po b/addons/product/i18n/tlh.po index 298afddcae0..531ff1a201d 100644 --- a/addons/product/i18n/tlh.po +++ b/addons/product/i18n/tlh.po @@ -1618,7 +1618,7 @@ msgstr "" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: product diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po index 1658bf253bf..56e17763c11 100644 --- a/addons/product/i18n/tr.po +++ b/addons/product/i18n/tr.po @@ -1734,7 +1734,7 @@ msgstr "Kategori Bazında Ürün" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Ürün Kategorisi" #. module: product diff --git a/addons/product/i18n/uk.po b/addons/product/i18n/uk.po index 9ab9e410982..d00228914ae 100644 --- a/addons/product/i18n/uk.po +++ b/addons/product/i18n/uk.po @@ -1623,7 +1623,7 @@ msgstr "Продукти за категоріями" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Категорії продуктів" #. module: product diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po index 2e5d3bfb4d0..b5c6914a004 100644 --- a/addons/product/i18n/vi.po +++ b/addons/product/i18n/vi.po @@ -1655,7 +1655,7 @@ msgstr "Sản phẩm theo chủng loại" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "Loại sản phẩm" #. module: product diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po index b42364a3067..c5b54946bd5 100644 --- a/addons/product/i18n/zh_CN.po +++ b/addons/product/i18n/zh_CN.po @@ -1647,7 +1647,7 @@ msgstr "产品分类" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "产品分类" #. module: product diff --git a/addons/product/i18n/zh_TW.po b/addons/product/i18n/zh_TW.po index d05b69bc639..741d885d5bc 100644 --- a/addons/product/i18n/zh_TW.po +++ b/addons/product/i18n/zh_TW.po @@ -1620,7 +1620,7 @@ msgstr "各分類產品" #. module: product #: model:ir.actions.act_window,name:product.product_category_action_form #: model:ir.ui.menu,name:product.menu_product_category_action_form -msgid "Products Categories" +msgid "Product Categories" msgstr "產品分類" #. module: product diff --git a/addons/product/product.py b/addons/product/product.py index 7e7f7375e87..0e1b2048ea7 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -93,6 +93,7 @@ class product_uom(osv.osv): del(data['factor_inv']) return super(product_uom, self).create(cr, uid, data, context) + _order = "name" _columns = { 'name': fields.char('Name', size=64, required=True, translate=True), 'category_id': fields.many2one('product.uom.categ', 'UoM Category', required=True, ondelete='cascade', diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 7600eb93c87..a0669795ad5 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -351,7 +351,7 @@ parent="base.menu_product" sequence="0"/> <record id="product_category_action_form" model="ir.actions.act_window"> - <field name="name">Products Categories</field> + <field name="name">Product Categories</field> <field name="type">ir.actions.act_window</field> <field name="res_model">product.category</field> <field name="view_type">form</field> diff --git a/addons/project/project.py b/addons/project/project.py index df1995b1f2b..54afe10155f 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -431,9 +431,10 @@ class task(osv.osv): 'priority': fields.selection([('4','Very Low'), ('3','Low'), ('2','Medium'), ('1','Important'), ('0','Very important')], 'Priority'), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of tasks."), 'type_id': fields.many2one('project.task.type', 'Stage'), - 'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True, + 'state': fields.selection([('draft', 'New'),('open', 'In Progress'),('pending', 'Pending'), ('done', 'Done'), ('cancelled', 'Cancelled')], 'State', readonly=True, required=True, help='If the task is created the state is \'Draft\'.\n If the task is started, the state becomes \'In Progress\'.\n If review is needed the task is in \'Pending\' state.\ \n If the task is over, the states is set to \'Done\'.'), + 'kanban_state': fields.selection([('blocked', 'Blocked'),('normal', 'Normal'),('done', 'Done')], 'Kanban State', readonly=True, required=False), 'create_date': fields.datetime('Create Date', readonly=True,select=True), 'date_start': fields.datetime('Starting Date',select=True), 'date_end': fields.datetime('Ending Date',select=True), @@ -477,6 +478,7 @@ class task(osv.osv): _defaults = { 'state': 'draft', + 'kanban_state': 'normal', 'priority': '2', 'progress': 0, 'sequence': 10, @@ -749,6 +751,31 @@ class task(osv.osv): self.log(cr, uid, id, message) return True + def set_remaining_hours_1(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'remaining_hours': 8.0}, context=context) + return True + + def set_remaining_hours_2(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'remaining_hours': 2 * 8.0}, context=context) + return True + + def set_remaining_hours_5(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'remaining_hours': 5 * 8.0}, context=context) + return True + + def set_remaining_hours_10(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'remaining_hours': 10 * 8.0}, context=context) + return True + + def set_kanban_state_blocked(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'kanban_state': 'blocked'}, context=context) + + def set_kanban_state_normal(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'kanban_state': 'normal'}, context=context) + + def set_kanban_state_done(self, cr, uid, ids, context=None): + self.write(cr, uid, ids, {'kanban_state': 'done'}, context=context) + def _change_type(self, cr, uid, ids, next, *args): """ go to the next stage diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 2edace937f4..df20e280d3b 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -175,7 +175,6 @@ <field name="context">{'search_default_Current':1}</field> <field name="help">A project contains a set of tasks or issues that will be performed by your resources assigned to it. A project can be hierarchically structured, as a child of a Parent Project. This allows you to design large project structures with different phases spread over the project duration cycle. Each user can set his default project in his own preferences to automatically filter the tasks or issues he usually works on. If you choose to invoice the time spent on a project task, you can find project tasks to be invoiced in the billing section.</field> </record> - <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_definitions" sequence="1"/> <record id="open_view_template_project" model="ir.actions.act_window"> <field name="name">Templates of Projects</field> @@ -261,7 +260,7 @@ <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/> <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/> <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/> - <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-execute"/> + <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/> <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" /> <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/> <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending"/> @@ -328,17 +327,22 @@ <field name="user_email"/> <field name="description"/> <field name="sequence"/> + <field name="state"/> + <field name="kanban_state"/> + <field name="project_id"/> <templates> <t t-name="kanban-box"> <t t-set="pad_url">http://pad.openerp.com/<t t-raw="_.underscored(_.trim(record.name.raw_value))"/></t> - <div t-att-class="kanban_color(record.color.raw_value) + (record.state.raw_value === 'pending' ? ' oe_kanban_color_alert' : '')"> + <t t-if="record.kanban_state.raw_value === 'blocked'" t-set="border">oe_kanban_color_red</t> + <t t-if="record.kanban_state.raw_value === 'done'" t-set="border">oe_kanban_color_green</t> + <div t-attf-class="#{kanban_color(record.color.raw_value)} #{border || ''}"> <div class="oe_kanban_box oe_kanban_color_border"> <table class="oe_kanban_table oe_kanban_box_header oe_kanban_color_bgdark oe_kanban_color_border oe_kanban_draghandle"> <tr> <td class="oe_kanban_title1" align="left" valign="middle"> <a t-if="record.priority.raw_value == 1" icon="star-on" type="object" name="set_normal_priority"/> <a t-if="record.priority.raw_value != 1" icon="star-off" type="object" name="set_high_priority" style="opacity:0.6; filter:alpha(opacity=60);"/> - <field name="name"/> + <span t-att-title="record.project_id.value"><field name="name"/></span> </td> <td valign="top" width="22"> <img t-att-src="kanban_gravatar(record.user_email.value, 22)" class="oe_kanban_gravatar" t-att-title="record.user_id.value"/> @@ -346,16 +350,19 @@ </tr> </table> <div class="oe_kanban_box_content oe_kanban_color_bglight oe_kanban_box_show_onclick_trigger"> - <div class="oe_kanban_right"> - <b> - <field name="project_id"/><br/> - <field name="state"/><t t-if="record.date_deadline.value"> - </t> - <i><field name="date_deadline"/></i> - </b> - </div> <div> <t t-esc="kanban_text_ellipsis(record.description.value, 160)"/> </div> + <div> + <i t-if="record.date_deadline.raw_value"><field name="date_deadline"/> ,</i> + <field name="remaining_hours" sum="Remaining Time"/> + <b> + <a name="set_remaining_hours_1" string="Set 1 day" type="object"> [1d]</a> + <a name="set_remaining_hours_2" string="Set 2 day" type="object"> [2d]</a> + <a name="set_remaining_hours_5" string="Set 5 day" type="object"> [5d]</a> + <a name="set_remaining_hours_10" string="Set 10 day" type="object"> [10d]</a> + </b> + </div> <br class="oe_kanban_clear"/> </div> <div class="oe_kanban_buttons_set oe_kanban_color_border oe_kanban_color_bglight oe_kanban_box_show_onclick"> @@ -364,8 +371,9 @@ <a string="Change Color" icon="color-picker" type="color" name="color"/> </div> <div class="oe_kanban_right"> - <a name="do_pending" string="Set Pending" states="open" type="object" icon="gtk-media-pause"/> - <a name="do_open" string="Open" states="draft,pending" type="object" icon="gtk-media-play"/> + <a name="set_kanban_state_blocked" string="Block" kanban_states="normal,done" type="object" icon="gtk-media-pause"/> + <a name="set_kanban_state_normal" string="Normal" kanban_states="blocked,done" type="object" icon="gtk-media-play"/> + <a name="set_kanban_state_done" string="Done" kanban_states="blocked,normal" type="object" icon="gtk-apply"/> </div> <br class="oe_kanban_clear"/> </div> @@ -390,9 +398,9 @@ <field name="user_id" invisible="context.get('user_invisible', False)"/> <field name="delegated_user_id" invisible="context.get('show_delegated', True)"/> <field name="total_hours" invisible="1"/> - <field name="planned_hours"/> + <field name="planned_hours" invisible="context.get('set_visible',False)"/> <field name="effective_hours" widget="float_time" sum="Spent Hours" invisible="1"/> - <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)"/> + <field name="remaining_hours" widget="float_time" sum="Remaining Hours" on_change="onchange_remaining(remaining_hours,planned_hours)" invisible="context.get('set_visible',False)"/> <field name="date_deadline" invisible="context.get('deadline_visible',True)"/> <field name="type_id" groups="base.group_extended" invisible="context.get('set_visible',False)"/> <button name="next_type" invisible="context.get('set_visible',False)" @@ -407,7 +415,7 @@ <field name="progress" widget="progressbar" invisible="context.get('set_visible',False)"/> <field name="state" invisible="context.get('set_visible',False)"/> <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" help="For cancelling the task"/> - <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-execute" help="For changing to open state" invisible="context.get('set_visible',False)"/> + <button name="do_open" states="pending,draft,done,cancelled" string="Start Task" type="object" icon="gtk-media-play" help="For changing to open state" invisible="context.get('set_visible',False)"/> <button groups="base.group_extended" name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="gtk-sort-descending" help="For changing to delegate state"/> <button name="action_close" states="draft,pending,open" string="Done" type="object" icon="terp-dialog-close" help="For changing to done state"/> </tree> @@ -477,6 +485,7 @@ <filter domain="[('project_id.user_id','=',uid)]" help="My Projects" icon="terp-personal"/> </field> <field name="user_id"> + <filter domain="[('user_id','=',uid)]" help="My Tasks" icon="terp-personal" /> <filter domain="[('user_id','=',False)]" help="Unassigned Tasks" icon="terp-personal-" /> </field> </group> @@ -505,11 +514,11 @@ <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field> <field eval="False" name="filter"/> <field name="view_id" ref="view_task_tree2"/> - <field name="context">{"search_default_user_id":uid, "search_default_draft": 1, "search_default_open":1 }</field> + <field name="context">{"search_default_draft": 1, "search_default_open":1 }</field> <field name="search_view_id" ref="view_task_search_form"/> <field name="help">A task represents a work that has to be done. Each user works in his own list of tasks where he can record his task work in hours. He can work and close the task itself or delegate it to another user. If you delegate a task to another user, you get a new task in pending state, which will be reopened when you have to review the work achieved. If you install the project_timesheet module, task work can be invoiced based on the project configuration. With the project_mrp module, sales orders can create tasks automatically when they are confirmed.</field> </record> - + <menuitem action="action_view_task" id="menu_action_view_task" parent="project.menu_project_management" sequence="3"/> <record id="action_view_task_overpassed_draft" model="ir.actions.act_window"> @@ -594,7 +603,11 @@ </record> <menuitem id="menu_tasks_config" name="Tasks" parent="project.menu_definitions" sequence="1"/> - <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_tasks_config" sequence="1"/> + + <menuitem id="menu_project_config_project" parent="menu_definitions" sequence="1"/> + + <menuitem action="open_task_type_form" id="menu_task_types_view" parent="menu_project_config_project" sequence="2"/> + <menuitem action="open_view_project_all" id="menu_open_view_project_all" parent="menu_project_config_project" sequence="1"/> <act_window context="{'search_default_user_id': [active_id], 'default_user_id': active_id}" id="act_res_users_2_project_project" name="User's projects" res_model="project.project" src_model="res.users" view_mode="tree,form" view_type="form"/> diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py index 8d03112ed04..a9a1aecd0c5 100644 --- a/addons/project_gtd/__openerp__.py +++ b/addons/project_gtd/__openerp__.py @@ -21,7 +21,7 @@ { - 'name': 'Methodology: Getting Things Done', + 'name': 'Todo List based on the Getting Things Done methodology', 'version': '1.0', 'category': 'Project Management', 'complexity': "easy", @@ -29,8 +29,12 @@ This module implements all concepts defined by the Getting Things Done methodology. =================================================================================== -This world-wide used methodology is used for personal -time management improvement. +This module implements a simple personnal Todo list based on tasks. It adds in +the project application an editable list of tasks simplified to the minimum +required fields. + +The todo list is based on the GTD methodology. This world-wide used methodology +is used for personal time management improvement. Getting Things Done (commonly abbreviated as GTD) is an action management method created by David Allen, and described in a book of the same name. diff --git a/addons/project_gtd/project_gtd.py b/addons/project_gtd/project_gtd.py index a3c9d48476b..d28e5b1dcd6 100644 --- a/addons/project_gtd/project_gtd.py +++ b/addons/project_gtd/project_gtd.py @@ -104,25 +104,22 @@ class project_task(osv.osv): res = super(project_task,self).fields_view_get(cr, uid, view_id, view_type, context, toolbar=toolbar, submenu=submenu) search_extended = False timebox_obj = self.pool.get('project.gtd.timebox') - access_pool = self.pool.get('ir.model.access') - if (res['type'] == 'search') and access_pool.check_groups(cr, uid, "project_gtd.group_project_getting"): + if (res['type'] == 'search') and context.get('gtd', False): tt = timebox_obj.browse(cr, uid, timebox_obj.search(cr,uid,[]), context=context) - search_extended ='''<newline/><group col="%d" expand="%d" string="%s">''' % (len(tt)+7,1,_('Getting Things Done')) - search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),) - search_extended += '''<filter context="{'set_editable':True,'set_visible':True,'gtd_visible':True,'user_invisible':True}" icon="gtk-new" help="Getting things done" string="%s"/>''' % (_('GTD'),) + search_extended ='''<newline/>''' + search_extended += '''<filter domain="[('timebox_id','=', False)]" context="{'set_editable':True,'set_visible':True,'user_invisible':True}" icon="gtk-new" help="Undefined Timebox" string="%s"/>''' % (_('Inbox'),) search_extended += '''<separator orientation="vertical"/>''' for time in tt: if time.icon: icon = time.icon else : icon="" - search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'gtd_visible':True, 'user_invisible': True}"/>''' + search_extended += '''<filter domain="[('timebox_id','=', ''' + str(time.id) + ''')]" icon="''' + icon + '''" string="''' + time.name + '''" context="{'user_invisible': True}"/>''' search_extended += ''' <separator orientation="vertical"/> <field name="context_id" select="1" widget="selection"/> - </group> - </search> ''' - if search_extended: + </search>''' + res['arch'] = unicode(res['arch'], 'utf8').replace('</search>', search_extended) attrs_sel = self.pool.get('project.gtd.context').name_search(cr, uid, '', [], context=context) context_id_info = self.pool.get('project.task').fields_get(cr, uid, ['context_id'], context=context) diff --git a/addons/project_gtd/project_gtd_data.xml b/addons/project_gtd/project_gtd_data.xml index 126233104e2..659b0fe9cb2 100644 --- a/addons/project_gtd/project_gtd_data.xml +++ b/addons/project_gtd/project_gtd_data.xml @@ -1,8 +1,31 @@ <?xml version="1.0" ?> <openerp> <data> - <record model="res.groups" id="group_project_getting"> - <field name="name">Project / Methodology / Getting Things Done</field> + <record model="project.gtd.context" id="context_office"> + <field name="name">Office</field> + <field name="sequence">0</field> </record> + <record model="project.gtd.context" id="context_travel"> + <field name="name">Travel</field> + <field name="sequence">2</field> + </record> + + <record model="project.gtd.timebox" id="timebox_daily"> + <field name="name">Today</field> + <field name="icon">terp-go-today</field> + </record> + <record model="project.gtd.timebox" id="timebox_weekly"> + <field name="name">This Week</field> + <field name="icon">terp-go-week</field> + </record> + <record model="project.gtd.timebox" id="timebox_monthly"> + <field name="name">This Month</field> + <field name="icon">terp-go-month</field> + </record> + <record model="project.gtd.timebox" id="timebox_lt"> + <field name="name">Long Term</field> + <field name="icon">terp-project</field> + </record> + </data> </openerp> diff --git a/addons/project_gtd/project_gtd_demo.xml b/addons/project_gtd/project_gtd_demo.xml index a2d3cf65923..5ae12dff7bf 100644 --- a/addons/project_gtd/project_gtd_demo.xml +++ b/addons/project_gtd/project_gtd_demo.xml @@ -2,38 +2,14 @@ <openerp> <data> - <record model="project.gtd.context" id="context_office"> - <field name="name">Office</field> - <field name="sequence">0</field> - </record> - <record model="project.gtd.context" id="context_travel"> - <field name="name">Travel</field> - <field name="sequence">2</field> - </record> - <record model="project.gtd.context" id="context_car"> - <field name="name">Car</field> - <field name="sequence">1</field> - </record> + <record model="project.gtd.context" id="context_home"> <field name="name">Home</field> <field name="sequence">3</field> </record> - - <record model="project.gtd.timebox" id="timebox_daily"> - <field name="name">Today</field> - <field name="icon">terp-go-today</field> - </record> - <record model="project.gtd.timebox" id="timebox_weekly"> - <field name="name">This Week</field> - <field name="icon">terp-go-week</field> - </record> - <record model="project.gtd.timebox" id="timebox_monthly"> - <field name="name">This Month</field> - <field name="icon">terp-go-month</field> - </record> - <record model="project.gtd.timebox" id="timebox_lt"> - <field name="name">Long Term</field> - <field name="icon">terp-project</field> + <record model="project.gtd.context" id="context_car"> + <field name="name">Car</field> + <field name="sequence">1</field> </record> <record id="project.project_task_116" model="project.task"> diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index b92fc1a1fb8..a9166f7fbfa 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -31,7 +31,7 @@ <field name="help">Contexts are defined in the "Getting Things Done" methodology. It allows you to categorize your tasks according to the context in which they have to be done: at the office, at home, when I take my car, etc.</field> </record> - <menuitem name="Contexts" id="menu_open_gtd_time_contexts" groups="group_project_getting" + <menuitem name="Contexts" id="menu_open_gtd_time_contexts" parent="project.menu_tasks_config" action="open_gtd_context_tree"/> <record model="ir.ui.view" id="view_gtd_timebox_tree"> @@ -79,10 +79,10 @@ <field name="inherit_id" ref="project.view_task_tree2" /> <field name="arch" type="xml"> <field name="remaining_hours" position="after"> - <field string="Timebox" name="timebox_id" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible', False)"/> - <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible',False)"/> - <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" groups="project_gtd.group_project_getting" invisible=" not context.get('gtd_visible',False)"/> - <field name="context_id" groups="project_gtd.group_project_getting" invisible="not context.get('gtd_visible', False)" widget="selection"/> + <field string="Timebox" name="timebox_id" invisible=" not context.get('gtd', False)"/> + <button name="prev_timebox" type="object" icon="gtk-go-back" string="Previous" states="draft,pending,open" invisible=" not context.get('gtd',False)"/> + <button name="next_timebox" type="object" icon="gtk-go-forward" string="Next" states="draft,pending,open" invisible=" not context.get('gtd',False)"/> + <field name="context_id" invisible="not context.get('gtd', False)" widget="selection"/> <button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert" help="For reopening the tasks" invisible="not context.get('set_visible',False)"/> </field> </field> @@ -95,11 +95,22 @@ <field name="inherit_id" ref="project.view_task_form2" /> <field name="arch" type="xml"> <field name="progress" position="after"> - <field name="context_id" widget="selection" groups="project_gtd.group_project_getting"/> - <field name="timebox_id" widget="selection" select="1" groups="project_gtd.group_project_getting"/> + <field name="context_id" widget="selection"/> + <field name="timebox_id" widget="selection" select="1"/> </field> </field> </record> + + <record model="ir.actions.act_window" id="open_gtd_task"> + <field name="name">Todo List</field> + <field name="res_model">project.task</field> + <field name="context">{'set_editable':True,'set_visible':True,'gtd':True,'user_invisible':True, 'search_default_user_id':uid, "search_default_draft": 1, "search_default_open": 1}</field> + <field name="view_type">form</field> + <field name="view_mode">tree,form,calendar,gantt,graph,kanban</field> + </record> + <menuitem action="open_gtd_task" id="menu_open_gtd_timebox_tree" parent="project.menu_project_management" sequence="4"/> + + </data> </openerp> diff --git a/addons/project_gtd/security/ir.model.access.csv b/addons/project_gtd/security/ir.model.access.csv index 0398fbfb0ee..8e85047c51c 100644 --- a/addons/project_gtd/security/ir.model.access.csv +++ b/addons/project_gtd/security/ir.model.access.csv @@ -1,6 +1,4 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" -"access_project_gtd_context","project.gtd.context","model_project_gtd_context","group_project_getting",1,1,1,1 -"access_project_gtd_timebox","project.gtd.timebox","model_project_gtd_timebox","group_project_getting",1,1,1,1 "access_project_gtd_context_user","project.gtd.context project user","model_project_gtd_context","project.group_project_user",1,0,0,0 "access_project_gtd_timebox_user","project.gtd.timebox project user","model_project_gtd_timebox","project.group_project_user",1,0,0,0 "access_project_gtd_context_manager","project.gtd.context project manager","model_project_gtd_context","project.group_project_manager",1,1,1,1 diff --git a/addons/project_issue/i18n/ru.po b/addons/project_issue/i18n/ru.po new file mode 100644 index 00000000000..5c1528e4c92 --- /dev/null +++ b/addons/project_issue/i18n/ru.po @@ -0,0 +1,967 @@ +# Russian translation for openobject-addons +# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR <EMAIL@ADDRESS>, 2011. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" +"POT-Creation-Date: 2011-01-11 11:15+0000\n" +"PO-Revision-Date: 2011-11-07 22:20+0000\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: Russian <ru@li.org>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2011-11-08 05:49+0000\n" +"X-Generator: Launchpad (build 14231)\n" + +#. module: project_issue +#: field:project.issue.report,delay_open:0 +msgid "Avg. Delay to Open" +msgstr "Средняя задержка при Открытии" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +msgid "Group By..." +msgstr "Группировать по ..." + +#. module: project_issue +#: field:project.issue,working_hours_open:0 +msgid "Working Hours to Open the Issue" +msgstr "" + +#. module: project_issue +#: constraint:project.project:0 +msgid "Error! project start-date must be lower then project end-date." +msgstr "" +"Ошибка! Дата начала проекта должна быть раньше даты окончания проекта." + +#. module: project_issue +#: field:project.issue,date_open:0 +msgid "Opened" +msgstr "Открыто" + +#. module: project_issue +#: field:project.issue.report,opening_date:0 +msgid "Date of Opening" +msgstr "Дата открытия" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "March" +msgstr "Март" + +#. module: project_issue +#: field:project.issue,progress:0 +msgid "Progress (%)" +msgstr "Выполнение (%)" + +#. module: project_issue +#: field:project.issue,company_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,company_id:0 +msgid "Company" +msgstr "Организация" + +#. module: project_issue +#: field:project.issue,email_cc:0 +msgid "Watchers Emails" +msgstr "Адреса наблюдателей" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Close Working hours" +msgstr "" + +#. module: project_issue +#: model:ir.model,name:project_issue.model_project_issue_version +msgid "project.issue.version" +msgstr "project.issue.version" + +#. module: project_issue +#: field:project.issue,day_open:0 +msgid "Days to Open" +msgstr "Дней до открытия" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:360 +#, python-format +msgid "" +"You cannot escalate this issue.\n" +"The relevant Project has not configured the Escalation Project!" +msgstr "" +"Не возможна эскалация этой проблемы.\n" +"Связанный с проблемой проект ещё не настроил процедуры эскалации!" + +#. module: project_issue +#: constraint:project.project:0 +msgid "Error! You cannot assign escalation to the same project!" +msgstr "Ошибка! Вы не можете назначить эскалацию на тот же проект!" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Date Closed" +msgstr "Дата закрытия" + +#. module: project_issue +#: view:project.issue.report:0 +#: field:project.issue.report,day:0 +msgid "Day" +msgstr "День" + +#. module: project_issue +#: view:project.issue:0 +msgid "Add Internal Note" +msgstr "Добавить внутреннюю заметку" + +#. module: project_issue +#: field:project.issue,task_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,task_id:0 +msgid "Task" +msgstr "Задача" + +#. module: project_issue +#: view:board.board:0 +msgid "Issues By Stage" +msgstr "Проблемы по стадии" + +#. module: project_issue +#: field:project.issue,partner_mobile:0 +msgid "Mobile" +msgstr "Мобильный" + +#. module: project_issue +#: field:project.issue,message_ids:0 +msgid "Messages" +msgstr "Сообщения" + +#. module: project_issue +#: model:ir.model,name:project_issue.model_project_project +#: view:project.issue:0 +#: field:project.issue,project_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,project_id:0 +msgid "Project" +msgstr "Проект" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_view_my_open_project_issue_tree +msgid "My Open Project issues" +msgstr "Мои открытые проблемы по проекту" + +#. module: project_issue +#: selection:project.issue,state:0 +#: selection:project.issue.report,state:0 +msgid "Cancelled" +msgstr "Отменен" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:360 +#, python-format +msgid "Warning !" +msgstr "Warning !" + +#. module: project_issue +#: field:project.issue.report,date_closed:0 +msgid "Date of Closing" +msgstr "Дата закрытия" + +#. module: project_issue +#: view:project.issue:0 +msgid "Issue Tracker Search" +msgstr "Поиск по проблемам" + +#. module: project_issue +#: field:project.issue.report,working_hours_open:0 +msgid "Avg. Working Hours to Open" +msgstr "Ср. кол-во часов до открытия" + +#. module: project_issue +#: field:project.issue,date_action_next:0 +msgid "Next Action" +msgstr "Следующее действие" + +#. module: project_issue +#: help:project.project,project_escalation_id:0 +msgid "" +"If any issue is escalated from the current Project, it will be listed under " +"the project selected here." +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Extra Info" +msgstr "Доп. инфо." + +#. module: project_issue +#: model:ir.actions.act_window,help:project_issue.action_project_issue_report +msgid "" +"This report on the project issues allows you to analyse the quality of your " +"support or after-sales services. You can track the issues per age. You can " +"analyse the time required to open or close an issue, the number of email to " +"exchange and the time spent on average by issues." +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,partner_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,partner_id:0 +msgid "Partner" +msgstr "Контрагент" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:473 +#, python-format +msgid " (copy)" +msgstr " (копия)" + +#. module: project_issue +#: view:project.issue:0 +msgid "Previous" +msgstr "Предыдущий" + +#. module: project_issue +#: view:project.issue:0 +msgid "Statistics" +msgstr "Статистика" + +#. module: project_issue +#: view:project.issue:0 +msgid "Convert To Task" +msgstr "Преобразовать в задачу" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_project_issue_report +#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree +#: view:project.issue.report:0 +msgid "Issues Analysis" +msgstr "Анализ проблемы" + +#. module: project_issue +#: field:project.issue.version,name:0 +msgid "Version Number" +msgstr "Номер версии" + +#. module: project_issue +#: view:project.issue:0 +msgid "Next" +msgstr "Следующий" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,priority:0 +#: view:project.issue.report:0 +#: field:project.issue.report,priority:0 +msgid "Priority" +msgstr "Приоритет" + +#. module: project_issue +#: view:project.issue:0 +msgid "Send New Email" +msgstr "Отправить новое эл. письмо" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,version_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,version_id:0 +msgid "Version" +msgstr "Версия" + +#. module: project_issue +#: model:ir.module.module,shortdesc:project_issue.module_meta_information +msgid "Issue Management in Project Management" +msgstr "Управление инцидентами в управлении проектами" + +#. module: project_issue +#: view:board.board:0 +msgid "Pending Issues" +msgstr "Ожидающие инциденты" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Open Working Hours" +msgstr "Открыто рабочих часов" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.project_issue_categ_action +msgid "Issue Categories" +msgstr "Категории инцидентов" + +#. module: project_issue +#: field:project.issue,email_from:0 +msgid "Email" +msgstr "Электронная почта" + +#. module: project_issue +#: field:project.issue,canal_id:0 +#: field:project.issue.report,canal_id:0 +msgid "Channel" +msgstr "Канал" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "Lowest" +msgstr "Низший" + +#. module: project_issue +#: field:project.issue,create_date:0 +#: field:project.issue.report,creation_date:0 +msgid "Creation Date" +msgstr "Дата создания" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.project_issue_version_action +#: model:ir.ui.menu,name:project_issue.menu_project_issue_version_act +msgid "Versions" +msgstr "Версии" + +#. module: project_issue +#: field:project.issue,partner_phone:0 +msgid "Phone" +msgstr "Телефон" + +#. module: project_issue +#: view:project.issue:0 +msgid "Reset to Draft" +msgstr "Вернуть в черновики" + +#. module: project_issue +#: view:project.issue:0 +msgid "Today" +msgstr "Сегодня" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.open_board_project_issue +#: model:ir.ui.menu,name:project_issue.menu_deshboard_project_issue +msgid "Project Issue Dashboard" +msgstr "Инфо-панель \"Инциденты проекта\"" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +msgid "Done" +msgstr "Выполнено" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "July" +msgstr "Июль" + +#. module: project_issue +#: model:ir.ui.menu,name:project_issue.menu_project_issue_category_act +msgid "Categories" +msgstr "Категории" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +#: field:project.issue.report,type_id:0 +msgid "Stage" +msgstr "Этап" + +#. module: project_issue +#: view:project.issue:0 +msgid "History Information" +msgstr "История" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_view_current_project_issue_tree +#: model:ir.actions.act_window,name:project_issue.action_view_pending_project_issue_tree +msgid "Project issues" +msgstr "Инциденты проекта" + +#. module: project_issue +#: view:project.issue:0 +msgid "Communication & History" +msgstr "Общение & история" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "My Open Project Issue" +msgstr "Мой открытый инцидент" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_view_my_project_issue_tree +msgid "My Project Issues" +msgstr "Мои инциденты" + +#. module: project_issue +#: view:project.issue:0 +msgid "Contact" +msgstr "Контакт" + +#. module: project_issue +#: view:board.board:0 +msgid "My Board" +msgstr "Моя панель" + +#. module: project_issue +#: view:board.board:0 +msgid "My Issues" +msgstr "Мои инциденты" + +#. module: project_issue +#: help:project.issue,canal_id:0 +msgid "" +"The channels represent the different communication modes available with the " +"customer. With each commercial opportunity, you can indicate the canall " +"which is this opportunity source." +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,help:project_issue.project_issue_version_action +msgid "" +"You can use the issues tracker in OpenERP to handle bugs in the software " +"development project, to handle claims in after-sales services, etc. Define " +"here the different versions of your products on which you can work on issues." +msgstr "" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:283 +#, python-format +msgid "Tasks" +msgstr "Задачи" + +#. module: project_issue +#: field:project.issue.report,nbr:0 +msgid "# of Issues" +msgstr "Кол-во инцидентов" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "September" +msgstr "Сентябрь" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "December" +msgstr "Декабрь" + +#. module: project_issue +#: view:project.issue:0 +msgid "Issue Tracker Tree" +msgstr "Дерево инцидентов" + +#. module: project_issue +#: help:project.issue,assigned_to:0 +msgid "This is the current user to whom the related task have been assigned" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +#: field:project.issue.report,month:0 +msgid "Month" +msgstr "Месяц" + +#. module: project_issue +#: model:ir.model,name:project_issue.model_project_issue_report +msgid "project.issue.report" +msgstr "project.issue.report" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:362 +#: view:project.issue:0 +#, python-format +msgid "Escalate" +msgstr "Эскалировать" + +#. module: project_issue +#: model:crm.case.categ,name:project_issue.feature_request_categ +msgid "Feature Requests" +msgstr "Запросы на доработку" + +#. module: project_issue +#: field:project.issue,write_date:0 +msgid "Update Date" +msgstr "Дата изменения" + +#. module: project_issue +#: model:ir.module.module,description:project_issue.module_meta_information +msgid "" +"\n" +" This module provide Issues/Bugs Management in Project\n" +" " +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,categ_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,categ_id:0 +msgid "Category" +msgstr "Категория" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "#Number of Project Issues" +msgstr "Кол-во инцидентов на проекте" + +#. module: project_issue +#: help:project.issue,email_cc:0 +msgid "" +"These email addresses will be added to the CC field of all inbound and " +"outbound emails for this record before being sent. Separate multiple email " +"addresses with a comma" +msgstr "" +"Эти электронные адреса будут добавлены в поле \"Копия\" всех входящих и " +"исходящих сообщений для этой записи перед отправкой. Разделяйте адреса " +"запятыми." + +#. module: project_issue +#: selection:project.issue,state:0 +#: selection:project.issue.report,state:0 +msgid "Draft" +msgstr "Черновик" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "Low" +msgstr "Низкий" + +#. module: project_issue +#: field:project.issue,date_closed:0 +#: selection:project.issue,state:0 +#: selection:project.issue.report,state:0 +msgid "Closed" +msgstr "Закрыт" + +#. module: project_issue +#: field:project.issue.report,delay_close:0 +msgid "Avg. Delay to Close" +msgstr "Ср. задержка перед закрытием" + +#. module: project_issue +#: view:project.issue:0 +#: selection:project.issue,state:0 +#: view:project.issue.report:0 +#: selection:project.issue.report,state:0 +msgid "Pending" +msgstr "В ожидании" + +#. module: project_issue +#: view:project.issue:0 +msgid "Status" +msgstr "Состояние" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "#Project Issues" +msgstr "Кол-во инцидентов на проекте" + +#. module: project_issue +#: view:board.board:0 +msgid "Current Issues" +msgstr "Текущие индиденты" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "August" +msgstr "Август" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "Normal" +msgstr "Обычный" + +#. module: project_issue +#: view:project.issue:0 +msgid "Global CC" +msgstr "Глобальная копия" + +#. module: project_issue +#: view:project.issue:0 +#: selection:project.issue,state:0 +msgid "To Do" +msgstr "Сделать" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "June" +msgstr "Июнь" + +#. module: project_issue +#: field:project.issue,day_close:0 +msgid "Days to Close" +msgstr "Дней до закрытия" + +#. module: project_issue +#: field:project.issue,active:0 +#: field:project.issue.version,active:0 +msgid "Active" +msgstr "Активный" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "November" +msgstr "Ноябрь" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +msgid "Extended Filters..." +msgstr "Расширенные фильтры..." + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Search" +msgstr "Поиск" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "October" +msgstr "Октябрь" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "January" +msgstr "Январь" + +#. module: project_issue +#: view:project.issue:0 +msgid "Feature Tracker Tree" +msgstr "Дерево запросов функциональности" + +#. module: project_issue +#: model:crm.case.categ,name:project_issue.bug_categ +msgid "Bugs" +msgstr "" + +#. module: project_issue +#: view:board.board:0 +msgid "Issues By State" +msgstr "Инциденты по состоянию" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,date:0 +msgid "Date" +msgstr "Дата" + +#. module: project_issue +#: field:project.issue,partner_address_id:0 +msgid "Partner Contact" +msgstr "Контакт контрагента" + +#. module: project_issue +#: field:project.issue,type_id:0 +msgid "Resolution" +msgstr "Решение" + +#. module: project_issue +#: view:project.issue:0 +msgid "History" +msgstr "История" + +#. module: project_issue +#: field:project.issue,assigned_to:0 +#: view:project.issue.report:0 +#: field:project.issue.report,assigned_to:0 +msgid "Assigned to" +msgstr "Назначено" + +#. module: project_issue +#: field:project.project,reply_to:0 +msgid "Reply-To Email Address" +msgstr "Обратный адрес электронной почты" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "Highest" +msgstr "Наивысший" + +#. module: project_issue +#: view:project.issue:0 +msgid "Attachments" +msgstr "Прикрепленные файлы" + +#. module: project_issue +#: view:project.issue:0 +msgid "Issue Tracker Form" +msgstr "Форма для отслеживания инцидентов" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,state:0 +#: view:project.issue.report:0 +#: field:project.issue.report,state:0 +msgid "State" +msgstr "Состояние" + +#. module: project_issue +#: view:project.issue:0 +msgid "General" +msgstr "" + +#. module: project_issue +#: view:project.issue.version:0 +msgid "Issue Version" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Communication" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Cancel" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Close" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: selection:project.issue.report,state:0 +msgid "Open" +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.act_project_project_2_project_issue_all +#: model:ir.actions.act_window,name:project_issue.project_issue_categ_act0 +#: model:ir.ui.menu,name:project_issue.menu_project_issue_track +#: view:project.issue:0 +msgid "Issues" +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_stage +#: model:ir.actions.act_window,name:project_issue.action_project_issue_graph_state +#: model:ir.model,name:project_issue.model_project_issue +#: model:ir.ui.menu,name:project_issue.menu_project_confi +#: view:project.issue.report:0 +msgid "Project Issue" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,user_id:0 +#: view:project.issue.report:0 +#: field:project.issue.report,user_id:0 +msgid "Responsible" +msgstr "" + +#. module: project_issue +#: help:project.issue,progress:0 +msgid "Computed as: Time Spent / Total Time." +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: view:project.issue.report:0 +msgid "Current" +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,help:project_issue.project_issue_categ_act0 +msgid "" +"Issues such as system bugs, customer complaints, and material breakdowns are " +"collected here. You can define the stages assigned when solving the project " +"issue (analysis, development, done). With the mailgateway module, issues can " +"be integrated through an email address (example: support@mycompany.com)" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Details" +msgstr "" + +#. module: project_issue +#: help:project.issue,email_from:0 +msgid "These people will receive email." +msgstr "Эти люди получат эл. письма." + +#. module: project_issue +#: view:project.issue:0 +msgid "Reply" +msgstr "" + +#. module: project_issue +#: field:project.issue,name:0 +msgid "Issue" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Feature Tracker Search" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +#: field:project.issue,description:0 +msgid "Description" +msgstr "" + +#. module: project_issue +#: field:project.issue,section_id:0 +msgid "Sales Team" +msgstr "" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "May" +msgstr "" + +#. module: project_issue +#: model:ir.actions.act_window,name:project_issue.action_project_issue_report +#: model:ir.ui.menu,name:project_issue.menu_project_issue_report_tree +msgid "Issue Analysis" +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Sale Team " +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +#: field:project.issue.report,email:0 +msgid "# Emails" +msgstr "" + +#. module: project_issue +#: field:project.issue,partner_name:0 +msgid "Employee's Name" +msgstr "" + +#. module: project_issue +#: help:project.issue,state:0 +msgid "" +"The state is set to 'Draft', when a case is created. " +" \n" +"If the case is in progress the state is set to 'Open'. " +" \n" +"When the case is over, the state is set to 'Done'. " +" \n" +"If the case needs to be reviewed then the state is set to 'Pending'." +msgstr "" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "February" +msgstr "" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:61 +#, python-format +msgid "Issue '%s' has been opened." +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "Feature description" +msgstr "" + +#. module: project_issue +#: field:project.project,project_escalation_id:0 +msgid "Project Escalation" +msgstr "" + +#. module: project_issue +#: help:project.issue,section_id:0 +msgid "" +"Sales team to which Case belongs to. Define " +"Responsible user and Email account for mail gateway." +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +msgid "Month-1" +msgstr "" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:76 +#, python-format +msgid "Issue '%s' has been closed." +msgstr "" + +#. module: project_issue +#: selection:project.issue.report,month:0 +msgid "April" +msgstr "" + +#. module: project_issue +#: view:project.issue:0 +msgid "References" +msgstr "" + +#. module: project_issue +#: field:project.issue,working_hours_close:0 +msgid "Working Hours to Close the Issue" +msgstr "" + +#. module: project_issue +#: field:project.issue,id:0 +msgid "ID" +msgstr "" + +#. module: project_issue +#: code:addons/project_issue/project_issue.py:377 +#, python-format +msgid "No Title" +msgstr "" + +#. module: project_issue +#: help:project.issue.report,delay_close:0 +#: help:project.issue.report,delay_open:0 +msgid "Number of Days to close the project issue" +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +#: field:project.issue.report,section_id:0 +msgid "Sale Team" +msgstr "" + +#. module: project_issue +#: field:project.issue.report,working_hours_close:0 +msgid "Avg. Working Hours to Close" +msgstr "" + +#. module: project_issue +#: selection:project.issue,priority:0 +#: selection:project.issue.report,priority:0 +msgid "High" +msgstr "" + +#. module: project_issue +#: field:project.issue,date_deadline:0 +msgid "Deadline" +msgstr "" + +#. module: project_issue +#: field:project.issue,date_action_last:0 +msgid "Last Action" +msgstr "" + +#. module: project_issue +#: view:project.issue.report:0 +#: field:project.issue.report,name:0 +msgid "Year" +msgstr "" + +#. module: project_issue +#: field:project.issue,duration:0 +msgid "Duration" +msgstr "" + +#. module: project_issue +#: view:board.board:0 +msgid "My Open Issues by Creation Date" +msgstr "" + +#~ msgid "Maintenance" +#~ msgstr "Обслуживание" diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 228a899a640..a67d60b5890 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -196,7 +196,7 @@ class project_issue(crm.crm_case, osv.osv): domain="[('partner_id','=',partner_id)]"), 'company_id': fields.many2one('res.company', 'Company'), 'description': fields.text('Description'), - 'state': fields.selection([('draft', 'New'), ('open', 'To Solve'), ('cancel', 'Cancelled'), ('done', 'Closed'),('pending', 'Pending'), ], 'State', size=16, readonly=True, + 'state': fields.selection([('draft', 'New'), ('open', 'In Progress'), ('cancel', 'Cancelled'), ('done', 'Done'),('pending', 'Pending'), ], 'State', size=16, readonly=True, help='The state is set to \'Draft\', when a case is created.\ \nIf the case is in progress the state is set to \'Open\'.\ \nWhen the case is over, the state is set to \'Done\'.\ diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index c6d852cfde0..e064f0c8c8f 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -2,7 +2,7 @@ <openerp> <data> - <menuitem id="menu_project_confi" name="Project Issue" parent="project.menu_definitions" sequence="2"/> + <menuitem id="menu_project_confi" name="Issues" parent="project.menu_definitions" sequence="2"/> <record model="ir.ui.view" id="project_issue_version_search_view"> <field name="name">Issue Version</field> @@ -85,8 +85,8 @@ <group col="8" colspan="4"> <field name="state" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/> <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/> - <button name="case_open" string="Solve" states="draft,pending" type="object" icon="gtk-go-forward"/> - <button name="case_close" string="Close" states="open,draft,pending" type="object" icon="terp-dialog-close"/> + <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/> + <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/> <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/> <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/> <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/> diff --git a/addons/project_long_term/test/test_schedule_phases_case1.yml b/addons/project_long_term/test/test_schedule_phases_case1.yml index a413309419d..8b9ff5f3705 100644 --- a/addons/project_long_term/test/test_schedule_phases_case1.yml +++ b/addons/project_long_term/test/test_schedule_phases_case1.yml @@ -70,7 +70,7 @@ second_phase = self.browse(cr, uid, ref('project_phase_secondphase0_case2')) start = first_phase.date_end - end = (datetime.date.today() + relativedelta(days=5)).strftime('%Y-%m-%d') + end = (datetime.date.today() + relativedelta(days=4)).strftime('%Y-%m-%d') assert second_phase.date_start >= start, 'Dates are wrong on second phase: %s < %s!' % (second_phase.date_start, start) assert second_phase.date_end >= end, 'Dates are wrong on second phase %s < %s!' % (second_phase.date_end, end) diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py index f022f952792..f1c48f97c00 100644 --- a/addons/project_mrp/project_procurement.py +++ b/addons/project_mrp/project_procurement.py @@ -19,9 +19,7 @@ # ############################################################################## -from osv import fields, osv, orm - -import tools +from osv import fields, osv class procurement_order(osv.osv): _name = "procurement.order" @@ -30,11 +28,25 @@ class procurement_order(osv.osv): 'task_id': fields.many2one('project.task', 'Task'), 'sale_line_id': fields.many2one('sale.order.line', 'Sale order line') } + def check_produce_service(self, cr, uid, procurement, context=None): return True def action_produce_assign_service(self, cr, uid, ids, context=None): + project_obj = self.pool.get('project.project') for procurement in self.browse(cr, uid, ids, context=context): + # project_id = the product's associated project if it exists, + # the sales order's associated project otherwise + project_id = False + if procurement.product_id.project_id: + project_id = procurement.product_id.project_id.id + elif procurement.sale_line_id: + account_id = procurement.sale_line_id.order_id.project_id.id + if account_id: + project_ids = project_obj.search(cr, uid, [('analytic_account_id', '=', account_id)]) + project_id = project_ids and project_ids[0] or False + + # create task under the project self.write(cr, uid, [procurement.id], {'state': 'running'}) planned_hours = procurement.product_qty task_id = self.pool.get('project.task').create(cr, uid, { @@ -47,7 +59,7 @@ class procurement_order(osv.osv): 'procurement_id': procurement.id, 'description': procurement.note, 'date_deadline': procurement.date_planned, - 'project_id': procurement.product_id.project_id and procurement.product_id.project_id.id or False, + 'project_id': project_id, 'state': 'draft', 'company_id': procurement.company_id.id, },context=context) diff --git a/addons/purchase/i18n/ar.po b/addons/purchase/i18n/ar.po index 46f1e75390c..11027da5da2 100644 --- a/addons/purchase/i18n/ar.po +++ b/addons/purchase/i18n/ar.po @@ -1548,7 +1548,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/bg.po b/addons/purchase/i18n/bg.po index 6936ae31f7c..619436f2e86 100644 --- a/addons/purchase/i18n/bg.po +++ b/addons/purchase/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-08-03 10:12+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Boris <boris.t.ivanov@gmail.com>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/bs.po b/addons/purchase/i18n/bs.po index 9dc4745a5cf..3c0d0e210d1 100644 --- a/addons/purchase/i18n/bs.po +++ b/addons/purchase/i18n/bs.po @@ -1563,7 +1563,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/ca.po b/addons/purchase/i18n/ca.po index d90fd09ea73..24429012b29 100644 --- a/addons/purchase/i18n/ca.po +++ b/addons/purchase/i18n/ca.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-08-17 21:54+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/cs.po b/addons/purchase/i18n/cs.po index bb06d49e28f..a3a9b09968b 100644 --- a/addons/purchase/i18n/cs.po +++ b/addons/purchase/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-07-15 02:37+0000\n" +"PO-Revision-Date: 2011-11-07 12:54+0000\n" "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" diff --git a/addons/purchase/i18n/de.po b/addons/purchase/i18n/de.po index 1aef4f24994..6aa22d7b2d1 100644 --- a/addons/purchase/i18n/de.po +++ b/addons/purchase/i18n/de.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-18 11:29+0000\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-" "consulting.net>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/el.po b/addons/purchase/i18n/el.po index 0bf4fda3a2a..1ee24f75a7b 100644 --- a/addons/purchase/i18n/el.po +++ b/addons/purchase/i18n/el.po @@ -1573,7 +1573,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/es.po b/addons/purchase/i18n/es.po index 864ef98e53d..755695102f8 100644 --- a/addons/purchase/i18n/es.po +++ b/addons/purchase/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-10-16 23:04+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/es_AR.po b/addons/purchase/i18n/es_AR.po index e0affce752a..aa4f1d6000c 100644 --- a/addons/purchase/i18n/es_AR.po +++ b/addons/purchase/i18n/es_AR.po @@ -1569,7 +1569,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/es_CL.po b/addons/purchase/i18n/es_CL.po index 88f4bae4a89..9a753ce299b 100644 --- a/addons/purchase/i18n/es_CL.po +++ b/addons/purchase/i18n/es_CL.po @@ -1630,7 +1630,7 @@ msgstr "Febrero" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorías de productos" #. module: purchase diff --git a/addons/purchase/i18n/es_EC.po b/addons/purchase/i18n/es_EC.po index 4ad16cf7a80..1507c035063 100644 --- a/addons/purchase/i18n/es_EC.po +++ b/addons/purchase/i18n/es_EC.po @@ -1586,7 +1586,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/et.po b/addons/purchase/i18n/et.po index 889df903a72..72e825bf7a8 100644 --- a/addons/purchase/i18n/et.po +++ b/addons/purchase/i18n/et.po @@ -1588,7 +1588,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/fi.po b/addons/purchase/i18n/fi.po index 8c7ee3e6300..361ed5c8603 100644 --- a/addons/purchase/i18n/fi.po +++ b/addons/purchase/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-12-16 05:43+0000\n" +"PO-Revision-Date: 2011-11-07 12:55+0000\n" "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n" "Language-Team: Finnish <fi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/fr.po b/addons/purchase/i18n/fr.po index db973eecd8d..89bdac8d444 100644 --- a/addons/purchase/i18n/fr.po +++ b/addons/purchase/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-19 08:42+0000\n" -"Last-Translator: Xavier Verbeke <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:55+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/gl.po b/addons/purchase/i18n/gl.po index ecdbc48a444..7d5fdaf2106 100644 --- a/addons/purchase/i18n/gl.po +++ b/addons/purchase/i18n/gl.po @@ -1549,7 +1549,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/hr.po b/addons/purchase/i18n/hr.po index c53a7f03181..b1d2cf956ae 100644 --- a/addons/purchase/i18n/hr.po +++ b/addons/purchase/i18n/hr.po @@ -1549,7 +1549,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/hu.po b/addons/purchase/i18n/hu.po index 0920f236111..27aa4fa3bd4 100644 --- a/addons/purchase/i18n/hu.po +++ b/addons/purchase/i18n/hu.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-02-09 18:38+0000\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " "<openerp@novotrade.hu>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/id.po b/addons/purchase/i18n/id.po index da0571417ef..c10f1c6e9db 100644 --- a/addons/purchase/i18n/id.po +++ b/addons/purchase/i18n/id.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-25 06:44+0000\n" -"Last-Translator: moelyana <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/it.po b/addons/purchase/i18n/it.po index e0e6b8f7ff8..ca9077d432c 100644 --- a/addons/purchase/i18n/it.po +++ b/addons/purchase/i18n/it.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-12 04:56+0000\n" +"PO-Revision-Date: 2011-11-07 12:52+0000\n" "Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/ko.po b/addons/purchase/i18n/ko.po index b3158d53873..d0da7599b25 100644 --- a/addons/purchase/i18n/ko.po +++ b/addons/purchase/i18n/ko.po @@ -1552,7 +1552,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po index f17f0f19832..d123fb6d378 100644 --- a/addons/purchase/i18n/lt.po +++ b/addons/purchase/i18n/lt.po @@ -1554,7 +1554,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/mn.po b/addons/purchase/i18n/mn.po index b284e036c72..1012b60dafa 100644 --- a/addons/purchase/i18n/mn.po +++ b/addons/purchase/i18n/mn.po @@ -1570,7 +1570,7 @@ msgstr "2 сар" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/nl.po b/addons/purchase/i18n/nl.po index cb806c78e94..381c796a1c7 100644 --- a/addons/purchase/i18n/nl.po +++ b/addons/purchase/i18n/nl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-16 17:01+0000\n" -"Last-Translator: Douwe Wullink (Dypalio) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/nl_BE.po b/addons/purchase/i18n/nl_BE.po index c7b71623030..6019b6af6da 100644 --- a/addons/purchase/i18n/nl_BE.po +++ b/addons/purchase/i18n/nl_BE.po @@ -1548,7 +1548,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/pl.po b/addons/purchase/i18n/pl.po index 3b7efd0fd13..4f5b8ee53c6 100644 --- a/addons/purchase/i18n/pl.po +++ b/addons/purchase/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-22 13:10+0000\n" +"PO-Revision-Date: 2011-11-07 12:53+0000\n" "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/pt.po b/addons/purchase/i18n/pt.po index 12abf2a59d1..3a713a2b118 100644 --- a/addons/purchase/i18n/pt.po +++ b/addons/purchase/i18n/pt.po @@ -1580,7 +1580,7 @@ msgstr "Fevereiro" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po index d34314818df..a8e82a4db94 100644 --- a/addons/purchase/i18n/pt_BR.po +++ b/addons/purchase/i18n/pt_BR.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: pt_BR\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-02-28 21:53+0000\n" -"Last-Translator: Emerson <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: <pt@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:57+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/purchase.pot b/addons/purchase/i18n/purchase.pot index d2d9d952797..4f093b771f9 100644 --- a/addons/purchase/i18n/purchase.pot +++ b/addons/purchase/i18n/purchase.pot @@ -1475,7 +1475,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/ro.po b/addons/purchase/i18n/ro.po index b820bccd239..1b90abfe14a 100644 --- a/addons/purchase/i18n/ro.po +++ b/addons/purchase/i18n/ro.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-04-04 15:03+0000\n" -"Last-Translator: Mihai Satmarean <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/ru.po b/addons/purchase/i18n/ru.po index af0ac13f452..48335dbbf50 100644 --- a/addons/purchase/i18n/ru.po +++ b/addons/purchase/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-03-24 14:57+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2011-11-05 04:56+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/sl.po b/addons/purchase/i18n/sl.po index 940af93ec59..9d80b7e205c 100644 --- a/addons/purchase/i18n/sl.po +++ b/addons/purchase/i18n/sl.po @@ -1558,7 +1558,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/sq.po b/addons/purchase/i18n/sq.po index f552280bf88..cfac8534d84 100644 --- a/addons/purchase/i18n/sq.po +++ b/addons/purchase/i18n/sq.po @@ -1549,7 +1549,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/sr.po b/addons/purchase/i18n/sr.po index 0d2a1b6e3bb..3b1a4f7e9a0 100644 --- a/addons/purchase/i18n/sr.po +++ b/addons/purchase/i18n/sr.po @@ -1564,7 +1564,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/sr@latin.po b/addons/purchase/i18n/sr@latin.po index 1ae5652283d..f3c6af3d628 100644 --- a/addons/purchase/i18n/sr@latin.po +++ b/addons/purchase/i18n/sr@latin.po @@ -1564,7 +1564,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/sv.po b/addons/purchase/i18n/sv.po index febc34445d7..30986c6e224 100644 --- a/addons/purchase/i18n/sv.po +++ b/addons/purchase/i18n/sv.po @@ -1567,7 +1567,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/th.po b/addons/purchase/i18n/th.po index a01cdc88f8b..708bcaa31cc 100644 --- a/addons/purchase/i18n/th.po +++ b/addons/purchase/i18n/th.po @@ -1584,7 +1584,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/tlh.po b/addons/purchase/i18n/tlh.po index 75a40a459d2..eebe4256b17 100644 --- a/addons/purchase/i18n/tlh.po +++ b/addons/purchase/i18n/tlh.po @@ -1548,7 +1548,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po index 0b420069daf..52ba5cd56b9 100644 --- a/addons/purchase/i18n/tr.po +++ b/addons/purchase/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2010-12-16 04:39+0000\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" "Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\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: 2011-11-05 04:57+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/uk.po b/addons/purchase/i18n/uk.po index f2165409ed5..50192074c87 100644 --- a/addons/purchase/i18n/uk.po +++ b/addons/purchase/i18n/uk.po @@ -1556,7 +1556,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/vi.po b/addons/purchase/i18n/vi.po index 0de713a8aa3..3762f2620f6 100644 --- a/addons/purchase/i18n/vi.po +++ b/addons/purchase/i18n/vi.po @@ -1549,7 +1549,7 @@ msgstr "Tháng Hai" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/purchase/i18n/zh_CN.po b/addons/purchase/i18n/zh_CN.po index e9308c7c985..9e67dc54b69 100644 --- a/addons/purchase/i18n/zh_CN.po +++ b/addons/purchase/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:15+0000\n" -"PO-Revision-Date: 2011-01-28 02:07+0000\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" "Last-Translator: Wei \"oldrev\" Li <oldrev@gmail.com>\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: 2011-11-05 04:57+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:40+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: purchase diff --git a/addons/purchase/i18n/zh_TW.po b/addons/purchase/i18n/zh_TW.po index 985473b79a4..6c74fa1a99c 100644 --- a/addons/purchase/i18n/zh_TW.po +++ b/addons/purchase/i18n/zh_TW.po @@ -1548,7 +1548,7 @@ msgstr "" #. module: purchase #: model:ir.ui.menu,name:purchase.menu_product_category_config_purchase -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: purchase diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 294a1c29c00..aea79abfa37 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -1315,6 +1315,7 @@ class sale_config_picking_policy(osv.osv_memory): if wizard.task_work: module_name.append('project_timesheet') + module_name.append('project_mrp') module_name.append('account_analytic_analysis') if wizard.timesheet: diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index e49e22c71c7..85ae2c7cb5c 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -119,40 +119,51 @@ <form string="Sales Order Lines"> <notebook> <page string="Order Line"> - <field colspan="4" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_id" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/> + <group colspan="4" col="5"> + <field colspan="3" + context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" + name="product_id" + on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)"/> + <field name="name"/> + <field context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" name="product_uom_qty" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/> - <field name="product_uom" on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/> + <field name="product_uom" + on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)" + nolabel="1"/> + <field name="price_unit"/> + <field groups="product.group_uos" name="product_uos_qty"/> <field groups="product.group_uos" name="product_uos"/> - <field name="product_packaging" context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="base.group_extended"/> - <field colspan="4" name="name"/> - <field name="price_unit"/> - <field name="discount"/> - <field name="type" groups="base.group_extended"/> - <field name="delay" groups="base.group_extended"/> <newline/> + <field name="product_packaging" + context="{'partner_id':parent.partner_id, 'quantity':product_uom_qty, 'pricelist':parent.pricelist_id, 'shop':parent.shop_id, 'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" + domain="[('product_id','=',product_id)]" groups="base.group_extended" + colspan="3"/> + <field name="discount"/> + <separator colspan="5" string="Notes"/> + <field colspan="5" name="notes" nolabel="1"/> <separator colspan="5" string="Taxes"/> - <field colspan="4" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/> - <group colspan="4" col="5" groups="base.group_extended"> + <field colspan="5" name="tax_id" nolabel="1" domain="[('parent_id','=',False),('type_tax_use','<>','purchase')]"/> + <group colspan="5" col="5" groups="base.group_extended"> <separator colspan="5" string="States"/> <field name="state"/> <field name="invoiced"/> <group attrs="{'invisible':[('invoiced','=',True)]}"> - <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/> - </group> + <button colspan="1" name="%(action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoices" type="action" icon="terp-document-new"/> + </group> </group> + </group> </page> <page groups="base.group_extended" string="Extra Info"> + <field name="type"/> + <field name="delay"/> <field name="th_weight"/> <field name="address_allotment_id"/> <field name="property_ids" colspan="4"/> </page> - <page string="Notes"> - <field colspan="4" name="notes" nolabel="1"/> - </page> <page string="History" groups="base.group_extended"> <separator colspan="4" string="Invoice Lines"/> <field colspan="4" name="invoice_lines" nolabel="1"/> diff --git a/addons/sale_layout/sale_layout.py b/addons/sale_layout/sale_layout.py index 0c81586c08c..7c15713d3b3 100644 --- a/addons/sale_layout/sale_layout.py +++ b/addons/sale_layout/sale_layout.py @@ -117,8 +117,8 @@ class sale_order_line(osv.osv): ('subtotal', 'Sub Total'), ('line', 'Separator Line'), ('break', 'Page Break'),] - ,'Layout Type', select=True, required=True), - 'sequence': fields.integer('Layout Sequence'), + ,'Line Type', select=True, required=True), + 'sequence': fields.integer('Line Sequence'), 'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Sale Price'), readonly=True, states={'draft': [('readonly', False)]}), 'product_uom_qty': fields.float('Quantity (UoM)', digits=(16,2)), 'product_uom': fields.many2one('product.uom', 'Product UoM'), diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml index 3b0600f9d8b..79adefa32f3 100644 --- a/addons/sale_layout/sale_layout_view.xml +++ b/addons/sale_layout/sale_layout_view.xml @@ -14,60 +14,83 @@ <field name="arch" type="xml"> <xpath expr="/form/notebook/page/field[@name='order_line']" position="replace"> <field name="abstract_line_ids" colspan="4" nolabel="1" widget="one2many_list"> - <form string="Sale Order Lines"> + <form string="Order Line"> <notebook> <page string="Order Line"> - <separator colspan="4" string="Automatic Declaration"/> - <field colspan="4" + <group colspan="4" col="5"> + <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/> + <field name="sequence" groups="base.group_extended"/> + </group> + <group colspan="4" col="5"> + <field colspan="3" context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}" name="product_id" - attrs="{'readonly':[('layout_type','!=','article')]}" + attrs="{'invisible':[('layout_type','!=','article')]}" on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, True, parent.date_order, product_packaging, parent.fiscal_position, False, context)" select="1"/> <field + name="name" required="0" + attrs="{'invisible':[('layout_type','in',('line','break','subtotal'))], 'required':[('layout_type','not in',['line','break'])]}"/> + + <field context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}" name="product_uom_qty" - attrs="{'readonly':[('layout_type','!=','article')]}" - on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)" - select="1"/> + attrs="{'invisible':[('layout_type','!=','article')]}" + on_change="product_id_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, product_packaging, parent.fiscal_position, True, context)"/> <field name="product_uom" - required="0" - attrs="{'readonly':[('layout_type','!=','article')], 'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}" + nolabel="1" + required="0" + attrs="{'invisible':[('layout_type','!=','article')], 'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}" on_change="product_uom_change(parent.pricelist_id,product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, False, False, parent.date_order, context)"/> + <field name="price_unit" + attrs="{'invisible':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/> + + <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/> + <field groups="product.group_uos" name="product_uos"/> + <newline/> + <field name="product_packaging" - attrs="{'readonly':[('layout_type','!=','article')]}" + colspan="3" + attrs="{'invisible':[('layout_type','!=','article')]}" context="{'partner_id':parent.partner_id,'quantity':product_uom_qty,'pricelist':parent.pricelist_id,'shop':parent.shop_id,'uom':product_uom}" on_change="product_packaging_change(parent.pricelist_id, product_id, product_uom_qty, product_uom, parent.partner_id, product_packaging, True, context)" domain="[('product_id','=',product_id)]" groups="base.group_extended"/> - <separator colspan="4" string="Manual Description" /> - <field name="layout_type" on_change="onchange_sale_order_line_view(layout_type)"/> - <field name="sequence" string="Seq."/> - <field colspan="4" name="name" required="0" select="2" attrs="{'readonly':[('layout_type','in',('line','break'))], 'required':[('layout_type','not in',['line','break'])]}"/> - <field name="price_unit" select="2" attrs="{'readonly':[('layout_type','!=','article')],'required':[('layout_type','not in',['title','text','subtotal','line','break'])]}"/> - <field name="discount" attrs="{'readonly':[('layout_type','!=','article')]}"/> - <field name="type" attrs="{'readonly':[('layout_type','!=','article')]}"/> - <field name="delay" select="2" attrs="{'readonly':[('layout_type','!=','article')]}"/> - <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" attrs="{'readonly':[('layout_type','!=','article')]}"/> - <separator colspan="4" string="States"/> - <field name="state" select="2"/> - <group col="3" colspan="2"> - <field name="invoiced" select="2"/> + <field + name="discount" + attrs="{'invisible':[('layout_type','!=','article')]}"/> + + <group colspan="5" + attrs="{'invisible':[('layout_type','not in', ['article','text'])]}"> + <separator colspan="4" string="Notes"/> + <field colspan="4" name="notes" nolabel="1"/> + </group> + + <group colspan="5" + attrs="{'invisible':[('layout_type','!=','article')]}"> + <separator colspan="4" string="Taxes"/> + <field colspan="4" name="tax_id" domain="[('parent_id','=',False)]" nolabel="1"/> + </group> + + <group col="5" colspan="5" attrs="{'invisible':[('layout_type','!=','article')]}"> + <separator colspan="5" string="States"/> + <field name="state"/> + <field name="invoiced"/> <button colspan="1" name="%(sale.action_view_sale_order_line_make_invoice)d" states="confirmed" string="Make Invoice" type="action"/> </group> + </group> </page> - <page groups="base.group_extended" string="Extra Info"> - <field groups="product.group_uos" name="product_uos_qty" on_change="uos_change(product_uos, product_uos_qty, product_id)"/> - <field groups="product.group_uos" name="product_uos"/> + <page groups="base.group_extended" string="Extra Info" + attrs="{'invisible':[('layout_type','!=','article')]}"> + <field name="type" attrs="{'invisible':[('layout_type','!=','article')]}"/> + <field name="delay" select="2" attrs="{'invisible':[('layout_type','!=','article')]}"/> <field name="address_allotment_id" select="2"/> <separator colspan="4" string="Properties"/> <field colspan="4" name="property_ids" nolabel="1"/> </page> - <page string="Notes"> - <field colspan="4" name="notes" nolabel="1"/> - </page> - <page string="History" groups="base.group_extended"> + <page string="History" groups="base.group_extended" + attrs="{'invisible':[('layout_type','!=','article')]}"> <separator colspan="4" string="Invoice Lines"/> <field colspan="4" name="invoice_lines" nolabel="1"/> <separator colspan="4" string="Stock Moves"/> diff --git a/addons/sale_margin/sale_margin_view.xml b/addons/sale_margin/sale_margin_view.xml index 201dd12d7a0..c424bf33785 100644 --- a/addons/sale_margin/sale_margin_view.xml +++ b/addons/sale_margin/sale_margin_view.xml @@ -20,7 +20,7 @@ <field name="model">sale.order</field> <field name="inherit_id" ref="sale.view_order_form" /> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page/field[@name='order_line']/form/notebook/page/field[@name='price_unit']" position="after"> + <xpath expr="//field[@name='order_line']/form//field[@name='price_unit']" position="after"> <field name="purchase_price"/> </xpath> </field> @@ -32,7 +32,7 @@ <field name="model">sale.order</field> <field name="inherit_id" ref="sale.view_order_form" /> <field name="arch" type="xml"> - <xpath expr="/form/notebook/page/field[@name='order_line']/tree/field[@name='price_unit']" position="after"> + <xpath expr="//field[@name='order_line']/tree//field[@name='price_unit']" position="after"> <field name="purchase_price"/> </xpath> </field> diff --git a/addons/stock/i18n/ar.po b/addons/stock/i18n/ar.po index 2179eac8356..6fa528ba0cb 100644 --- a/addons/stock/i18n/ar.po +++ b/addons/stock/i18n/ar.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2860,7 +2860,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/bg.po b/addons/stock/i18n/bg.po index 74a02e81778..39436a1bb7c 100644 --- a/addons/stock/i18n/bg.po +++ b/addons/stock/i18n/bg.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-03-02 09:07+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\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: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2894,7 +2894,7 @@ msgstr "Продукти по категория" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Категории продукти" #. module: stock @@ -4720,6 +4720,9 @@ msgstr "" #~ "Планирана дата за придвижване на продукти, или реална дата, ако " #~ "придвижването е извършено." +#~ msgid "Products Categories" +#~ msgstr "Категории продукти" + #, python-format #~ msgid "Product " #~ msgstr "Продукт " diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po index 7b5c43fe88f..4f69f603ecd 100644 --- a/addons/stock/i18n/bs.po +++ b/addons/stock/i18n/bs.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2860,7 +2860,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/ca.po b/addons/stock/i18n/ca.po index 2e002775cc8..38e25bfa269 100644 --- a/addons/stock/i18n/ca.po +++ b/addons/stock/i18n/ca.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-10-16 23:07+0000\n" -"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:57+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3092,7 +3092,7 @@ msgstr "Productes per categoria" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Categories de productes" #. module: stock @@ -5041,6 +5041,9 @@ msgstr "Detalls d'ubicació opcionals, només per a finalitats d'informació." #~ msgid "Stock Variation Account" #~ msgstr "Compte variació d'estoc" +#~ msgid "Products Categories" +#~ msgstr "Categories de productes" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/cs.po b/addons/stock/i18n/cs.po index 5db8254c449..582cb4504e5 100644 --- a/addons/stock/i18n/cs.po +++ b/addons/stock/i18n/cs.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-07-15 19:02+0000\n" +"PO-Revision-Date: 2011-11-07 12:57+0000\n" "Last-Translator: Jiří Hajda <robie@centrum.cz>\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: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Language: Czech\n" @@ -2898,7 +2898,7 @@ msgstr "Výrobky podle kategorie" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorie výrobků" #. module: stock @@ -3972,6 +3972,9 @@ msgstr "Volitelné podrobnosti umístění, pouze pro informační účely" #~ msgid "Stock Variation Account" #~ msgstr "Účet výměny zásob" +#~ msgid "Products Categories" +#~ msgstr "Kategorie výrobků" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/da.po b/addons/stock/i18n/da.po index b0573df0618..b5addddbb17 100644 --- a/addons/stock/i18n/da.po +++ b/addons/stock/i18n/da.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2861,7 +2861,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/de.po b/addons/stock/i18n/de.po index 588f4ff2d35..4933700c1ec 100644 --- a/addons/stock/i18n/de.po +++ b/addons/stock/i18n/de.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-04-03 09:07+0000\n" -"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: Ferdinand-camptocamp <Unknown>\n" "Language-Team: German <kde-i18n-doc@kde.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3091,7 +3091,7 @@ msgstr "Produkte nach Kategorien" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Produkte Kategorien" #. module: stock @@ -5064,6 +5064,9 @@ msgstr "Optionale Lagerort Details, nur als Information" #~ msgid "quantity." #~ msgstr "Anzahl" +#~ msgid "Products Categories" +#~ msgstr "Produkte Kategorien" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/el.po b/addons/stock/i18n/el.po index c9a9bb7f75e..3c9960f64c4 100644 --- a/addons/stock/i18n/el.po +++ b/addons/stock/i18n/el.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-04-01 18:43+0000\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" "Last-Translator: Dimitris Andavoglou <dimitrisand@gmail.com>\n" "Language-Team: nls@hellug.gr <nls@hellug.gr>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" "X-Poedit-Country: GREECE\n" "X-Poedit-Language: Greek\n" @@ -2882,7 +2882,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Κατηγορίες Προϊόντων" #. module: stock @@ -4754,6 +4754,9 @@ msgstr "" #~ msgid "Product " #~ msgstr "Προϊόν " +#~ msgid "Products Categories" +#~ msgstr "Κατηγορίες Προϊόντων" + #, python-format #~ msgid "is scheduled" #~ msgstr "είναι προγραμματιζμένο" diff --git a/addons/stock/i18n/es.po b/addons/stock/i18n/es.po index 958b6f5fc29..5fa85ed5c32 100644 --- a/addons/stock/i18n/es.po +++ b/addons/stock/i18n/es.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-01-18 09:19+0000\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" "Last-Translator: Borja López Soilán (NeoPolus) <borjalopezsoilan@gmail.com>\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: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #~ msgid "Stock Management" @@ -3104,7 +3104,7 @@ msgstr "Productos por categoría" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorías de productos" #. module: stock @@ -5065,3 +5065,6 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información." #, python-format #~ msgid "INV: " #~ msgstr "INV: " + +#~ msgid "Products Categories" +#~ msgstr "Categorías de productos" diff --git a/addons/stock/i18n/es_AR.po b/addons/stock/i18n/es_AR.po index f76d197fa03..aad9b7746cc 100644 --- a/addons/stock/i18n/es_AR.po +++ b/addons/stock/i18n/es_AR.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2865,7 +2865,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/es_CL.po b/addons/stock/i18n/es_CL.po index e3a755bfbe4..c50359ed1c9 100644 --- a/addons/stock/i18n/es_CL.po +++ b/addons/stock/i18n/es_CL.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3102,8 +3102,8 @@ msgstr "Productos por categoría" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" -msgstr "Categorías de productos" +msgid "Product Categories" +msgstr "" #. module: stock #: field:stock.move.memory.in,wizard_id:0 @@ -4226,6 +4226,9 @@ msgstr "Detalles de ubicación opcionales, sólo para fines de información." #~ msgid "Stock Variation Account" #~ msgstr "Cuenta variación stock" +#~ msgid "Products Categories" +#~ msgstr "Categorías de productos" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po index 7ec78aa3f70..9e9fc419b21 100644 --- a/addons/stock/i18n/es_EC.po +++ b/addons/stock/i18n/es_EC.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3053,7 +3053,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/et.po b/addons/stock/i18n/et.po index 8fb310ac87e..e208d3ae0db 100644 --- a/addons/stock/i18n/et.po +++ b/addons/stock/i18n/et.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2848,7 +2848,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/fi.po b/addons/stock/i18n/fi.po index c7b204f7764..1cead46804f 100644 --- a/addons/stock/i18n/fi.po +++ b/addons/stock/i18n/fi.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-02-22 08:17+0000\n" -"Last-Translator: Pekka Pylvänäinen <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:43+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\n" "Language-Team: Finnish <fi@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2950,7 +2950,7 @@ msgstr "Tuotteet Kategorioittain" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Tuotteiden Kategoriat" #. module: stock @@ -4818,6 +4818,9 @@ msgstr "" #~ msgid "Stock Variation Account" #~ msgstr "Varastomuutoksen tili" +#~ msgid "Products Categories" +#~ msgstr "Tuotteiden Kategoriat" + #, python-format #~ msgid "is scheduled" #~ msgstr "on aikataulutettu" diff --git a/addons/stock/i18n/fr.po b/addons/stock/i18n/fr.po index e813beed4a4..dd80481cfd3 100644 --- a/addons/stock/i18n/fr.po +++ b/addons/stock/i18n/fr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-05-21 12:15+0000\n" +"PO-Revision-Date: 2011-11-07 12:56+0000\n" "Last-Translator: hedererjs <hedererjs@asperience.fr>\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: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3115,7 +3115,7 @@ msgstr "Produits par catégorie" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Catégories de produits" #. module: stock @@ -5077,3 +5077,6 @@ msgstr "" #, python-format #~ msgid "quantity." #~ msgstr "quantité." + +#~ msgid "Products Categories" +#~ msgstr "Catégories de produits" diff --git a/addons/stock/i18n/gl.po b/addons/stock/i18n/gl.po index d89c6f54b6e..2f5894f7e3d 100644 --- a/addons/stock/i18n/gl.po +++ b/addons/stock/i18n/gl.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2861,7 +2861,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/hr.po b/addons/stock/i18n/hr.po index de18a954137..6cf7fb8e71c 100644 --- a/addons/stock/i18n/hr.po +++ b/addons/stock/i18n/hr.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2863,7 +2863,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/hu.po b/addons/stock/i18n/hu.po index e002f29f78b..6a1692196c1 100644 --- a/addons/stock/i18n/hu.po +++ b/addons/stock/i18n/hu.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-04-06 14:33+0000\n" +"PO-Revision-Date: 2011-11-07 12:46+0000\n" "Last-Translator: NOVOTRADE RENDSZERHÁZ ( novotrade.hu ) " "<openerp@novotrade.hu>\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: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2961,7 +2961,7 @@ msgstr "Termékek kategóriák szerint" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Termék kategóriák" #. module: stock @@ -4754,6 +4754,9 @@ msgstr "" #~ msgid "Product " #~ msgstr "Termék " +#~ msgid "Products Categories" +#~ msgstr "Termék kategóriák" + #~ msgid "Stock Variation Account" #~ msgstr "Készlet főkönyvi számla" diff --git a/addons/stock/i18n/id.po b/addons/stock/i18n/id.po index 4d653fefb84..e7d2d146f56 100644 --- a/addons/stock/i18n/id.po +++ b/addons/stock/i18n/id.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2967,7 +2967,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po index 1ba6dce7e55..8fa44cb6a2a 100644 --- a/addons/stock/i18n/it.po +++ b/addons/stock/i18n/it.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-03-30 15:03+0000\n" +"PO-Revision-Date: 2011-11-07 12:57+0000\n" "Last-Translator: Lorenzo Battistini - Agile BG - Domsense " "<lorenzo.battistini@agilebg.com>\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: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2954,7 +2954,7 @@ msgstr "Prodotti per Categoria" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorie Prodotti" #. module: stock @@ -4771,6 +4771,9 @@ msgstr "" #~ msgid "Product " #~ msgstr "Prodotto " +#~ msgid "Products Categories" +#~ msgstr "Categorie Prodotti" + #, python-format #~ msgid "is scheduled" #~ msgstr "è pianificato" diff --git a/addons/stock/i18n/ko.po b/addons/stock/i18n/ko.po index 348c538c670..4c1dea3ef7c 100644 --- a/addons/stock/i18n/ko.po +++ b/addons/stock/i18n/ko.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2861,7 +2861,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/lt.po b/addons/stock/i18n/lt.po index da6b2b0eeab..d571ac1f273 100644 --- a/addons/stock/i18n/lt.po +++ b/addons/stock/i18n/lt.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" "Language: lt\n" @@ -2866,7 +2866,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/lv.po b/addons/stock/i18n/lv.po index 4677011ccc4..cd2b657e92f 100644 --- a/addons/stock/i18n/lv.po +++ b/addons/stock/i18n/lv.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2861,7 +2861,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po index 84c094ec7b0..13b22a96f6d 100644 --- a/addons/stock/i18n/mn.po +++ b/addons/stock/i18n/mn.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:50+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2875,7 +2875,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/nb.po b/addons/stock/i18n/nb.po index b03d6968be5..f6e0dde0448 100644 --- a/addons/stock/i18n/nb.po +++ b/addons/stock/i18n/nb.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2867,7 +2867,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/nl.po b/addons/stock/i18n/nl.po index 4ac9622dbc6..cb8f4e760c5 100644 --- a/addons/stock/i18n/nl.po +++ b/addons/stock/i18n/nl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:37+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2864,7 +2864,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/nl_BE.po b/addons/stock/i18n/nl_BE.po index 38978abf6de..690324736bf 100644 --- a/addons/stock/i18n/nl_BE.po +++ b/addons/stock/i18n/nl_BE.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2860,7 +2860,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po index ab867e4744c..81a0764a9ee 100644 --- a/addons/stock/i18n/pl.po +++ b/addons/stock/i18n/pl.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-01-22 16:16+0000\n" +"PO-Revision-Date: 2011-11-07 13:05+0000\n" "Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\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: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3057,7 +3057,7 @@ msgstr "Produkty wg kategorii" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Kategorie produktów" #. module: stock @@ -4684,3 +4684,6 @@ msgstr "Nieobowiązkowe szczegóły lokalizacji. Tylko do informacji." #, python-format #~ msgid "INV: " #~ msgstr "FAK: " + +#~ msgid "Products Categories" +#~ msgstr "Kategorie produktów" diff --git a/addons/stock/i18n/pt.po b/addons/stock/i18n/pt.po index 12b9d80e10c..9c6d46ea564 100644 --- a/addons/stock/i18n/pt.po +++ b/addons/stock/i18n/pt.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2867,7 +2867,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po index 2a287c79ddb..aa4d80d9d8e 100644 --- a/addons/stock/i18n/pt_BR.po +++ b/addons/stock/i18n/pt_BR.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-02-09 00:58+0000\n" -"Last-Translator: Emerson <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:44+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3029,7 +3029,7 @@ msgstr "Produtos por Categoria" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorias de Produtos" #. module: stock @@ -4498,6 +4498,9 @@ msgstr "Detalhes opcionais do local, apenas em caráter informativo" #~ msgid "Stock Variation Account" #~ msgstr "Conta para Variação de Estoque" +#~ msgid "Products Categories" +#~ msgstr "Categorias de Produtos" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/ro.po b/addons/stock/i18n/ro.po index d5b93702c91..67ee97cb26c 100644 --- a/addons/stock/i18n/ro.po +++ b/addons/stock/i18n/ro.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-03-24 20:19+0000\n" +"PO-Revision-Date: 2011-11-07 12:45+0000\n" "Last-Translator: Dorin <dhongu@gmail.com>\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: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2888,7 +2888,7 @@ msgstr "Produse după categorie" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Categorii Produse" #. module: stock @@ -3961,6 +3961,9 @@ msgstr "" #~ msgid "Stock Variation Account" #~ msgstr "Cont variații de stoc" +#~ msgid "Products Categories" +#~ msgstr "Categorii Produse" + #, python-format #~ msgid "INV: " #~ msgstr "INV: " diff --git a/addons/stock/i18n/ru.po b/addons/stock/i18n/ru.po index 0751ea4554f..6dc91454726 100644 --- a/addons/stock/i18n/ru.po +++ b/addons/stock/i18n/ru.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-03-20 08:06+0000\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" "Last-Translator: Chertykov Denis <chertykov@gmail.com>\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: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3036,7 +3036,7 @@ msgstr "ТМЦ по категориям" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Категории ТМЦ" #. module: stock @@ -4710,6 +4710,9 @@ msgstr "Дополнительные подробности локализаци #~ msgid "STOCK_HOME" #~ msgstr "STOCK_HOME" +#~ msgid "Products Categories" +#~ msgstr "Категории ТМЦ" + #~ msgid "Stock Variation Account" #~ msgstr "Счет изменения стоимости ТМЦ" diff --git a/addons/stock/i18n/sl.po b/addons/stock/i18n/sl.po index 2fbf1924d0b..13c2a31dd9d 100644 --- a/addons/stock/i18n/sl.po +++ b/addons/stock/i18n/sl.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2860,7 +2860,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/sq.po b/addons/stock/i18n/sq.po index 0ef7b78fb98..f65f7de2c87 100644 --- a/addons/stock/i18n/sq.po +++ b/addons/stock/i18n/sq.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:49+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:36+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2861,7 +2861,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/sr.po b/addons/stock/i18n/sr.po index 0e3304975f4..299ec325da4 100644 --- a/addons/stock/i18n/sr.po +++ b/addons/stock/i18n/sr.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2876,7 +2876,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/sr@latin.po b/addons/stock/i18n/sr@latin.po index ecc1a7f9cdf..df049b3cf76 100644 --- a/addons/stock/i18n/sr@latin.po +++ b/addons/stock/i18n/sr@latin.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2876,7 +2876,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index c9a9f0d78bb..f5eff6f79a8 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -2703,7 +2703,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/sv.po b/addons/stock/i18n/sv.po index d27eabc957c..8b9f5ee0b69 100644 --- a/addons/stock/i18n/sv.po +++ b/addons/stock/i18n/sv.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2863,7 +2863,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/th.po b/addons/stock/i18n/th.po index ec69fedda5a..4b572ac43e8 100644 --- a/addons/stock/i18n/th.po +++ b/addons/stock/i18n/th.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2861,7 +2861,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/tlh.po b/addons/stock/i18n/tlh.po index e3ceb3b1d01..659cb6c4a3c 100644 --- a/addons/stock/i18n/tlh.po +++ b/addons/stock/i18n/tlh.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2860,7 +2860,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po index 619b788d17f..da73cda050e 100644 --- a/addons/stock/i18n/tr.po +++ b/addons/stock/i18n/tr.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-06-25 18:52+0000\n" -"Last-Translator: Ayhan KIZILTAN <Unknown>\n" +"PO-Revision-Date: 2011-11-07 12:47+0000\n" +"Last-Translator: OpenERP Administrators <Unknown>\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: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -3068,7 +3068,7 @@ msgstr "Kategoriye Göre Ürün" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "Ürün Kategorileri" #. module: stock @@ -4786,6 +4786,9 @@ msgstr "Opsiyonel lokalizasyon ayrıntıları, sadece bilgi amaçlı" #~ msgid "Stock Variation Account" #~ msgstr "Stok Varyasyon Hesabı" +#~ msgid "Products Categories" +#~ msgstr "Ürün Kategorileri" + #, python-format #~ msgid "INV: " #~ msgstr "FAT: " diff --git a/addons/stock/i18n/uk.po b/addons/stock/i18n/uk.po index ca2312d4a29..8ae9d9f6020 100644 --- a/addons/stock/i18n/uk.po +++ b/addons/stock/i18n/uk.po @@ -13,7 +13,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:51+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2864,7 +2864,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/vi.po b/addons/stock/i18n/vi.po index a8dccb3f6d8..b41880afcb7 100644 --- a/addons/stock/i18n/vi.po +++ b/addons/stock/i18n/vi.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:38+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2868,7 +2868,7 @@ msgstr "" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "" #. module: stock diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po index 9b9783a5744..dcaa205db9c 100644 --- a/addons/stock/i18n/zh_CN.po +++ b/addons/stock/i18n/zh_CN.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-05-04 10:26+0000\n" +"PO-Revision-Date: 2011-11-07 12:51+0000\n" "Last-Translator: openerp-china.black-jack <onetimespeed@gmail.com>\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: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2918,7 +2918,7 @@ msgstr "产品分类" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "产品分类" #. module: stock @@ -4785,6 +4785,9 @@ msgstr "可选库位，仅供参考" #~ msgid "Stock Variation Account" #~ msgstr "库存变动科目" +#~ msgid "Products Categories" +#~ msgstr "产品分类" + #, python-format #~ msgid "is consumed with" #~ msgstr "是消耗品" diff --git a/addons/stock/i18n/zh_TW.po b/addons/stock/i18n/zh_TW.po index 856be2a9ed1..193b8a57482 100644 --- a/addons/stock/i18n/zh_TW.po +++ b/addons/stock/i18n/zh_TW.po @@ -7,13 +7,13 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2011-01-11 11:16+0000\n" -"PO-Revision-Date: 2011-09-27 10:25+0000\n" +"PO-Revision-Date: 2011-11-07 13:04+0000\n" "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\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: 2011-11-05 04:52+0000\n" +"X-Launchpad-Export-Date: 2011-11-08 05:39+0000\n" "X-Generator: Launchpad (build 14231)\n" #. module: stock @@ -2871,7 +2871,7 @@ msgstr "各分類產品" #. module: stock #: model:ir.ui.menu,name:stock.menu_product_category_config_stock -msgid "Products Categories" +msgid "Product Categories" msgstr "產品分類" #. module: stock @@ -3933,6 +3933,9 @@ msgstr "" #~ msgid "Product " #~ msgstr "產品 " +#~ msgid "Products Categories" +#~ msgstr "產品分類" + #, python-format #~ msgid "is scheduled" #~ msgstr "已安排" diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 6452960c2cd..aa1b8b7210f 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -6,9 +6,9 @@ groups="group_stock_manager,group_stock_user" sequence="5" web_icon="images/warehouse.png" web_icon_hover="images/warehouse-hover.png"/> - <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1" groups="base.group_extended"/> - <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2"/> - <menuitem id="menu_stock_product" name="Product" parent="menu_stock_root" sequence="6"/> + <menuitem id="menu_stock_warehouse_mgmt" name="Warehouse Management" parent="menu_stock_root" sequence="1"/> + <menuitem id="menu_stock_products_moves" name="Products Moves" parent="menu_stock_root" sequence="2" groups="base.group_extended"/> + <menuitem id="menu_stock_product" name="Products" parent="menu_stock_root" sequence="6"/> <menuitem name="Products by Category" id="menu_product_by_category_stock_form" action="product.product_category_action" parent="stock.menu_stock_product" sequence="0"/> <menuitem action="product.product_normal_action" id="menu_stock_products_menu" parent="menu_stock_product" sequence="1"/> @@ -16,7 +16,7 @@ <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_configuration" sequence="1"/> <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/> <menuitem - id="menu_product_in_config_stock" name="Product" + id="menu_product_in_config_stock" name="Products" parent="stock.menu_stock_configuration" sequence="2"/> <menuitem action="product.product_category_action_form" id="menu_product_category_config_stock" |