res.partner.form.reconcile
diff --git a/addons/account/product.py b/addons/account/product.py
index 188c3260dff..56e721dcb06 100644
--- a/addons/account/product.py
+++ b/addons/account/product.py
@@ -48,6 +48,7 @@ product_category()
#----------------------------------------------------------
# Products
#----------------------------------------------------------
+
class product_template(osv.osv):
_inherit = "product.template"
_columns = {
@@ -76,5 +77,3 @@ class product_template(osv.osv):
}
product_template()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
diff --git a/addons/account/report/overdue.rml b/addons/account/report/overdue.rml
index e8e1a7dc84c..3218f84b4a0 100644
--- a/addons/account/report/overdue.rml
+++ b/addons/account/report/overdue.rml
@@ -147,7 +147,7 @@
Ref
- Maturity date
+ Due date
|
Due
diff --git a/addons/account/test/account_customer_invoice.yml b/addons/account/test/account_customer_invoice.yml
index b32a22cf9de..d94b791fe66 100644
--- a/addons/account/test/account_customer_invoice.yml
+++ b/addons/account/test/account_customer_invoice.yml
@@ -54,77 +54,6 @@
!python {model: account.invoice}: |
acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
assert acc_id.move_id, "Move not created for open invoice"
--
- I create a record for partial payment of 1000 EUR.
--
- !record {model: account.invoice.pay, id: account_invoice_pay_first0}:
- amount: 1000.0
- date: '2010-05-26'
- journal_id: account.sales_journal
- name: First payment for [PC3] Medium PC to Distrib PC
- period_id: account.period_5
--
- I make partial payment by clicking on Partial Payment button
--
- !python {model: account.invoice.pay}: |
- self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_first0")], {"lang":
- 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
- [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
- })
--
- I check that the invoice state is still open
--
- !assert {model: account.invoice, id: account_invoice_customer0}:
- - state == 'open'
--
- I make second partial payment of 6000 EUR.
--
- !record {model: account.invoice.pay, id: account_invoice_pay_second0}:
- amount: 6000.0
- date: '2010-05-28'
- journal_id: account.sales_journal
- name: Second payment for [PC3] Medium PC to Distrib PC
- period_id: account.period_5
--
- I make partial payment by clicking on Partial Payment button
-
--
- !python {model: account.invoice.pay}: |
- self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_second0")], {"lang":
- 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
- [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
- })
--
- I make final partial payment of 2000 EUR
--
- !record {model: account.invoice.pay, id: account_invoice_pay_final0}:
- amount: 2000.0
- date: '2010-05-30'
- journal_id: account.sales_journal
- name: Final payment for [PC3] Medium PC to Distrib PC
- period_id: account.period_5
-
--
- I make partial payment by clicking on Partial Payment button
-
--
- !python {model: account.invoice.pay}: |
- self.pay_and_reconcile(cr, uid, [ref("account_invoice_pay_final0")], {"lang":
- 'en_US', "active_model": "account.invoice", "tz": False, "record_id": 3, "active_ids":
- [ref("account_invoice_customer0")], "type": "out_invoice", "active_id": ref("account_invoice_customer0"),
- })
-
--
- I check that the invoice state is now Done
--
- !assert {model: account.invoice, id: account_invoice_customer0}:
- - state == 'paid'
--
- I check that an payment entry gets created in the account.move.line
--
- !python {model: account.invoice}: |
- acc_id=self.browse(cr, uid, ref("account_invoice_customer0"))
- assert(acc_id.move_id)
-
I refund the invoice Using Refund Button
-
diff --git a/addons/account/test/account_validate_account_move.yml b/addons/account/test/account_validate_account_move.yml
index a2b22730e2c..37d64ead528 100644
--- a/addons/account/test/account_validate_account_move.yml
+++ b/addons/account/test/account_validate_account_move.yml
@@ -37,7 +37,7 @@
-
I check that Initially account move state is "Draft"
-
- !assert {model: account.move, id: account_move_0}:
+ !assert {model: account.move, id: account_move_0, string: initialstatedraft}:
- state == 'draft'
-
I validate this account move by using the 'Validate Journal Entries' wizard
@@ -46,18 +46,12 @@
journal_id: account.bank_journal
period_id: account.period_6
-
- I clicked on validate Button
+ I click on validate Button
-
!python {model: validate.account.move}: |
- try:
- self.validate_move(cr, uid, [ref("validate_account_move_0")], {"lang": "en_US",
- "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_validate_account_moves")],
- "tz": False, "active_id": ref("account.menu_validate_account_moves"), })
- except:
- pass
-
+ self.validate_move(cr, uid, [ref("validate_account_move_0")], {"lang": "en_US", "active_model": "ir.ui.menu", "active_ids": [ref("account.menu_validate_account_moves")], "tz": False, "active_id": ref("account.menu_validate_account_moves"), })
-
I check that the invoice state is now "Posted"
-
- !assert {model: account.move, id: account_move_0}:
+ !assert {model: account.move, id: account_move_0, string: moveincorrect}:
- state == 'posted'
diff --git a/addons/account_analytic_analysis/i18n/bg.po b/addons/account_analytic_analysis/i18n/bg.po
index 67af0e2dfd7..4e844be1880 100644
--- a/addons/account_analytic_analysis/i18n/bg.po
+++ b/addons/account_analytic_analysis/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fi.po b/addons/account_analytic_analysis/i18n/fi.po
index 92db0ab2e25..9e45b018c57 100644
--- a/addons/account_analytic_analysis/i18n/fi.po
+++ b/addons/account_analytic_analysis/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:22+0000\n"
+"PO-Revision-Date: 2010-09-04 08:22+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/fr.po b/addons/account_analytic_analysis/i18n/fr.po
index e5b586a04ef..a9eaeaac92e 100644
--- a/addons/account_analytic_analysis/i18n/fr.po
+++ b/addons/account_analytic_analysis/i18n/fr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:31+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-09-02 07:26+0000\n"
+"Last-Translator: Quentin THEURET \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: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
@@ -22,6 +22,8 @@ msgid ""
"Number of hours that can be invoiced plus those that already have been "
"invoiced."
msgstr ""
+"Nombre d'heures qui peuvent être facturées plus celles qui ont déjà été "
+"facturées."
#. module: account_analytic_analysis
#: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
@@ -76,7 +78,7 @@ msgstr "Revenu théorique"
#. module: account_analytic_analysis
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "Nom du Modèle non valide dans la définition de l'action."
+msgstr "Nom du modèle invalide dans la définition de l'action."
#. module: account_analytic_analysis
#: help:account.analytic.account,theorical_margin:0
diff --git a/addons/account_analytic_analysis/i18n/lt.po b/addons/account_analytic_analysis/i18n/lt.po
index 058eb8ae51f..d6a2cb22563 100644
--- a/addons/account_analytic_analysis/i18n/lt.po
+++ b/addons/account_analytic_analysis/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:20+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_analysis/i18n/tr.po b/addons/account_analytic_analysis/i18n/tr.po
index 5feaf05685a..8c95736a03e 100644
--- a/addons/account_analytic_analysis/i18n/tr.po
+++ b/addons/account_analytic_analysis/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_analysis
diff --git a/addons/account_analytic_default/account_analytic_default.py b/addons/account_analytic_default/account_analytic_default.py
index 43e3d2eb248..d0405e1ff52 100644
--- a/addons/account_analytic_default/account_analytic_default.py
+++ b/addons/account_analytic_default/account_analytic_default.py
@@ -73,8 +73,8 @@ class account_invoice_line(osv.osv):
_inherit = 'account.invoice.line'
_description = 'Invoice Line'
- def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fiscal_position=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
- res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fiscal_position, price_unit, address_invoice_id, currency_id=currency_id, context=context)
+ def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
+ res_prod = super(account_invoice_line,self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id=currency_id, context=context)
rec = self.pool.get('account.analytic.default').account_get(cr, uid, product, partner_id, uid, time.strftime('%Y-%m-%d'), context)
if rec:
res_prod['value'].update({'account_analytic_id':rec.analytic_id.id})
diff --git a/addons/account_analytic_default/i18n/lt.po b/addons/account_analytic_default/i18n/lt.po
index 801bbad630f..203af434cce 100644
--- a/addons/account_analytic_default/i18n/lt.po
+++ b/addons/account_analytic_default/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
diff --git a/addons/account_analytic_default/i18n/nl.po b/addons/account_analytic_default/i18n/nl.po
index 33c21bf84c9..68065c361bb 100644
--- a/addons/account_analytic_default/i18n/nl.po
+++ b/addons/account_analytic_default/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 20:46+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-02 07:24+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-08-12 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
@@ -31,14 +31,14 @@ msgstr "Standaard kostenplaats"
#. module: account_analytic_default
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
#. module: account_analytic_default
#: constraint:ir.model:0
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
#. module: account_analytic_default
#: view:account.analytic.default:0
diff --git a/addons/account_analytic_default/i18n/tr.po b/addons/account_analytic_default/i18n/tr.po
index bf640810247..b0a3aef71c5 100644
--- a/addons/account_analytic_default/i18n/tr.po
+++ b/addons/account_analytic_default/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_default
diff --git a/addons/account_analytic_plans/i18n/fr.po b/addons/account_analytic_plans/i18n/fr.po
index 856db8edab4..0e454d9b6ac 100644
--- a/addons/account_analytic_plans/i18n/fr.po
+++ b/addons/account_analytic_plans/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:59+0000\n"
-"Last-Translator: TeMPO \n"
+"PO-Revision-Date: 2010-09-02 07:23+0000\n"
+"Last-Translator: Quentin THEURET \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: 2010-08-12 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
@@ -77,7 +77,7 @@ msgstr "Imprimer"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "To Date"
-msgstr ""
+msgstr "Jusqu'a la date"
#. module: account_analytic_plans
#: field:account.analytic.plan.instance.line,plan_id:0
@@ -117,7 +117,7 @@ msgstr "Nom du Plan"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Printing date"
-msgstr ""
+msgstr "Date d'impression"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
@@ -158,7 +158,7 @@ msgstr "Réf. du Compte Analytique"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "Analytic Account :"
-msgstr ""
+msgstr "Compte Analytique :"
#. module: account_analytic_plans
#: view:account.analytic.plan.line:0
@@ -408,4 +408,4 @@ msgstr "à"
#. module: account_analytic_plans
#: rml:account.analytic.account.crossovered.analytic:0
msgid "From Date"
-msgstr ""
+msgstr "Depuis la date"
diff --git a/addons/account_analytic_plans/i18n/lt.po b/addons/account_analytic_plans/i18n/lt.po
index 71abef00a39..2346fe93d0e 100644
--- a/addons/account_analytic_plans/i18n/lt.po
+++ b/addons/account_analytic_plans/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/pt_BR.po b/addons/account_analytic_plans/i18n/pt_BR.po
index 7b2ce02f9c7..449cab43eca 100644
--- a/addons/account_analytic_plans/i18n/pt_BR.po
+++ b/addons/account_analytic_plans/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 15:06+0000\n"
-"Last-Translator: Roberto Higashi \n"
+"PO-Revision-Date: 2010-09-01 06:55+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:54+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_analytic_plans/i18n/tr.po b/addons/account_analytic_plans/i18n/tr.po
index 8058738d2a4..b099f20f434 100644
--- a/addons/account_analytic_plans/i18n/tr.po
+++ b/addons/account_analytic_plans/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_analytic_plans
diff --git a/addons/account_anglo_saxon/i18n/fr.po b/addons/account_anglo_saxon/i18n/fr.po
new file mode 100644
index 00000000000..ab665ae43dc
--- /dev/null
+++ b/addons/account_anglo_saxon/i18n/fr.po
@@ -0,0 +1,64 @@
+# French translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-24 12:50+0000\n"
+"PO-Revision-Date: 2010-09-03 12:05+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-09-04 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_anglo_saxon
+#: view:product.category:0
+msgid " Accounting Property"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,description:account_anglo_saxon.module_meta_information
+msgid ""
+"This module will support the Anglo-Saxons accounting methodology by \n"
+" changing the accounting logic with stock transactions. The difference "
+"between the Anglo-Saxon accounting countries \n"
+" and the Rhine or also called Continental accounting countries is the "
+"moment of taking the Cost of Goods Sold versus Cost of Sales. \n"
+" Anglo-Saxons accounting does take the cost when sales invoice is "
+"created, Continental accounting will take the cost at he moment the goods "
+"are shipped.\n"
+" This module will add this functionality by using a interim account, to "
+"store the value of shipped goods and will contra book this interim account \n"
+" when the invoice is created to transfer this amount to the debtor or "
+"creditor account."
+msgstr ""
+
+#. module: account_anglo_saxon
+#: model:ir.module.module,shortdesc:account_anglo_saxon.module_meta_information
+msgid "Stock Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: field:product.category,property_account_creditor_price_difference_categ:0
+#: field:product.template,property_account_creditor_price_difference:0
+msgid "Price Difference Account"
+msgstr ""
+
+#. module: account_anglo_saxon
+#: help:product.category,property_account_creditor_price_difference_categ:0
+#: help:product.template,property_account_creditor_price_difference:0
+msgid ""
+"This account will be used to value price difference between purchase price "
+"and cost price."
+msgstr ""
diff --git a/addons/account_anglo_saxon/i18n/ta.po b/addons/account_anglo_saxon/i18n/ta.po
index 85e2c1e8271..a6d6b1bec5a 100644
--- a/addons/account_anglo_saxon/i18n/ta.po
+++ b/addons/account_anglo_saxon/i18n/ta.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-24 12:50+0000\n"
-"PO-Revision-Date: 2010-09-01 02:10+0000\n"
+"PO-Revision-Date: 2010-09-01 06:55+0000\n"
"Last-Translator: ஆமாச்சு \n"
"Language-Team: Tamil \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_anglo_saxon
diff --git a/addons/account_anglo_saxon/invoice.py b/addons/account_anglo_saxon/invoice.py
index 4c3b9b81dcc..ff356547a83 100644
--- a/addons/account_anglo_saxon/invoice.py
+++ b/addons/account_anglo_saxon/invoice.py
@@ -127,11 +127,11 @@ class account_invoice_line(osv.osv):
res += diff_res
return res
- def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, context=None):
+ def product_id_change(self, cr, uid, ids, product, uom, qty=0, name='', type='out_invoice', partner_id=False, fposition_id=False, price_unit=False, address_invoice_id=False, currency_id=False, context=None):
if not product:
- return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
+ return super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
else:
- res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, context)
+ res = super(account_invoice_line, self).product_id_change(cr, uid, ids, product, uom, qty, name, type, partner_id, fposition_id, price_unit, address_invoice_id, currency_id, context)
if type in ('in_invoice','in_refund'):
product_obj = self.pool.get('product.product').browse(cr, uid, product, context=context)
@@ -173,4 +173,4 @@ class account_invoice(osv.osv):
return res
account_invoice()
-# 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/account_budget/i18n/lt.po b/addons/account_budget/i18n/lt.po
index 3bb1582ff79..5fc649d9610 100644
--- a/addons/account_budget/i18n/lt.po
+++ b/addons/account_budget/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_budget/i18n/tr.po b/addons/account_budget/i18n/tr.po
index f5be99c0747..f00062a1ef2 100644
--- a/addons/account_budget/i18n/tr.po
+++ b/addons/account_budget/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_budget
diff --git a/addons/account_cancel/i18n/de.po b/addons/account_cancel/i18n/de.po
new file mode 100644
index 00000000000..9c4da6bd0ca
--- /dev/null
+++ b/addons/account_cancel/i18n/de.po
@@ -0,0 +1,41 @@
+# German translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2010-08-19 12:03+0000\n"
+"PO-Revision-Date: 2010-09-04 09:03+0000\n"
+"Last-Translator: Ferdinand-chricar \n"
+"Language-Team: German \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_cancel
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Fehlerhafter XML-Code für diese Ansicht!"
+
+#. module: account_cancel
+#: model:ir.module.module,description:account_cancel.module_meta_information
+msgid ""
+"\n"
+" Module adds 'Allow cancelling entries' field on form view of account "
+"journal. If set to true it allows user to cancel entries & invoices.\n"
+" "
+msgstr ""
+"\n"
+" Das Modul ermöglicht Buchungen zu stornieren. Das Kennzeichen wird je "
+"Journal gesetzt.\n"
+" "
+
+#. module: account_cancel
+#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
+msgid "Account Cancel"
+msgstr "Konto Storno"
diff --git a/addons/account_cancel/i18n/fr.po b/addons/account_cancel/i18n/fr.po
index 10b4209045b..67695192f0b 100644
--- a/addons/account_cancel/i18n/fr.po
+++ b/addons/account_cancel/i18n/fr.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-08-30 12:19+0000\n"
-"Last-Translator: <>\n"
+"PO-Revision-Date: 2010-09-02 07:14+0000\n"
+"Last-Translator: Quentin THEURET \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: 2010-08-31 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_cancel
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr ""
+msgstr "XML non valide pour l'architecture de la vue"
#. module: account_cancel
#: model:ir.module.module,description:account_cancel.module_meta_information
@@ -29,8 +29,13 @@ msgid ""
"journal. If set to true it allows user to cancel entries & invoices.\n"
" "
msgstr ""
+"\n"
+" Le module ajoute le champ 'Permettre l'annulation des entrées' dans la "
+"vue formulaire du journal. Si il est égal à Vrai, cela permet à "
+"l'utilisateur d'annuler l'entrée et la facture.\n"
+" "
#. module: account_cancel
#: model:ir.module.module,shortdesc:account_cancel.module_meta_information
msgid "Account Cancel"
-msgstr ""
+msgstr "Annulation comptable"
diff --git a/addons/account_cancel/i18n/ta.po b/addons/account_cancel/i18n/ta.po
index 9a6a6cec8aa..69253bb7716 100644
--- a/addons/account_cancel/i18n/ta.po
+++ b/addons/account_cancel/i18n/ta.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-08-19 12:03+0000\n"
-"PO-Revision-Date: 2010-09-01 02:08+0000\n"
+"PO-Revision-Date: 2010-09-01 06:55+0000\n"
"Last-Translator: ஆமாச்சு \n"
"Language-Team: Tamil \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_cancel
diff --git a/addons/account_chart/i18n/ta.po b/addons/account_chart/i18n/ta.po
index 58a0bdd96ab..03bee2b524f 100644
--- a/addons/account_chart/i18n/ta.po
+++ b/addons/account_chart/i18n/ta.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 17:53+0000\n"
+"PO-Revision-Date: 2010-09-01 06:56+0000\n"
"Last-Translator: ஆமாச்சு \n"
"Language-Team: Tamil \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_chart
diff --git a/addons/account_coda/i18n/ar.po b/addons/account_coda/i18n/ar.po
index 446608ec09b..5f93580b202 100644
--- a/addons/account_coda/i18n/ar.po
+++ b/addons/account_coda/i18n/ar.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-11-24 13:11+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 09:01+0000\n"
"Last-Translator: bamuhrez \n"
"Language-Team: Arabic \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_coda
diff --git a/addons/account_coda/i18n/fr.po b/addons/account_coda/i18n/fr.po
new file mode 100644
index 00000000000..cc5ce1ec449
--- /dev/null
+++ b/addons/account_coda/i18n/fr.po
@@ -0,0 +1,166 @@
+# French translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-11-24 13:11+0000\n"
+"PO-Revision-Date: 2010-09-03 12:11+0000\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: French \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-09-04 04:47+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_coda
+#: field:account.coda,journal_id:0
+#: wizard_field:account.coda_import,init,journal_id:0
+msgid "Bank Journal"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,extraction,note:0
+msgid "Log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,open:0
+msgid "_Open Statement"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,shortdesc:account_coda.module_meta_information
+msgid "Account CODA"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,name:0
+msgid "Coda file"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Clic on 'New' to select your file :"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.actions.wizard,name:account_coda.wizard_account_coda_import
+msgid "Import Coda File"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,note:0
+msgid "Import log"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_receivable:0
+msgid "Default receivable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.module.module,description:account_coda.module_meta_information
+msgid ""
+"Module provides functionality to import\n"
+" bank statements from .csv file.\n"
+" Import coda file wizard is used to import bank statements."
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,extraction,end:0
+msgid "_Close"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,statement_id:0
+msgid "Generated Bank Statement"
+msgstr ""
+
+#. module: account_coda
+#: view:account.coda:0
+#: model:ir.actions.act_window,name:account_coda.act_account_payment_account_bank_statement
+#: model:ir.actions.act_window,name:account_coda.action_account_coda
+msgid "Coda import"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: account_coda
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.model,name:account_coda.model_account_coda
+msgid "coda for an Account"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,def_payable:0
+msgid "Default Payable Account"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda
+msgid "Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: model:ir.ui.menu,name:account_coda.menu_account_coda_wizard
+msgid "Import Coda Statements"
+msgstr ""
+
+#. module: account_coda
+#: wizard_button:account.coda_import,init,extraction:0
+msgid "_Ok"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+#: wizard_view:account.coda_import,init:0
+msgid "Import Coda Statement"
+msgstr ""
+
+#. module: account_coda
+#: field:account.bank.statement,coda_id:0
+msgid "Coda"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,extraction:0
+msgid "Results :"
+msgstr ""
+
+#. module: account_coda
+#: wizard_field:account.coda_import,init,coda:0
+msgid "Coda File"
+msgstr ""
+
+#. module: account_coda
+#: field:account.coda,date:0
+msgid "Import Date"
+msgstr ""
+
+#. module: account_coda
+#: wizard_view:account.coda_import,init:0
+msgid "Select your bank journal :"
+msgstr ""
diff --git a/addons/account_followup/i18n/hr.po b/addons/account_followup/i18n/hr.po
index 114e7712441..b714599f7bd 100644
--- a/addons/account_followup/i18n/hr.po
+++ b/addons/account_followup/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 21:33+0000\n"
-"Last-Translator: nafterburner \n"
+"PO-Revision-Date: 2010-09-04 09:03+0000\n"
+"Last-Translator: Goran Kliska \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: 2010-08-12 03:50+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
@@ -29,7 +29,7 @@ msgstr "Partneri"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Customer Ref :"
-msgstr ""
+msgstr "Poziv na broj"
#. module: account_followup
#: model:ir.actions.act_window,name:account_followup.act_account_partner_account_move_payable_all
@@ -50,12 +50,12 @@ msgstr "Ispisana Poruka"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Amount In Currency"
-msgstr ""
+msgstr "Iznos u valuti"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Due"
-msgstr ""
+msgstr "Dospijeće"
#. module: account_followup
#: view:account.move.line:0
@@ -136,7 +136,7 @@ msgstr "Opis"
#. module: account_followup
#: rml:account_followup.followup.print:0
msgid "Balance:"
-msgstr ""
+msgstr "Saldo:"
#. module: account_followup
#: rml:account_followup.followup.print:0
diff --git a/addons/account_followup/i18n/lt.po b/addons/account_followup/i18n/lt.po
index 95319369099..428fd57f14e 100644
--- a/addons/account_followup/i18n/lt.po
+++ b/addons/account_followup/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/i18n/tr.po b/addons/account_followup/i18n/tr.po
index 0883c6dac16..848a0c050ba 100644
--- a/addons/account_followup/i18n/tr.po
+++ b/addons/account_followup/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_followup
diff --git a/addons/account_followup/report/report_followp_print.rml b/addons/account_followup/report/report_followp_print.rml
index 97aaa377c1e..85d660e1177 100644
--- a/addons/account_followup/report/report_followp_print.rml
+++ b/addons/account_followup/report/report_followp_print.rml
@@ -136,7 +136,7 @@
Ref
|
- Maturity Date
+ Due Date
|
Amount In Currency
@@ -169,7 +169,7 @@
[[ line['ref'] ]]
|
- [[ line['date_maturity'] ]]
+ [[ line['date_maturity'] and formatLang(line['date_maturity'], date=True) ]]
|
[[ formatLang(line['amount_currency'] )]] [[ line['currency_id'] and line['currency_id'][1] or '' ]]
diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py
index a37b13cf126..b89ad76d0ee 100644
--- a/addons/account_followup/wizard/account_followup_print.py
+++ b/addons/account_followup/wizard/account_followup_print.py
@@ -209,7 +209,7 @@ class account_followup_print_all(osv.osv_memory):
subtotal_maturity = 0.0
balance = 0.0
l = '--------------------------------------------------------------------------------------------------------------------------'
- head = l+ '\n' + 'Date'.rjust(10) + '\t' + 'Description'.rjust(10) + '\t' + 'Ref'.rjust(10) + '\t' + 'Maturity date'.rjust(10) + '\t' + 'Due'.rjust(10) + '\t' + 'Paid'.rjust(10) + '\t' + 'Maturity'.rjust(10) + '\t' + 'Litigation'.rjust(10) + '\n' + l
+ head = l+ '\n' + 'Date'.rjust(10) + '\t' + 'Description'.rjust(10) + '\t' + 'Ref'.rjust(10) + '\t' + 'Due date'.rjust(10) + '\t' + 'Due'.rjust(10) + '\t' + 'Paid'.rjust(10) + '\t' + 'Maturity'.rjust(10) + '\t' + 'Litigation'.rjust(10) + '\n' + l
for i in data_lines:
maturity = 0.00
if i.date_maturity < time.strftime('%Y-%m-%d') and (i.debit - i.credit):
diff --git a/addons/account_invoice_layout/i18n/lt.po b/addons/account_invoice_layout/i18n/lt.po
index 0c34bc7e8d5..b684c520ddf 100644
--- a/addons/account_invoice_layout/i18n/lt.po
+++ b/addons/account_invoice_layout/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:59+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_invoice_layout/i18n/tr.po b/addons/account_invoice_layout/i18n/tr.po
index f3ca7166478..79be5e7e77e 100644
--- a/addons/account_invoice_layout/i18n/tr.po
+++ b/addons/account_invoice_layout/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:34+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_invoice_layout
diff --git a/addons/account_payment/account_payment.py b/addons/account_payment/account_payment.py
index a65919d437a..fe2d2e6f9c1 100644
--- a/addons/account_payment/account_payment.py
+++ b/addons/account_payment/account_payment.py
@@ -304,7 +304,7 @@ class payment_line(osv.osv):
help='Payment amount in the company currency'),
'ml_date_created': fields.function(_get_ml_created_date, string="Effective Date",
method=True, type='date', help="Invoice Effective Date"),
- 'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Maturity Date'),
+ 'ml_maturity_date': fields.function(_get_ml_maturity_date, method=True, type='date', string='Due Date'),
'ml_inv_ref': fields.function(_get_ml_inv_ref, method=True, type='many2one', relation='account.invoice', string='Invoice Ref.'),
'info_owner': fields.function(info_owner, string="Owner Account", method=True, type="text", help='Address of the Main Partner'),
'info_partner': fields.function(info_partner, string="Destination Account", method=True, type="text", help='Address of the Ordering Customer.'),
diff --git a/addons/account_payment/i18n/lt.po b/addons/account_payment/i18n/lt.po
index 92ea164eb4e..a7d17ef40c5 100644
--- a/addons/account_payment/i18n/lt.po
+++ b/addons/account_payment/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:22+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-09-04 08:19+0000\n"
+"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_payment/i18n/nl.po b/addons/account_payment/i18n/nl.po
index 516492ac565..1d5ffd661ba 100644
--- a/addons/account_payment/i18n/nl.po
+++ b/addons/account_payment/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-02 22:07+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-02 07:25+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-08-12 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
@@ -252,7 +252,7 @@ msgstr "Rekeningnummer bestemming"
#. module: account_payment
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
#. module: account_payment
#: wizard_button:populate_payment,init,end:0
@@ -468,7 +468,7 @@ msgstr "Informatie"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
#. module: account_payment
#: model:ir.actions.wizard,name:account_payment.wizard_pay_payment
diff --git a/addons/account_payment/i18n/tr.po b/addons/account_payment/i18n/tr.po
index b16e2be9616..057d2b08618 100644
--- a/addons/account_payment/i18n/tr.po
+++ b/addons/account_payment/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:23+0000\n"
+"PO-Revision-Date: 2010-09-04 08:10+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_payment
diff --git a/addons/account_report/i18n/lt.po b/addons/account_report/i18n/lt.po
index 78eb6c6c253..e610db8c5e4 100644
--- a/addons/account_report/i18n/lt.po
+++ b/addons/account_report/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:33+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_report/i18n/tr.po b/addons/account_report/i18n/tr.po
index 2502cde92dd..76ca6a91724 100644
--- a/addons/account_report/i18n/tr.po
+++ b/addons/account_report/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:21+0000\n"
+"PO-Revision-Date: 2010-09-04 08:36+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_report
diff --git a/addons/account_reporting/i18n/lt.po b/addons/account_reporting/i18n/lt.po
index 86803df86e5..13fa7181592 100644
--- a/addons/account_reporting/i18n/lt.po
+++ b/addons/account_reporting/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:58+0000\n"
+"PO-Revision-Date: 2010-09-04 08:37+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_reporting/i18n/tr.po b/addons/account_reporting/i18n/tr.po
index 1e1071bf8d8..4e9b4134fab 100644
--- a/addons/account_reporting/i18n/tr.po
+++ b/addons/account_reporting/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:21+0000\n"
+"PO-Revision-Date: 2010-09-04 08:37+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_reporting
diff --git a/addons/account_tax_include/i18n/nb.po b/addons/account_tax_include/i18n/nb.po
new file mode 100644
index 00000000000..84185e05e6e
--- /dev/null
+++ b/addons/account_tax_include/i18n/nb.po
@@ -0,0 +1,53 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-08-28 16:01+0000\n"
+"PO-Revision-Date: 2010-09-04 09:03+0000\n"
+"Last-Translator: OpenERP Administrators \n"
+"Language-Team: Norwegian Bokmal \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: account_tax_include
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Ugyldig XML for visningsarkitektur!"
+
+#. module: account_tax_include
+#: field:account.invoice,price_type:0
+msgid "Price method"
+msgstr ""
+
+#. module: account_tax_include
+#: model:ir.module.module,shortdesc:account_tax_include.module_meta_information
+msgid "Invoices and prices with taxes included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax included"
+msgstr ""
+
+#. module: account_tax_include
+#: selection:account.invoice,price_type:0
+msgid "Tax excluded"
+msgstr ""
+
+#. module: account_tax_include
+#: view:account.tax:0
+msgid "Compute Code for Taxes included prices"
+msgstr ""
+
+#. module: account_tax_include
+#: field:account.invoice.line,price_subtotal_incl:0
+msgid "Subtotal"
+msgstr "Subtotal"
diff --git a/addons/account_tax_include/i18n/tr.po b/addons/account_tax_include/i18n/tr.po
index a24cb5cf4ec..7257fe964c3 100644
--- a/addons/account_tax_include/i18n/tr.po
+++ b/addons/account_tax_include/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:34+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_tax_include
diff --git a/addons/account_voucher/i18n/lt.po b/addons/account_voucher/i18n/lt.po
index 856869fbaad..1cd3053867d 100644
--- a/addons/account_voucher/i18n/lt.po
+++ b/addons/account_voucher/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/account_voucher/i18n/tr.po b/addons/account_voucher/i18n/tr.po
index ef95a8a63dd..a28dac344db 100644
--- a/addons/account_voucher/i18n/tr.po
+++ b/addons/account_voucher/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:34+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: account_voucher
diff --git a/addons/analytic_journal_billing_rate/i18n/tr.po b/addons/analytic_journal_billing_rate/i18n/tr.po
index 8280adf8789..67e874319fe 100644
--- a/addons/analytic_journal_billing_rate/i18n/tr.po
+++ b/addons/analytic_journal_billing_rate/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:16+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_journal_billing_rate
diff --git a/addons/analytic_user_function/i18n/nl.po b/addons/analytic_user_function/i18n/nl.po
index bfaf43f6394..19d3aee77a5 100644
--- a/addons/analytic_user_function/i18n/nl.po
+++ b/addons/analytic_user_function/i18n/nl.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 02:55+0000\n"
-"Last-Translator: Fabien (Open ERP) \n"
+"PO-Revision-Date: 2010-09-02 07:26+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-08-12 04:05+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:49+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
#: constraint:ir.ui.view:0
msgid "Invalid XML for View Architecture!"
-msgstr "Ongeldige XML voor overzicht"
+msgstr "Ongeldige XML, kan overzicht niet weergeven!"
#. module: analytic_user_function
#: model:ir.model,name:analytic_user_function.model_analytic_user_funct_grid
@@ -52,7 +52,7 @@ msgstr "Gebruiker"
msgid ""
"The Object name must start with x_ and not contain any special character !"
msgstr ""
-"De objectnaam moet beginnen met x_ en mag geen speciale karakters bevatten !"
+"De objectnaam moet beginnen met x_ en mag geen speciale tekens bevatten!"
#. module: analytic_user_function
#: model:ir.module.module,shortdesc:analytic_user_function.module_meta_information
diff --git a/addons/analytic_user_function/i18n/tr.po b/addons/analytic_user_function/i18n/tr.po
index 136f14ae807..6f7dbb9b910 100644
--- a/addons/analytic_user_function/i18n/tr.po
+++ b/addons/analytic_user_function/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: analytic_user_function
diff --git a/addons/auction/i18n/lt.po b/addons/auction/i18n/lt.po
index bd97ccbac98..ccc4de1ff37 100644
--- a/addons/auction/i18n/lt.po
+++ b/addons/auction/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:59+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/nl.po b/addons/auction/i18n/nl.po
index 75d893a9b2b..749015db944 100644
--- a/addons/auction/i18n/nl.po
+++ b/addons/auction/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:34+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/i18n/tr.po b/addons/auction/i18n/tr.po
index 0320aa3df18..3ac7cd0b802 100644
--- a/addons/auction/i18n/tr.po
+++ b/addons/auction/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: auction
diff --git a/addons/auction/test/auction.yml b/addons/auction/test/auction.yml
index 6b86511cf2a..6d07f5fc0a5 100644
--- a/addons/auction/test/auction.yml
+++ b/addons/auction/test/auction.yml
@@ -1,7 +1,5 @@
-
- In order to test the auction module in the Open-ERP I start the process by creating a product.
--
- I create a new product furniture.
+ In order to test the auction module in the OpenERP I start the process by creating a product.
-
!record {model: product.product, id: product_product_furniture0}:
categ_id: product.cat1
@@ -36,8 +34,7 @@
-
!record {model: account.journal, id: account.sales_journal}:
analytic_journal_id: account.cose_journal_sale
-
--
+-
I'm creating new Seller "Mr. Pinakin" with him email "info@mycustomer.com".
-
!record {model: res.partner, id: res_partner_mrpinakin0}:
@@ -225,8 +222,7 @@
!python {model: auction.lots}: |
from tools.translate import _
auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
- assert(auc_id.buyer_price,auc_id.seller_price), _('Buyer price and seller price are not available!')
-
+ assert auc_id.buyer_price and auc_id.seller_price, _('Buyer price and seller price are not available!')
-
Now, An object has been sold,so I click on the "Sold" button.
-
@@ -271,44 +267,15 @@
auc_id=self.browse(cr, uid, ref("auction_lots_woodenchair0"))
assert(auc_id.ach_inv_id), _('Buyer Invoice has not been created!')
-
- Buyer Create a Invoice payment record by Click on "Pay Invoice" Button of Account invoice.
+ Buyer pays the invoice
-
- !record {model: account.invoice.pay, id: account_invoice_pay_furniture0}:
- amount: 4120.0
- date: '2010-08-06'
- journal_id: account.cash_journal
- name: Furniture
- period_id: account.period_8
--
- Now Buyer want to make Full payment by click on "Full Payment" button of Account Invoice wizard.
--
- !python {model: account.invoice.pay}: |
- obj_invoice = self.pool.get('account.invoice')
+ !python {model: account.invoice}: |
obj_lots = self.pool.get('auction.lots')
lots_id = obj_lots.browse(cr, uid, ref("auction_lots_woodenchair0"))
- invoice_ids = obj_invoice.search(cr, uid, [('id', '=', lots_id.ach_inv_id.id)])
- self.wo_check(cr, uid, [ref("account_invoice_pay_furniture0")], {"active_model": "account.invoice", "department_id": False,
- "record_id": 7, "search_default_draft": "1", "active_ids": invoice_ids,
- "active_id": invoice_ids[0]})
--
- After Click on Full Payment Button, Creating a account invoice pay writeoff record.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- comment: Write-Off
- writeoff_acc_id: auction.auction_income_costs
- writeoff_journal_id: account.sales_journal
--
- And click on "pay_and_reconcile_writeoff" button.
--
- !python {model: account.invoice.pay.writeoff}: |
- obj_invoice = self.pool.get('account.invoice')
- obj_lots = self.pool.get('auction.lots')
- lots_id = obj_lots.browse(cr, uid, ref("auction_lots_woodenchair0"))
- invoice_ids = obj_invoice.search(cr, uid, [('id', '=', lots_id.ach_inv_id.id)])
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"active_model": "account.invoice", "department_id":
- False, "record_id": 7, "search_default_draft": "1", "active_ids": invoice_ids ,
- "active_id": invoice_ids[0], })
+ self.pay_and_reconcile(cr, uid, [lots_id.ach_inv_id.id], 4120.0,
+ ref('account.cash'), ref('account.period_8'),
+ ref('account.cash_journal'), ref('account.cash'),
+ ref('account.period_8'), ref('account.cash_journal'), name='Furniture')
-
I check that "Buyer Invoice Reconciled" field is marked.
-
diff --git a/addons/audittrail/i18n/lt.po b/addons/audittrail/i18n/lt.po
index 216b0b6b43b..292c0fe0c9a 100644
--- a/addons/audittrail/i18n/lt.po
+++ b/addons/audittrail/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:23+0000\n"
+"PO-Revision-Date: 2010-09-04 08:01+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/tr.po b/addons/audittrail/i18n/tr.po
index c462f84de32..4e93a4bd532 100644
--- a/addons/audittrail/i18n/tr.po
+++ b/addons/audittrail/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/audittrail/i18n/zh_CN.po b/addons/audittrail/i18n/zh_CN.po
index 626056153a3..34361b3d37f 100644
--- a/addons/audittrail/i18n/zh_CN.po
+++ b/addons/audittrail/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:36+0000\n"
"Last-Translator: Black Jack \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: audittrail
diff --git a/addons/base_contact/i18n/lt.po b/addons/base_contact/i18n/lt.po
index 7aae9789762..c09035f5f33 100644
--- a/addons/base_contact/i18n/lt.po
+++ b/addons/base_contact/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:41+0000\n"
"Last-Translator: Giedrius Slavinskas \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/base_contact/i18n/tr.po b/addons/base_contact/i18n/tr.po
index fd3fb3104fd..fa7b70ed0dc 100644
--- a/addons/base_contact/i18n/tr.po
+++ b/addons/base_contact/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:22+0000\n"
+"PO-Revision-Date: 2010-09-04 08:42+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_contact/i18n/zh_CN.po b/addons/base_contact/i18n/zh_CN.po
index 22123492b4f..71836fbf339 100644
--- a/addons/base_contact/i18n/zh_CN.po
+++ b/addons/base_contact/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:21+0000\n"
+"PO-Revision-Date: 2010-09-04 08:37+0000\n"
"Last-Translator: Black Jack \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_contact
diff --git a/addons/base_iban/i18n/tr.po b/addons/base_iban/i18n/tr.po
index bd2ff7b70d9..164a9a5e2b5 100644
--- a/addons/base_iban/i18n/tr.po
+++ b/addons/base_iban/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:21+0000\n"
+"PO-Revision-Date: 2010-09-04 08:37+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_iban
diff --git a/addons/base_module_quality/base_module_quality.py b/addons/base_module_quality/base_module_quality.py
index c19bd37f97f..637eb9e22b6 100644
--- a/addons/base_module_quality/base_module_quality.py
+++ b/addons/base_module_quality/base_module_quality.py
@@ -26,6 +26,7 @@ import tools
from tools import config
from tools.translate import _
from osv import osv, fields
+import logging
class abstract_quality_check(object):
'''
@@ -80,6 +81,7 @@ class abstract_quality_check(object):
#This variable used to give message if test result is good or not
self.message = ''
+ self.log = logging.getLogger('module.quality')
#The tests have to subscribe itselfs in this list, that contains
#all the test that have to be performed.
@@ -111,9 +113,11 @@ class abstract_quality_check(object):
model_data = pool.get('ir.model.data').browse(cr, uid, ids2)
for model in model_data:
model_list.append(model.res_id)
+ self.log.debug('get_objects() model_list: %s', ','.join(map(str, model_list)))
obj_list = []
for mod in pool.get('ir.model').browse(cr, uid, model_list):
obj_list.append(str(mod.model))
+ self.log.debug('get_objects() obj_list: %s', ','.join(obj_list))
return obj_list
def get_model_ids(self, cr, uid, models=[]):
@@ -121,6 +125,7 @@ class abstract_quality_check(object):
if not models:
return []
pool = pooler.get_pool(cr.dbname)
+ self.log.debug('get_model_ids([%s])', ', '.join(models))
return pool.get('ir.model').search(cr, uid, [('model', 'in', models)])
def get_ids(self, cr, uid, object_list):
@@ -287,4 +292,4 @@ class module_quality_detail(osv.osv):
module_quality_detail()
-# 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/base_module_quality/i18n/tr.po b/addons/base_module_quality/i18n/tr.po
index 18e7c8dc3df..1e31ff3c62b 100644
--- a/addons/base_module_quality/i18n/tr.po
+++ b/addons/base_module_quality/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:01+0000\n"
+"PO-Revision-Date: 2010-09-04 08:42+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_quality
diff --git a/addons/base_module_quality/workflow_test/workflow_test.py b/addons/base_module_quality/workflow_test/workflow_test.py
index f92107e8fbd..11f7bcf12c3 100644
--- a/addons/base_module_quality/workflow_test/workflow_test.py
+++ b/addons/base_module_quality/workflow_test/workflow_test.py
@@ -74,9 +74,14 @@ class quality_test(base_module_quality.abstract_quality_check):
wkf_ids = map(lambda x:x['id'], wkfs)
if not wkf_ids:
result_dict[module_name] = [module_name, 'No workflow defined on module']
- #Activity of workflow checking...
- activity_ids = wkf_activity_obj.search(cr, uid, [('wkf_id', 'in', wkf_ids)])
- activities = wkf_activity_obj.browse(cr, uid, activity_ids)
+ activity_ids = []
+ activities = []
+ else:
+ #Activity of workflow checking...
+ activity_ids = wkf_activity_obj.search(cr, uid, [('wkf_id', 'in', wkf_ids)])
+ activities = wkf_activity_obj.browse(cr, uid, activity_ids)
+ self.log.debug("quality test: wkf_ids = %r", wkf_ids)
+ self.log.debug("quality test: activity_ids = %r", activity_ids)
for activity in activities:
if activity.flow_start:
activity_chk[activity.wkf_id.osv]['start'] = 'ok'
diff --git a/addons/base_module_record/i18n/tr.po b/addons/base_module_record/i18n/tr.po
index 6398e42e566..256c2b5d0f9 100644
--- a/addons/base_module_record/i18n/tr.po
+++ b/addons/base_module_record/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_module_record
diff --git a/addons/base_report_creator/i18n/tr.po b/addons/base_report_creator/i18n/tr.po
index 2fd4aed9157..cff8bd2faa1 100644
--- a/addons/base_report_creator/i18n/tr.po
+++ b/addons/base_report_creator/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:42+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_creator
diff --git a/addons/base_report_designer/i18n/tr.po b/addons/base_report_designer/i18n/tr.po
index d273ce4f3d0..288c8dde92b 100644
--- a/addons/base_report_designer/i18n/tr.po
+++ b/addons/base_report_designer/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 08:54+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_report_designer
diff --git a/addons/base_setup/base_setup_installer.xml b/addons/base_setup/base_setup_installer.xml
index cdaf66100ac..ceeebd2e8eb 100644
--- a/addons/base_setup/base_setup_installer.xml
+++ b/addons/base_setup/base_setup_installer.xml
@@ -28,7 +28,7 @@
-
+
diff --git a/addons/base_setup/base_setup_todo.xml b/addons/base_setup/base_setup_todo.xml
index a4b4b2bda23..59543200076 100644
--- a/addons/base_setup/base_setup_todo.xml
+++ b/addons/base_setup/base_setup_todo.xml
@@ -36,10 +36,10 @@
-
-
-
-
+
+
+
+
diff --git a/addons/base_setup/i18n/tr.po b/addons/base_setup/i18n/tr.po
index 5d3542213ba..e5a16689b02 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_setup
diff --git a/addons/base_setup/installer.py b/addons/base_setup/installer.py
index 2886857a45d..e70e34a5606 100644
--- a/addons/base_setup/installer.py
+++ b/addons/base_setup/installer.py
@@ -104,6 +104,18 @@ class base_setup_installer(osv.osv_memory):
return ['document_ftp']
return None
+ def _if_misc_tools(self, cr, uid, ids, context=None):
+ interface = self.pool.get('res.users').browse(cr, uid, uid, context=context).view
+ if interface == 'simple' or interface =='extended' :
+ return ['profile_tools']
+ return None
+
+ def _if_account(self, cr, uid, ids, context=None):
+ if self.pool.get('res.users').browse(cr, uid, uid, context=context)\
+ .view == 'simple':
+ return ['account_voucher']
+ return None
+
def onchange_moduleselection(self, cr, uid, ids, *args):
closed, total = self.get_current_progress(cr, uid)
diff --git a/addons/base_vat/i18n/tr.po b/addons/base_vat/i18n/tr.po
index 99c25adfb0e..eaeede631f2 100644
--- a/addons/base_vat/i18n/tr.po
+++ b/addons/base_vat/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: base_vat
diff --git a/addons/board/i18n/tr.po b/addons/board/i18n/tr.po
index 87119aff26b..c332204030e 100644
--- a/addons/board/i18n/tr.po
+++ b/addons/board/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: board
diff --git a/addons/crm/crm_installer_view.xml b/addons/crm/crm_installer_view.xml
index 0b5b87ff485..855e2a6a125 100644
--- a/addons/crm/crm_installer_view.xml
+++ b/addons/crm/crm_installer_view.xml
@@ -61,6 +61,7 @@
3
+
diff --git a/addons/crm/crm_opportunity_menu.xml b/addons/crm/crm_opportunity_menu.xml
index 282dc78bb8c..0bfb5f35efc 100644
--- a/addons/crm/crm_opportunity_menu.xml
+++ b/addons/crm/crm_opportunity_menu.xml
@@ -5,6 +5,7 @@
+ name="%(opportunity2phonecall_act)d" icon="terp-call-start" type="action" groups="base.group_extended"/>
diff --git a/addons/crm/i18n/fi.po b/addons/crm/i18n/fi.po
index 42c8b1be8a0..71263ee49c9 100644
--- a/addons/crm/i18n/fi.po
+++ b/addons/crm/i18n/fi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 09:01+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Finnish \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/hr.po b/addons/crm/i18n/hr.po
index 417bebc1b90..7a68dcb2363 100644
--- a/addons/crm/i18n/hr.po
+++ b/addons/crm/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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-31 07:53+0000\n"
-"Last-Translator: OpenERP Administrators \n"
+"PO-Revision-Date: 2010-09-04 08:57+0000\n"
+"Last-Translator: Goran Kliska \n"
"Language-Team: Vinteh\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: hr\n"
@@ -337,7 +337,7 @@ msgstr "Kategorije"
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#, python-format
msgid "Warning!"
-msgstr ""
+msgstr "Upozorenje!"
#. module: crm
#: view:crm.case:0
@@ -698,6 +698,8 @@ msgid ""
"Default state of mind for period preceeding the 'Max Interval' computation. "
"This is the starting state of mind by default if the partner has no event."
msgstr ""
+"Zadano zadovoljstvo za razdoblje koje prethodi izračunu 'Max. interval'. Ovo "
+"je početno zadovoljstvo partnera dok još nema događaja."
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim3
@@ -884,7 +886,7 @@ msgstr "Televizija"
#. module: crm
#: view:crm.segmentation:0
msgid "Stop Process"
-msgstr ""
+msgstr "Zaustavi proces"
#. module: crm
#: model:crm.case.categ,name:crm.categ_claim1
@@ -910,7 +912,7 @@ msgstr "Dani po Periodu"
#. module: crm
#: field:crm.segmentation.line,expr_value:0
msgid "Value"
-msgstr ""
+msgstr "Vrijednost"
#. module: crm
#: help:caldav.crm.export,init,name:0
@@ -2135,7 +2137,7 @@ msgstr "Nepromijenjen"
#: wizard_view:crm.phonecall.opportunity_set,create_partner:0
#: wizard_view:crm.phonecall.partner_create,init:0
msgid "Convert To Partner"
-msgstr ""
+msgstr "Pretvori u partnera"
#. module: crm
#: field:crm.case.rule,trg_state_from:0
@@ -2425,7 +2427,7 @@ msgstr "Vrati na Nepotvrđen"
#. module: crm
#: view:crm.case:0
msgid "Helpdesk Support"
-msgstr ""
+msgstr "Podrška Helpdesk-a"
#. module: crm
#: field:crm.case,email_cc:0
diff --git a/addons/crm/i18n/lt.po b/addons/crm/i18n/lt.po
index 33cf040e30f..53209ea0a7f 100644
--- a/addons/crm/i18n/lt.po
+++ b/addons/crm/i18n/lt.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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-31 08:11+0000\n"
+"PO-Revision-Date: 2010-09-04 08:53+0000\n"
"Last-Translator: Giedrius Slavinskas \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/crm/i18n/nl.po b/addons/crm/i18n/nl.po
index 7f30ac31938..23897d6aa9d 100644
--- a/addons/crm/i18n/nl.po
+++ b/addons/crm/i18n/nl.po
@@ -7,19 +7,19 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-07 07:38+0000\n"
+"PO-Revision-Date: 2010-09-02 07:24+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-08-12 03:47+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
#: field:crm.email.add.cc,name:0
msgid "Send to"
-msgstr ""
+msgstr "Verzenden naar"
#. module: crm
#: help:crm.meeting,exdate:0
@@ -27,27 +27,31 @@ msgid ""
"This property defines the list of date/time exceptions for "
"arecurring calendar component."
msgstr ""
+"Deze eigenschap definieert een lijst met datum/tijd uitgezonderingen bij "
+"herhalingsafspraken in de agenda."
#. module: crm
#: help:crm.case.rule,act_mail_to_user:0
msgid ""
"Check this if you want the rule to send an email to the responsible person."
msgstr ""
+"Vink dit aan wanneer de regel een email moet zenden naar de "
+"verantwoordelijke persoon."
#. module: crm
#: view:crm.meeting:0
msgid "Title"
-msgstr ""
+msgstr "Titel"
#. module: crm
#: model:ir.model,name:crm.model_report_crm_case_section_categ2
msgid "Cases by section and category2"
-msgstr ""
+msgstr "Dossiers op sectie en categorie2"
#. module: crm
#: wizard_field:crm.lead.partner_create,init,close:0
msgid "Close Lead"
-msgstr ""
+msgstr "Lead afsluiten"
#. module: crm
#: view:crm.job:0
@@ -55,17 +59,17 @@ msgstr ""
#: view:crm.opportunity:0
#: view:crm.phonecall:0
msgid " 7 Days "
-msgstr ""
+msgstr " 7 Dagen "
#. module: crm
#: help:crm.menu.config_wizard,helpdesk:0
msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Beheert een helpdesk-service."
#. module: crm
#: view:crm.job:0
msgid "Pending Jobs"
-msgstr ""
+msgstr "Wachtende vacatures"
#. module: crm
#: field:crm.case.rule,trg_state_to:0
@@ -80,12 +84,12 @@ msgstr "Geraamde kosten"
#. module: crm
#: wizard_field:crm.job.partner_create,init,close:0
msgid "Close job request"
-msgstr ""
+msgstr "Vacature afsluiten"
#. module: crm
#: field:crm.case.stage,name:0
msgid "Stage Name"
-msgstr ""
+msgstr "Naam stadium"
#. module: crm
#: view:crm.case:0
@@ -109,12 +113,12 @@ msgstr ""
#. module: crm
#: model:ir.ui.menu,name:crm.menu_hr
msgid "Human Resources"
-msgstr ""
+msgstr "Personeelszaken"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_action_report_crm_case_oppor_categ_categ2
msgid "Cases by Opportunities, Category and Type"
-msgstr ""
+msgstr "Dossiers op kansen, categorie en soort"
#. module: crm
#: help:crm.menu.config_wizard,claims:0
@@ -122,22 +126,24 @@ msgid ""
"Manages the supplier and customers claims, including your corrective or "
"preventive actions."
msgstr ""
+"Beheert de claims van leveranciers en klanten, inclusief uw corrigerende of "
+"preventieve acties."
#. module: crm
#: view:crm.fundraising:0
msgid "Amount"
-msgstr ""
+msgstr "Bedrag"
#. module: crm
#: model:process.transition,note:crm.process_transition_opportunitymeeting0
msgid "Normal or phone meeting for opportunity"
-msgstr ""
+msgstr "Normale- of telefonische bespreking voor kans"
#. module: crm
#: model:crm.case.stage,name:crm.stage_claim2
#: model:crm.case.stage,name:crm.stage_meet1
msgid "Fixed"
-msgstr ""
+msgstr "Opgelost"
#. module: crm
#: code:addons/crm/crm.py:0
@@ -152,17 +158,17 @@ msgstr "Waarschuwing!"
#: code:addons/crm/wizard/wizard_crm_new_send_email.py:0
#, python-format
msgid "Please specify user's email address !"
-msgstr ""
+msgstr "A.u.b. emailadres gebruiker invoeren!"
#. module: crm
#: model:crm.case.categ,name:crm.categ_oppor5
msgid "Campaign"
-msgstr ""
+msgstr "Campagne"
#. module: crm
#: view:crm.opportunity:0
msgid "Search Opportunities"
-msgstr ""
+msgstr "Zoek kansen"
#. module: crm
#: model:ir.ui.menu,name:crm.menu_crm_case_section_stage_tree
diff --git a/addons/crm/i18n/pl.po b/addons/crm/i18n/pl.po
index 7e34c72e145..328d132b74e 100644
--- a/addons/crm/i18n/pl.po
+++ b/addons/crm/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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-31 08:13+0000\n"
+"PO-Revision-Date: 2010-09-04 09:01+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/pt.po b/addons/crm/i18n/pt.po
index 2ef15438c02..3406a2d328b 100644
--- a/addons/crm/i18n/pt.po
+++ b/addons/crm/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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-31 08:11+0000\n"
+"PO-Revision-Date: 2010-09-04 08:49+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/sk.po b/addons/crm/i18n/sk.po
index 0dd2325e32a..cfdeb7fbdf3 100644
--- a/addons/crm/i18n/sk.po
+++ b/addons/crm/i18n/sk.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-31 07:56+0000\n"
+"PO-Revision-Date: 2010-09-04 08:52+0000\n"
"Last-Translator: Radoslav Sloboda \n"
"Language-Team: Slovak \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm/i18n/tr.po b/addons/crm/i18n/tr.po
index 39767cc67e8..4e46a221abe 100644
--- a/addons/crm/i18n/tr.po
+++ b/addons/crm/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: 2010-01-05 05:59+0000\n"
-"PO-Revision-Date: 2010-08-31 08:10+0000\n"
+"PO-Revision-Date: 2010-09-04 08:55+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 631e03699f2..70a3adc369e 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -50,9 +50,6 @@ class crm_helpdesk_report(osv.osv):
('07', 'July'), ('08', 'August'),\
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
- 'company_id': fields.many2one('res.company', 'Company', readonly=True),
- 'create_date': fields.datetime('Create Date', readonly=True),
- 'day': fields.char('Day', size=128, readonly=True),
'delay_close': fields.char('Delay to close', size=20, readonly=True),
'partner_id': fields.many2one('res.partner', 'Partner' , readonly=True),
'company_id': fields.many2one('res.company', 'Company', readonly=True),
diff --git a/addons/crm_profiling/i18n/nl.po b/addons/crm_profiling/i18n/nl.po
index d4d2ff52c45..1d9591b12b2 100644
--- a/addons/crm_profiling/i18n/nl.po
+++ b/addons/crm_profiling/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 04:54+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-02 07:22+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-08-12 04:03+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
@@ -48,7 +48,7 @@ msgstr "crm_profiling beheer"
#. module: crm_profiling
#: constraint:ir.actions.act_window:0
msgid "Invalid model name in the action definition."
-msgstr "Ongeldige modelnaam in de definitie van de actie."
+msgstr "Ongeldige modelnaam in de actie-definitie."
#. module: crm_profiling
#: field:crm_profiling.answer,name:0
diff --git a/addons/crm_profiling/i18n/tr.po b/addons/crm_profiling/i18n/tr.po
index e5e06f6d173..f69582b4542 100644
--- a/addons/crm_profiling/i18n/tr.po
+++ b/addons/crm_profiling/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:22+0000\n"
+"PO-Revision-Date: 2010-09-04 08:40+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: crm_profiling
diff --git a/addons/decimal_precision/i18n/pt_BR.po b/addons/decimal_precision/i18n/pt_BR.po
index b9e8d1d9b88..57253ab12b9 100644
--- a/addons/decimal_precision/i18n/pt_BR.po
+++ b/addons/decimal_precision/i18n/pt_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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: decimal_precision
diff --git a/addons/delivery/i18n/ru.po b/addons/delivery/i18n/ru.po
index 930dc5c3bc0..8d470e9ce51 100644
--- a/addons/delivery/i18n/ru.po
+++ b/addons/delivery/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:45+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
diff --git a/addons/delivery/i18n/tr.po b/addons/delivery/i18n/tr.po
index aa4d5acb0f8..48efd778cf5 100644
--- a/addons/delivery/i18n/tr.po
+++ b/addons/delivery/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:44+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: delivery
diff --git a/addons/document/i18n/mn.po b/addons/document/i18n/mn.po
index 67eca26cc9c..7e0d6fdad4b 100644
--- a/addons/document/i18n/mn.po
+++ b/addons/document/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 09:02+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/ru.po b/addons/document/i18n/ru.po
index a51cdaddd65..0e8ce2939b1 100644
--- a/addons/document/i18n/ru.po
+++ b/addons/document/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:22+0000\n"
+"PO-Revision-Date: 2010-09-04 08:13+0000\n"
"Last-Translator: devcode \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/tr.po b/addons/document/i18n/tr.po
index 4011fb58830..c745444591e 100644
--- a/addons/document/i18n/tr.po
+++ b/addons/document/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:22+0000\n"
+"PO-Revision-Date: 2010-09-04 08:39+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/i18n/zh_CN.po b/addons/document/i18n/zh_CN.po
index b11ef4f10a4..d351999c1e2 100644
--- a/addons/document/i18n/zh_CN.po
+++ b/addons/document/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:19+0000\n"
+"PO-Revision-Date: 2010-09-04 08:35+0000\n"
"Last-Translator: Black Jack \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document
diff --git a/addons/document/report/document_report.py b/addons/document/report/document_report.py
index 130a313dfd6..55af96b3926 100644
--- a/addons/document/report/document_report.py
+++ b/addons/document/report/document_report.py
@@ -40,7 +40,6 @@ class report_document_user(osv.osv):
'file_size': fields.integer('File Size', readonly=True),
'nbr':fields.integer('# of Files', readonly=True),
'type':fields.char('Directory Type',size=64,readonly=True),
- 'partner':fields.char('Partner',size=64,readonly=True),
}
def init(self, cr):
tools.drop_view_if_exists(cr, 'report_document_user')
diff --git a/addons/document_ics/i18n/tr.po b/addons/document_ics/i18n/tr.po
index 89637e2e6b0..43875f9e4e1 100644
--- a/addons/document_ics/i18n/tr.po
+++ b/addons/document_ics/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:11+0000\n"
+"PO-Revision-Date: 2010-09-04 08:50+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
diff --git a/addons/document_ics/i18n/zh_CN.po b/addons/document_ics/i18n/zh_CN.po
index 4cffda54cd9..e72672976c3 100644
--- a/addons/document_ics/i18n/zh_CN.po
+++ b/addons/document_ics/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:52+0000\n"
"Last-Translator: Black Jack \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: document_ics
diff --git a/addons/document_webdav/i18n/nl.po b/addons/document_webdav/i18n/nl.po
new file mode 100644
index 00000000000..a09b3d028f6
--- /dev/null
+++ b/addons/document_webdav/i18n/nl.po
@@ -0,0 +1,31 @@
+# Dutch translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR , 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME \n"
+"POT-Creation-Date: 2009-05-30 15:14+0000\n"
+"PO-Revision-Date: 2010-09-02 07:26+0000\n"
+"Last-Translator: OpenERP Administrators \n"
+"Language-Team: Dutch \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:49+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#. module: document_webdav_old
+#: model:ir.module.module,description:document_webdav_old.module_meta_information
+msgid ""
+"This is a complete document management system:\n"
+"\t* WebDav Interface\n"
+"\t* User Authentification\n"
+"\t* Document Indexation\n"
+msgstr ""
+"Dit is een compleet document management systeem:\n"
+"\t* WebDav Interface\n"
+"\t* Gebruiker authentificatie\n"
+"\t* Document Indexatie\n"
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index c2bb6ac7390..d1e6f2e8d52 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -76,7 +76,7 @@
-
+
res.users.form
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 934f5889ab3..a10393aac33 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -29,8 +29,8 @@
-
-
+
+
Configure
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 659ddfa36e9..250f47b2055 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -102,7 +102,7 @@
-
+
@@ -189,7 +189,7 @@
+ parent="hr.menu_view_employee_category_configuration_form" sequence="3" groups="base.group_extended"/>
@@ -387,7 +388,7 @@
- Idea's vote
+ Idea's Votes
idea.vote
form
tree,form
diff --git a/addons/idea/report/report_vote.py b/addons/idea/report/report_vote.py
index 2751450129c..008cb3ed711 100644
--- a/addons/idea/report/report_vote.py
+++ b/addons/idea/report/report_vote.py
@@ -35,7 +35,7 @@ class report_vote(osv.osv):
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'user_id': fields.many2one('res.users', 'User Name'),
- 'score': fields.integer('Score'),
+ 'score': fields.integer('Score',group_operator="avg"),
'idea_id': fields.many2one('idea.idea', 'Idea'),
'nbr':fields.integer('# of Lines', readonly=True),
'idea_state': fields.selection([('draft', 'Draft'),('open', 'Opened'),
diff --git a/addons/idea/report/report_vote_view.xml b/addons/idea/report/report_vote_view.xml
index 5b82cb4e396..0b0fa7edb12 100644
--- a/addons/idea/report/report_vote_view.xml
+++ b/addons/idea/report/report_vote_view.xml
@@ -17,7 +17,7 @@
-
+
@@ -40,7 +40,7 @@
separator="1"
domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=7)).strftime('%%Y-%%m-%%d'))]"
help="Idea Vote created last 7 days"/>
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
@@ -76,12 +83,12 @@
- Idea Vote Analysis
+ Ideas Analysis
report.vote
form
tree,form
- {'search_default_User':1,'group_by_no_leaf':1,'group_by':[]}
+ {'search_default_User':1,'search_default_State':1,'group_by_no_leaf':1,'group_by':[]}
diff --git a/addons/idea/security/ir.model.access.csv b/addons/idea/security/ir.model.access.csv
index dae5127cc90..30dc0850c3f 100644
--- a/addons/idea/security/ir.model.access.csv
+++ b/addons/idea/security/ir.model.access.csv
@@ -1,20 +1,20 @@
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_idea_category","idea.category","model_idea_category","base.group_user",1,0,0,0
+"access_idea_category","idea.category","model_idea_category","base.group_user",1,1,1,1
"access_idea_idea","idea.idea","model_idea_idea","base.group_user",1,1,1,1
"access_idea_vote","idea.vote","model_idea_vote","base.group_user",1,1,1,1
-"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,0,0,0
+"access_idea_vote_stat","idea.vote.stat","model_idea_vote_stat","base.group_user",1,1,1,1
"access_idea_category_system","idea.category system","model_idea_category","base.group_system",1,1,1,1
"access_idea_comment","idea.comment","model_idea_comment","base.group_system",1,1,1,1
-"access_idea_comment_user","idea.comment","model_idea_comment","base.group_user",1,1,1,0
+"access_idea_comment_base_user","idea.comment.base.user","model_idea_comment","base.group_user",1,1,1,1
"access_report_vote","report.vote","model_report_vote","base.group_user",1,1,1,1
"access_idea_idea_sale_salesman","idea.idea.sale","model_idea_idea","base.group_sale_salesman",1,1,1,1
"access_idea_vote_sale_salesman","idea.vote.sale","model_idea_vote","base.group_sale_salesman",1,1,1,1
"access_idea_category_user","idea.category user","model_idea_category","base.group_tool_user",1,1,1,1
"access_idea_idea_user","idea.idea user","model_idea_idea","base.group_tool_user",1,1,1,1
"access_idea_vote_user","idea.vote user","model_idea_vote","base.group_tool_user",1,1,1,1
-"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,0,0,0
-"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,0,0,0
-"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,0,0,0
+"access_idea_category_manager","idea.category manager","model_idea_category","base.group_tool_manager",1,1,1,1
+"access_idea_idea_manager","idea.idea manager","model_idea_idea","base.group_tool_manager",1,1,1,1
+"access_idea_vote_manager","idea.vote manager","model_idea_vote","base.group_tool_manager",1,1,1,1
"access_idea_vote_stat_user","idea.vote.stat user","model_idea_vote_stat","base.group_tool_user",1,1,1,1
"access_idea_comment_user","idea.comment user","model_idea_comment","base.group_tool_user",1,1,1,1
"access_report_vote_manager","report.vote manager","model_report_vote","base.group_tool_manager",1,1,1,1
@@ -23,3 +23,4 @@
"access_report_vote_system","report.vote system","model_report_vote","base.group_system",1,0,0,0
"access_idea_vote_stat_manager","idea.vote.stat manager","model_idea_vote_stat","base.group_tool_manager",1,1,1,1
"access_idea_vote_stat_system","idea.vote.stat system","model_idea_vote_stat","base.group_system",1,1,1,1
+"access_idea_comment_manager","idea.comment.manager","model_idea_comment","base.group_tool_manager",1,1,1,1
diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml
index 307344cf584..bdf66af961e 100644
--- a/addons/idea/test/test_idea.yml
+++ b/addons/idea/test/test_idea.yml
@@ -15,7 +15,7 @@
description: I want that Technical presentation are arranged for 1 hours in every
day.\nso, on that presentation, we can know all things what improvement and development
are done in our company.\n\n\n\n\n
- title: Technical presentation for 1 hours in every day
+ name: Technical presentation for 1 hours in every day
user_id: base.user_root
- |
diff --git a/addons/idea/wizard/idea_post_vote.py b/addons/idea/wizard/idea_post_vote.py
index c4ba6f331dc..7dacbcfedac 100644
--- a/addons/idea/wizard/idea_post_vote.py
+++ b/addons/idea/wizard/idea_post_vote.py
@@ -87,7 +87,7 @@ class idea_post_vote(osv.osv_memory):
raise osv.except_osv(_('Warning !'),_("You can not give Vote for this idea more than %s times") % (user_limit))
if idea.state != 'open':
- raise osv.except_osv(_('Warning !'), _('Idea should be in \
+ raise osv.except_osv(_('Warning !'), _('Idea must be in \
\'Open\' state before vote for that idea.'))
return False
diff --git a/addons/l10n_be/i18n/es.po b/addons/l10n_be/i18n/es.po
index ac8c47d0120..d30eb2ad2cf 100644
--- a/addons/l10n_be/i18n/es.po
+++ b/addons/l10n_be/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:17+0000\n"
+"PO-Revision-Date: 2010-09-03 08:01+0000\n"
"Last-Translator: Jordi Esteve (www.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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-04 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_be
@@ -192,7 +192,7 @@ msgstr "Anual de venta de IVA Sometido para Clientes"
#: wizard_field:list.vat.detail,init,fyear:0
#: wizard_field:vat.intra.xml,init,fyear:0
msgid "Fiscal Year"
-msgstr "Año Fiscal"
+msgstr "Ejercicio fiscal"
#. module: l10n_be
#: wizard_view:wizard.account.xml.vat.declaration,go:0
diff --git a/addons/l10n_be/i18n/tr.po b/addons/l10n_be/i18n/tr.po
index 7b1c9cf4c90..b7df0bb2463 100644
--- a/addons/l10n_be/i18n/tr.po
+++ b/addons/l10n_be/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:04+0000\n"
+"PO-Revision-Date: 2010-09-04 08:48+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_be
diff --git a/addons/l10n_ch/i18n/it.po b/addons/l10n_ch/i18n/it.po
index fa6338b4737..a600a64acb7 100644
--- a/addons/l10n_ch/i18n/it.po
+++ b/addons/l10n_ch/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:01+0000\n"
+"PO-Revision-Date: 2010-09-04 08:46+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch
diff --git a/addons/l10n_ch/i18n/tr.po b/addons/l10n_ch/i18n/tr.po
index 31a110ff3ad..00afce20559 100644
--- a/addons/l10n_ch/i18n/tr.po
+++ b/addons/l10n_ch/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:53+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch
diff --git a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po b/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
index c989750bd03..aa2e375323e 100644
--- a/addons/l10n_ch_chart_c2c_pcg/i18n/tr.po
+++ b/addons/l10n_ch_chart_c2c_pcg/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:52+0000\n"
+"PO-Revision-Date: 2010-09-04 08:57+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_ch_chart_c2c_pcg
diff --git a/addons/l10n_chart_uk_minimal/i18n/tr.po b/addons/l10n_chart_uk_minimal/i18n/tr.po
index f42ec5fc018..5a3453783df 100644
--- a/addons/l10n_chart_uk_minimal/i18n/tr.po
+++ b/addons/l10n_chart_uk_minimal/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 08:54+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_chart_uk_minimal
diff --git a/addons/l10n_fr/i18n/tr.po b/addons/l10n_fr/i18n/tr.po
index d9df19d081c..bbe227eb991 100644
--- a/addons/l10n_fr/i18n/tr.po
+++ b/addons/l10n_fr/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:37+0000\n"
+"PO-Revision-Date: 2010-09-04 08:24+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_fr
diff --git a/addons/l10n_lu/i18n/tr.po b/addons/l10n_lu/i18n/tr.po
index 8ffa237f95d..6974746ecd2 100644
--- a/addons/l10n_lu/i18n/tr.po
+++ b/addons/l10n_lu/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:05+0000\n"
+"PO-Revision-Date: 2010-09-04 08:48+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: l10n_lu
diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py
index 06034df1688..ad2996315aa 100644
--- a/addons/lunch/lunch.py
+++ b/addons/lunch/lunch.py
@@ -81,7 +81,7 @@ class lunch_cashbox(osv.osv):
_columns = {
'manager': fields.many2one('res.users', 'Manager'),
'name': fields.char('Name', size=30, required=True, unique = True),
- 'sum_remain': fields.function(amount_available, method=True, string='Remained Total'),
+ 'sum_remain': fields.function(amount_available, method=True, string='Total Remaining'),
}
lunch_cashbox()
@@ -136,12 +136,12 @@ class lunch_order(osv.osv):
readonly=True, states={'draft':[('readonly', False)]}, change_default=True),
'date': fields.date('Date', readonly=True, states={'draft':[('readonly', False)]}),
'cashmove': fields.many2one('lunch.cashmove', 'CashMove' , readonly=True),
- 'descript': fields.char('Description Order', readonly=True, size=50, \
+ 'descript': fields.char('Description Order', readonly=True, size=250, \
states = {'draft':[('readonly', False)]}),
'state': fields.selection([('draft', 'Draft'), ('confirmed', 'Confirmed'), ], \
'State', readonly=True, select=True),
'price': fields.function(_price_get, method=True, string="Price"),
- 'category': fields.many2one('lunch.category','Category'),
+ 'category': fields.many2one('lunch.category','Category',readonly=True),
}
_defaults = {
@@ -217,6 +217,12 @@ class report_lunch_amount(osv.osv):
'user_id': fields.many2one('res.users', 'User Name', readonly=True),
'amount': fields.float('Amount', readonly=True, digits=(16, 2)),
'box': fields.many2one('lunch.cashbox', 'Box Name', size=30, readonly=True),
+ 'year': fields.char('Year', size=4, readonly=True),
+ 'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
+ ('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
+ ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+ 'day': fields.char('Day', size=128, readonly=True),
+ 'date': fields.date('Created Date', readonly=True),
}
def init(self, cr):
@@ -227,6 +233,10 @@ class report_lunch_amount(osv.osv):
create or replace view report_lunch_amount as (
select
min(lc.id) as id,
+ to_date(to_char(lc.create_date, 'dd-MM-YYYY'),'dd-MM-YYYY') as date,
+ to_char(lc.create_date, 'YYYY') as year,
+ to_char(lc.create_date, 'MM') as month,
+ to_char(lc.create_date, 'YYYY-MM-DD') as day,
lc.user_cashmove as user_id,
sum(amount) as amount,
lc.box as box
@@ -234,7 +244,7 @@ class report_lunch_amount(osv.osv):
lunch_cashmove lc
where
active = 't'
- group by lc.user_cashmove, lc.box
+ group by lc.user_cashmove, lc.box, lc.create_date
)""")
report_lunch_amount()
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index b0804cbb9b0..3c33dcd247e 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -6,14 +6,14 @@
id="menu_lunch" sequence="1" />
+ id="base.menu_lunch_reporting" sequence="6" groups="base.group_system,base.group_tool_manager"/>
+ id="base.menu_lunch_survey_root" sequence="20" groups="base.group_system"/>
@@ -47,14 +47,13 @@
tree
+
-
-
-
-
+
+
-
-
-
@@ -105,16 +101,16 @@
{"search_default_Today":1}
-
- CashBox
+ Cashboxes
lunch.cashbox
-
@@ -124,11 +120,11 @@
- CashBox
+ Cashboxes
lunch.cashbox
tree
-
+
@@ -139,11 +135,11 @@
- CashBox
+ Cashboxes
lunch.cashbox
-
@@ -173,10 +169,10 @@
tree
+
-
@@ -200,6 +196,8 @@
+
+
@@ -209,7 +207,7 @@
- CashMove
+ Cash Moves
lunch.cashmove
{"search_default_Today":1}
@@ -248,7 +246,7 @@
- Category of product
+ Product Categories
lunch.category
@@ -261,10 +259,10 @@
@@ -277,31 +275,47 @@
tree
-
-
-
-
+
+
+
+
+
+
+
+ Products
+ lunch.product
+ search
+
+
+
+
+
+
+
+
+
+
- Product
+ Products
lunch.product
+ form
+ tree,form
+
+
-
-
-
@@ -315,6 +329,10 @@
tree
+
+
+
+
@@ -346,6 +364,19 @@
+
+
+
+
@@ -361,7 +392,7 @@
- Lunch amount
+ Cash Position by User
report.lunch.amount
form
tree,form
diff --git a/addons/lunch/security/ir.model.access.csv b/addons/lunch/security/ir.model.access.csv
index e27fba4530f..b936b26a55e 100644
--- a/addons/lunch/security/ir.model.access.csv
+++ b/addons/lunch/security/ir.model.access.csv
@@ -2,14 +2,13 @@
"access_lunch_category","lunch.category","model_lunch_category","base.group_user",1,1,1,1
"access_lunch_product","lunch.product","model_lunch_product","base.group_user",1,1,1,1
"access_lunch_cashbox","lunch.cashbox","model_lunch_cashbox","base.group_user",1,1,1,1
-"access_lunch_cashmove","lunch.cashmove","model_lunch_cashmove","base.group_user",1,1,1,1
"access_lunch_order","lunch.order","model_lunch_order","base.group_user",1,1,1,1
"access_report_lunch_amount","report.lunch.amount","model_report_lunch_amount","base.group_user",1,1,1,1
"access_lunch_order_sale_salesman","lunch.order.sale","model_lunch_order","base.group_sale_salesman",1,1,1,1
"access_lunch_order_user","lunch.order user","model_lunch_order","base.group_tool_user",1,1,1,1
-"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,0,0,0
+"access_lunch_order_manager","lunch.order manager","model_lunch_order","base.group_tool_manager",1,1,1,1
"access_lunch_cashmove_user","lunch.cashmove user","model_lunch_cashmove","base.group_tool_user",1,1,1,1
-"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,0,0,0
+"access_lunch_cashmove_manager","lunch.cashmove manager","model_lunch_cashmove","base.group_tool_manager",1,1,1,1
"access_report_lunch_amount_manager","report.lunch.amount manager","model_report_lunch_amount","base.group_tool_manager",1,1,1,1
"access_lunch_category_system","lunch.category system","model_lunch_category","base.group_system",1,1,1,1
"access_lunch_product_system","lunch.product system","model_lunch_product","base.group_system",1,1,1,1
diff --git a/addons/lunch/wizard/lunch_order_cancel_view.xml b/addons/lunch/wizard/lunch_order_cancel_view.xml
index 39fa1f87d62..d47cc6d8ee9 100644
--- a/addons/lunch/wizard/lunch_order_cancel_view.xml
+++ b/addons/lunch/wizard/lunch_order_cancel_view.xml
@@ -34,7 +34,7 @@
+ view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
diff --git a/addons/lunch/wizard/lunch_order_confirm_view.xml b/addons/lunch/wizard/lunch_order_confirm_view.xml
index aa59acae628..dabcd7d5e84 100644
--- a/addons/lunch/wizard/lunch_order_confirm_view.xml
+++ b/addons/lunch/wizard/lunch_order_confirm_view.xml
@@ -36,7 +36,7 @@
+ view_mode="form" target="new" view_type="form" groups="base.group_tool_manager"/>
diff --git a/addons/membership/i18n/tr.po b/addons/membership/i18n/tr.po
index 62d29d56173..526f9c7a632 100644
--- a/addons/membership/i18n/tr.po
+++ b/addons/membership/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:55+0000\n"
+"PO-Revision-Date: 2010-09-04 08:53+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: membership
diff --git a/addons/membership/report/report_membership.py b/addons/membership/report/report_membership.py
index fc14b65f698..1bfdce82404 100644
--- a/addons/membership/report/report_membership.py
+++ b/addons/membership/report/report_membership.py
@@ -38,7 +38,7 @@ class report_membership(osv.osv):
('07', 'July'), ('08', 'August'),\
('09', 'September'), ('10', 'October'),\
('11', 'November'), ('12', 'December')], 'Month', readonly=True),
- 'create_date': fields.datetime('Create Date', readonly=True),
+ 'date': fields.datetime('Create Date', readonly=True),
'canceled_number': fields.integer('Canceled', readonly=True),
'waiting_number': fields.integer('Waiting', readonly=True),
'invoiced_number': fields.integer('Invoiced', readonly=True),
@@ -78,7 +78,7 @@ class report_membership(osv.osv):
SUM(awaiting) as waiting_amount,
year,
month,
- create_date,
+ date,
partner_id,
membership_id,
state,
@@ -104,7 +104,7 @@ class report_membership(osv.osv):
ELSE 0 END AS awaiting,
TO_CHAR(ml.date_from, 'YYYY') AS year,
TO_CHAR(ml.date_from, 'MM')as month,
- TO_CHAR(ml.date_from, 'YYYY-MM-DD') as create_date,
+ TO_CHAR(ml.date_from, 'YYYY-MM-DD') as date,
ai.partner_id AS partner_id,
ai.currency_id AS currency,
ai.state as state,
@@ -119,7 +119,7 @@ class report_membership(osv.osv):
ON (ml.partner = p.id)
GROUP BY TO_CHAR(ml.date_from, 'YYYY'), TO_CHAR(ml.date_from, 'MM'), TO_CHAR(ml.date_from, 'YYYY-MM-DD'), ai.state, ai.partner_id,
ai.currency_id, ml.id, ml.membership_id) AS foo
- GROUP BY year, month, create_date, currency, partner_id, membership_id, state)
+ GROUP BY year, month, date, currency, partner_id, membership_id, state)
""")
report_membership()
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_view.xml
index bdb5065b766..90330a92a55 100644
--- a/addons/membership/report/report_membership_view.xml
+++ b/addons/membership/report/report_membership_view.xml
@@ -31,9 +31,9 @@
+ domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=365)).strftime('%%Y-%%m-%%d'))]"/>
+ domain="[('date','<=', time.strftime('%%Y-%%m-%%d')), ('date','>',(datetime.date.today()-datetime.timedelta(days=30)).strftime('%%Y-%%m-%%d'))]"/>
\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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/i18n/tr.po b/addons/mrp/i18n/tr.po
index d2cfd6253d3..3de1c0c98d1 100644
--- a/addons/mrp/i18n/tr.po
+++ b/addons/mrp/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:58+0000\n"
+"PO-Revision-Date: 2010-09-04 08:46+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/i18n/zh_TW.po b/addons/mrp/i18n/zh_TW.po
index 0b7fa6e1a2e..c03db62c6df 100644
--- a/addons/mrp/i18n/zh_TW.po
+++ b/addons/mrp/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:21+0000\n"
+"PO-Revision-Date: 2010-09-04 08:48+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 058cc99a7b6..5d47c8acf0c 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -901,7 +901,8 @@
view_type="tree"
view_id="mrp_bom_tree_view"
res_model="mrp.bom"
- src_model="product.product"/>
+ src_model="product.product"
+ groups="base.group_extended"/>
move_lines[1].product_id.id
- move_lines[0].product_id.id in (ref('product_product_beers0'), ref('product_product_beerspack0'))
diff --git a/addons/mrp_jit/i18n/ta.po b/addons/mrp_jit/i18n/ta.po
index 3fa16b09a48..de6bdb94be6 100644
--- a/addons/mrp_jit/i18n/ta.po
+++ b/addons/mrp_jit/i18n/ta.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 17:26+0000\n"
+"PO-Revision-Date: 2010-09-01 06:55+0000\n"
"Last-Translator: ஆமாச்சு \n"
"Language-Team: Tamil \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:55+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_jit
diff --git a/addons/mrp_jit/test/mrp_jit.yml b/addons/mrp_jit/test/mrp_jit.yml
index edafb8ca5a5..9d811d8b3e6 100644
--- a/addons/mrp_jit/test/mrp_jit.yml
+++ b/addons/mrp_jit/test/mrp_jit.yml
@@ -2,34 +2,23 @@
In order to test mrp_jit module with OpenERP, I will create manufacturing order
and check whether the procurement orders run without scheduler or not.
-
- !record {model: mrp.production, id: mrp_production_mo0}:
- bom_id: mrp.mrp_bom_1
+ !record {model: procurement.order, id: mrp_production_mo0}:
company_id: base.main_company
date_planned: '2010-08-05 17:59:49'
- location_dest_id: stock.stock_location_stock
- location_src_id: stock.stock_location_stock
- name: MO/00017
+ location_id: stock.stock_location_stock
+ name: PROC/TEST/0001
product_id: product.product_product_pc2
product_qty: 10.0
product_uom: product.product_uom_unit
product_uos_qty: 0.0
- routing_id: mrp.mrp_routing_0
-
|
- I confirm production order.
+ I confirm the procurement order PROC/TEST/0001.
-
- !workflow {model: mrp.production, action: button_confirm, ref: mrp_production_mo0}
+ !workflow {model: procurement.order, action: button_confirm, ref: mrp_production_mo0}
-
|
- I check the procurement orders generated from the production order.
+ I check that the procurement is scheduled automatically.
-
- |
- It runs without using schedulers.
--
- !python {model: procurement.order}: |
- prod_obj = self.pool.get('mrp.production')
- production = prod_obj.browse(cr, uid, ref('mrp_production_mo0'))
- products = map(lambda x:x.product_id.id, production.move_lines)
- procurement_ids = self.search(cr, uid, [('product_id','in',products)])
- procurements = self.browse(cr, uid, procurement_ids)
- assert all(proc.state != 'confirmed' for proc in procurements), 'Procurement not scheduled!'
+ !assert {model: procurement.order, id: mrp_production_mo0, string: procstate}:
+ - state<>'confirmed'
diff --git a/addons/mrp_operations/i18n/tr.po b/addons/mrp_operations/i18n/tr.po
index 9baa9d1e251..08b8fa14116 100644
--- a/addons/mrp_operations/i18n/tr.po
+++ b/addons/mrp_operations/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:11+0000\n"
+"PO-Revision-Date: 2010-09-04 08:47+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_operations
diff --git a/addons/mrp_operations/test/mrp_operations.yml b/addons/mrp_operations/test/mrp_operations.yml
index f5777d4cc95..299269cbb44 100644
--- a/addons/mrp_operations/test/mrp_operations.yml
+++ b/addons/mrp_operations/test/mrp_operations.yml
@@ -33,13 +33,6 @@
from tools.translate import _
order_id = self.search(cr, uid, [('production_id','=', ref('mrp_production_mo0')),('state','=','draft')])
assert order_id, _('No Work order!')
--
- I am checking Procurement orders.
--
- !python {model: procurement.order}: |
- from tools.translate import _
- proc_ids = self.search(cr, uid, [('state','=','confirmed')])
- assert proc_ids, _('No Procurements!')
-
The scheduler runs.
-
diff --git a/addons/mrp_repair/i18n/tr.po b/addons/mrp_repair/i18n/tr.po
index 62aca80bd20..c56701b7b74 100644
--- a/addons/mrp_repair/i18n/tr.po
+++ b/addons/mrp_repair/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:07+0000\n"
+"PO-Revision-Date: 2010-09-04 08:58+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_repair
diff --git a/addons/mrp_repair/test/test_mrp_repair.yml b/addons/mrp_repair/test/test_mrp_repair.yml
index 961ebdf2496..7d38ab8a94d 100644
--- a/addons/mrp_repair/test/test_mrp_repair.yml
+++ b/addons/mrp_repair/test/test_mrp_repair.yml
@@ -89,11 +89,4 @@
invoice_ids = inv_obj.search(cr, uid, [('partner_id', '=', repair_id.partner_invoice_id.id)])
invoice_id = inv_obj.browse(cr, uid, invoice_ids)[0]
- assert repair_id.partner_invoice_id == invoice_id.partner_id
-
- for operation in repair_id.operations:
- if operation.to_invoice == True:
- line_ids = obj_lines.search(cr, uid, [('product_id', '=', operation.product_id.id), ('invoice_id', '=', invoice_id.id), ('price_unit', '=', operation.price_unit)])
- if line_ids:
- line_id = obj_lines.browse(cr, uid, line_ids)[0]
- assert line_id.product_id == operation.product_id
+ assert repair_id.partner_invoice_id.id == invoice_id.partner_id.id, "No invoice existing for the same partner"
diff --git a/addons/mrp_subproduct/i18n/tr.po b/addons/mrp_subproduct/i18n/tr.po
index 423d0450f2e..f73e254260a 100644
--- a/addons/mrp_subproduct/i18n/tr.po
+++ b/addons/mrp_subproduct/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:54+0000\n"
+"PO-Revision-Date: 2010-09-04 08:56+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: mrp_subproduct
diff --git a/addons/point_of_sale/i18n/lt.po b/addons/point_of_sale/i18n/lt.po
index ad9fbfd9f12..f48f0c80453 100644
--- a/addons/point_of_sale/i18n/lt.po
+++ b/addons/point_of_sale/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:27+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
diff --git a/addons/point_of_sale/i18n/tr.po b/addons/point_of_sale/i18n/tr.po
index fd885e05764..9043f65b81c 100644
--- a/addons/point_of_sale/i18n/tr.po
+++ b/addons/point_of_sale/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:11+0000\n"
+"PO-Revision-Date: 2010-09-04 08:49+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: point_of_sale
diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py
index 23b2339d9e9..623163b6460 100644
--- a/addons/point_of_sale/pos.py
+++ b/addons/point_of_sale/pos.py
@@ -1271,46 +1271,6 @@ class pos_payment(osv.osv):
pos_payment()
-class account_move_line(osv.osv):
-
- _inherit = 'account.move.line'
- def create(self, cr, user, vals, context=None):
- pos_obj = self.pool.get('pos.order')
- val_name = vals.get('name', '')
- val_ref = vals.get('ref', '')
- if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
- aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
- name_pos = aaa.groups()[0]
- pos_id = name_pos.replace('POS ','')
- if pos_id and pos_id.isdigit():
- pos_curr = pos_obj.browse(cr,user,int(pos_id))
- pos_curr = pos_curr and pos_curr.contract_number or ''
- vals['ref'] = pos_curr or vals.get('ref')
- return super(account_move_line, self).create(cr, user, vals, context)
-
-account_move_line()
-
-
-class account_move(osv.osv):
-
- _inherit = 'account.move'
- def create(self, cr, user, vals, context=None):
- pos_obj = self.pool.get('pos.order')
- val_name = vals.get('name', '')
- val_ref = vals.get('ref', '')
- if (val_name and 'POS' in val_name) and (val_ref and 'PACK' in val_ref):
- aaa = re.search(r'Stock move.\((.*)\)', vals.get('name'))
- name_pos = aaa.groups()[0]
- pos_id = name_pos.replace('POS ','')
- if pos_id and pos_id.isdigit():
- pos_curr = pos_obj.browse(cr,user,int(pos_id))
- pos_curr = pos_curr and pos_curr.contract_number or ''
- vals['ref'] = pos_curr or vals.get('ref')
- return super(account_move, self).create(cr, user, vals, context)
-
-account_move()
-
-
class product_product(osv.osv):
_inherit = 'product.product'
_columns = {
diff --git a/addons/process/i18n/tr.po b/addons/process/i18n/tr.po
index caef649ee29..a1c5c7c88e4 100644
--- a/addons/process/i18n/tr.po
+++ b/addons/process/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:13+0000\n"
+"PO-Revision-Date: 2010-09-04 09:01+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:58+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:46+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: process
diff --git a/addons/procurement/procurement.py b/addons/procurement/procurement.py
index 298d9b05449..2b3eeb9b64c 100644
--- a/addons/procurement/procurement.py
+++ b/addons/procurement/procurement.py
@@ -228,13 +228,6 @@ class procurement_order(osv.osv):
return False
def check_produce_service(self, cr, uid, procurement, context=[]):
- """ Checks project_mrp install or not.
- @return: True or False"""
- obj_module = self.pool.get('ir.module.module')
- module_id = obj_module.search(cr, uid, [('name', '=', 'project_mrp'),('state', '=', 'installed')])
- if module_id:
- return True
- cr.execute('update procurement_order set message=%s where id=%s', (_('Project_mrp module not installed !'), procurement.id))
return False
def check_produce_product(self, cr, uid, procurement, context=[]):
diff --git a/addons/procurement/procurement_workflow.xml b/addons/procurement/procurement_workflow.xml
index d28b1a035f8..ff4325e248f 100644
--- a/addons/procurement/procurement_workflow.xml
+++ b/addons/procurement/procurement_workflow.xml
@@ -138,6 +138,11 @@
button_cancel
+
+
+
+ check_buy()
+
diff --git a/addons/procurement/schedulers.py b/addons/procurement/schedulers.py
index 7007b13d06d..777a8de45cc 100644
--- a/addons/procurement/schedulers.py
+++ b/addons/procurement/schedulers.py
@@ -64,6 +64,7 @@ class procurement_order(osv.osv):
report_total = 0
report_except = 0
report_later = 0
+ allids = self.search(cr, uid, [])
while True:
cr.execute('select id from procurement_order where state=%s and procure_method=%s order by priority,date_planned limit 500 offset %s', ('confirmed', 'make_to_order', offset))
ids = map(lambda x: x[0], cr.fetchall())
diff --git a/addons/product/i18n/fr.po b/addons/product/i18n/fr.po
index cb5a0dc0843..fe53f2550e3 100644
--- a/addons/product/i18n/fr.po
+++ b/addons/product/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 08:58+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-02 07:23+0000\n"
+"Last-Translator: Quentin THEURET \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: 2010-08-12 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
@@ -57,7 +57,7 @@ msgstr "Coeff UdM -> UdV"
#. module: product
#: view:product.pricelist.item:0
msgid "Max. Margin"
-msgstr "Marge maximum"
+msgstr "Marge maxi."
#. module: product
#: view:product.pricelist.item:0
@@ -84,8 +84,8 @@ msgid ""
"Determine if the product is visible in the list of products within a "
"selection from a purchase order line."
msgstr ""
-"Détermine si le produit est visible dans la liste des produits à l'intérieur "
-"d'une sélection dans une ligne d'ordre de commande."
+"Détermine si le produit est visible dans la liste lors du choix du produit "
+"sur une ligne de commande d'achat"
#. module: product
#: help:product.supplierinfo,name:0
@@ -95,12 +95,12 @@ msgstr "Fournisseur de ce produit"
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
msgid "DDR 512MB PC400"
-msgstr "DDR 512MB PC400"
+msgstr "DDR 512Mo PC400"
#. module: product
#: model:product.template,name:product.product_product_0_product_template
msgid "Onsite Senior Intervention"
-msgstr "Intervention senior sur site"
+msgstr "Intervention sénior sur site"
#. module: product
#: help:product.supplierinfo,qty:0
@@ -1012,6 +1012,10 @@ msgid ""
"management. For example, in food industries, you will manage a stock of ham "
"but invoice in Kg. Keep empty to use the default UOM."
msgstr ""
+"Utilisée par les entreprises qui gèrent deux unités de mesure : gestion de "
+"la facturation et des inventaires. Par exemple, dans l'industrie "
+"alimentaire, vous pouvez gérer un stock de jambon (unité) mais les facturer "
+"au Kg. Laisser vide pour utiliser l'UdM par défaut."
#. module: product
#: view:product.product:0
@@ -1455,6 +1459,9 @@ msgid ""
"products with infinite stock, or for use when you have no inventory "
"management in the system."
msgstr ""
+"Permet de changer la façon dont les approvisionnements sont effectués. Les "
+"consommables sont des produits stockables avec un stock infini, ou à "
+"utiliser quand vous n'avez pas de gestion d'inventaire dans le système."
#. module: product
#: model:process.node,note:product.process_node_supplier0
diff --git a/addons/product/i18n/lt.po b/addons/product/i18n/lt.po
index fd9b5a0b228..687febfb392 100644
--- a/addons/product/i18n/lt.po
+++ b/addons/product/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:11+0000\n"
+"PO-Revision-Date: 2010-09-04 08:48+0000\n"
"Last-Translator: Giedrius Slavinskas \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"Language: lt\n"
diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po
index 16befd5ba8e..15593a25795 100644
--- a/addons/product/i18n/mn.po
+++ b/addons/product/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 09:01+0000\n"
"Last-Translator: ub121 \n"
"Language-Team: Mongolian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/pt_BR.po b/addons/product/i18n/pt_BR.po
index c61e3752691..5dd69944e05 100644
--- a/addons/product/i18n/pt_BR.po
+++ b/addons/product/i18n/pt_BR.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 08:59+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/sr.po b/addons/product/i18n/sr.po
index a032a8bfa61..9240bcb4e96 100644
--- a/addons/product/i18n/sr.po
+++ b/addons/product/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:57+0000\n"
+"PO-Revision-Date: 2010-09-04 08:46+0000\n"
"Last-Translator: Sonja Sardelić \n"
"Language-Team: Serbian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/tr.po b/addons/product/i18n/tr.po
index 04275793257..3fa01a2c986 100644
--- a/addons/product/i18n/tr.po
+++ b/addons/product/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:13+0000\n"
+"PO-Revision-Date: 2010-09-04 09:00+0000\n"
"Last-Translator: Angel Spy \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/i18n/zh_CN.po b/addons/product/i18n/zh_CN.po
index 4464631c513..dd67721d0be 100644
--- a/addons/product/i18n/zh_CN.po
+++ b/addons/product/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:29+0000\n"
+"PO-Revision-Date: 2010-09-04 09:01+0000\n"
"Last-Translator: Black Jack \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product
diff --git a/addons/product/product.py b/addons/product/product.py
index 499e1c0e437..57f8316f939 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -720,32 +720,5 @@ class pricelist_partnerinfo(osv.osv):
}
_order = 'min_quantity asc'
pricelist_partnerinfo()
-
-class res_users(osv.osv):
- _name = 'res.users'
- _inherit = 'res.users'
-
- def create(self, cr, uid, data, context=None):
- if context is None:
- context = {}
- user_id = super(res_users, self).create(cr, uid, data, context)
- data_obj = self.pool.get('ir.model.data')
- try:
- data_id = data_obj._get_id(cr, uid, 'product', 'ir_ui_view_sc_product0')
- view_id = data_obj.browse(cr, uid, data_id, context=context).res_id
- copy_id = self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
- 'user_id': user_id}, context=context)
- except ValueError:
- # During a single install of multiple modules, the product_view.xml may
- # be loaded after this python code is present in the server and called
- # by other module's res_users.create() calls. So, we have to survive
- # this and create the user.
- # One more case is if some admin has deliberately removed this shortcut,
- # users must still be able to create.
- logging.getLogger('orm').warning('Skipped Products shortcut for user "%s"', data.get('name','form
-
-
- Products
- ir.ui.menu
-
-
-
-
diff --git a/addons/product_margin/i18n/pt_BR.po b/addons/product_margin/i18n/pt_BR.po
index 61a5eb6ea21..421be662930 100644
--- a/addons/product_margin/i18n/pt_BR.po
+++ b/addons/product_margin/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:59+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
diff --git a/addons/product_margin/i18n/tr.po b/addons/product_margin/i18n/tr.po
index 1f371445f29..86455840f1c 100644
--- a/addons/product_margin/i18n/tr.po
+++ b/addons/product_margin/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:58+0000\n"
+"PO-Revision-Date: 2010-09-04 08:47+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: product_margin
diff --git a/addons/profile_tools/installer.py b/addons/profile_tools/installer.py
index 1a793352b6e..563c81f6237 100644
--- a/addons/profile_tools/installer.py
+++ b/addons/profile_tools/installer.py
@@ -28,6 +28,7 @@ class misc_tools_installer(osv.osv_memory):
'lunch':fields.boolean('Lunch Orders',help='Installs tools for lunch module'),
'subscription':fields.boolean('Recurring Documents',help='Installs tools for subscription module'),
'survey':fields.boolean('Survey',help='Installs tools for survey module'),
+ 'idea':fields.boolean('Idea',help='Installs tools for idea module'),
'audittrail':fields.boolean('Audit Trail',help='Installs tools for audittrail module'),
}
_defaults = {
diff --git a/addons/profile_tools/misc_tools_installer.xml b/addons/profile_tools/misc_tools_installer.xml
index 9499518ee25..b485b712892 100644
--- a/addons/profile_tools/misc_tools_installer.xml
+++ b/addons/profile_tools/misc_tools_installer.xml
@@ -28,6 +28,7 @@
+
diff --git a/addons/project/i18n/fr.po b/addons/project/i18n/fr.po
index 21e0b999cfe..6c10f457c6c 100644
--- a/addons/project/i18n/fr.po
+++ b/addons/project/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 09:15+0000\n"
-"Last-Translator: mga (Open ERP) \n"
+"PO-Revision-Date: 2010-09-02 07:22+0000\n"
+"Last-Translator: Quentin THEURET \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: 2010-08-12 03:40+0000\n"
+"X-Launchpad-Export-Date: 2010-09-03 03:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
@@ -49,7 +49,7 @@ msgstr "Tâche projet"
#. module: project
#: model:process.transition,name:project.process_transition_opendonetask0
msgid "Open Done Task"
-msgstr "Ouvrir les tâches ouvertes"
+msgstr "Rouvrir les tâches terminées"
#. module: project
#: constraint:ir.actions.act_window:0
@@ -64,7 +64,7 @@ msgstr "Heures à Validé"
#. module: project
#: field:project.project,progress_rate:0
msgid "Progress"
-msgstr "Achevé"
+msgstr "Avancement"
#. module: project
#: help:config.compute.remaining,remaining_hours:0
@@ -79,7 +79,7 @@ msgstr ""
#. module: project
#: field:project.project,child_id:0
msgid "Subproject"
-msgstr "Sous projet"
+msgstr "Sous-projet"
#. module: project
#: field:project.project,members:0
@@ -114,7 +114,7 @@ msgstr ""
#. module: project
#: field:project.task,priority:0
msgid "Importance"
-msgstr "Important"
+msgstr "Priorité"
#. module: project
#: view:config.compute.remaining:0
@@ -276,7 +276,7 @@ msgstr "Tâche terminée"
#. module: project
#: model:process.node,note:project.process_node_donetask0
msgid "Task is Completed"
-msgstr "La tâche est complète"
+msgstr "La tâche est terminée"
#. module: project
#: model:process.transition,note:project.process_transition_delegate0
@@ -787,7 +787,7 @@ msgstr "Mois"
#. module: project
#: model:process.transition,note:project.process_transition_opendonetask0
msgid "When task is completed, it will come into the done state."
-msgstr "Quand une tâche est complète, elle deviendra dans l'état terminer"
+msgstr "Quand une tâche est complète, elle passera à l'état terminé"
#. module: project
#: field:project.task.work,date:0
@@ -1004,7 +1004,7 @@ msgstr "Fermer (sans mail)"
#. module: project
#: help:project.task.delegate,init,prefix:0
msgid "New title of your own task to validate the work done."
-msgstr "Nouveau titre de votre tâche pour valider le travail terminer."
+msgstr "Nouveau titre de votre tâche pour valider le travail effectué."
#. module: project
#: field:project.task,progress:0
@@ -1166,7 +1166,7 @@ msgstr "Date d'arrêt: %(date_stop)s"
#. module: project
#: field:project.project,date_end:0
msgid "Expected End"
-msgstr "Fin attendu"
+msgstr "Fin prévue"
#. module: project
#: model:process.node,note:project.process_node_taskbydelegate0
@@ -1216,7 +1216,7 @@ msgstr "Tableau de bord de projet"
#. module: project
#: model:ir.module.module,shortdesc:project.module_meta_information
msgid "Board for project users"
-msgstr ""
+msgstr "Tableau de bord pour les utilisateurs de projet"
#. module: project
#: model:ir.actions.act_window,name:project.action_project_pipeline_user
@@ -1279,7 +1279,7 @@ msgstr "Mon pipeline"
#. module: project
#: view:board.board:0
msgid "My Timesheet"
-msgstr ""
+msgstr "Ma feuille de présence"
#. module: project
#: model:ir.actions.act_window,name:project.action_project_task_tree_month
@@ -1428,7 +1428,7 @@ msgstr ""
#. module: project
#: field:report.task.user.pipeline.open,task_nbr:0
msgid "Task Number"
-msgstr ""
+msgstr "Numéro de tâche"
#. module: project
#: model:ir.model,name:project.model_report_timesheet_task_user
@@ -1448,7 +1448,7 @@ msgstr ""
#. module: project
#: model:ir.model,name:project.model_report_closed_task
msgid "Closed Task Report"
-msgstr ""
+msgstr "Rapport des tâches terminées"
#. module: project
#: field:report.timesheet.task.user,timesheet_hrs:0
@@ -1458,4 +1458,4 @@ msgstr ""
#. module: project
#: view:report.closed.task:0
msgid "Closed Tasks"
-msgstr ""
+msgstr "Tâches terminées"
diff --git a/addons/project/i18n/lt.po b/addons/project/i18n/lt.po
index c7e6d5dfaea..86084b1863b 100644
--- a/addons/project/i18n/lt.po
+++ b/addons/project/i18n/lt.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev0\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:58+0000\n"
+"PO-Revision-Date: 2010-09-04 08:48+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:56+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:44+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/pt_BR.po b/addons/project/i18n/pt_BR.po
index 80ea3bedb39..a6196b26e5a 100644
--- a/addons/project/i18n/pt_BR.po
+++ b/addons/project/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 16:02+0000\n"
-"Last-Translator: Roberto Higashi \n"
+"PO-Revision-Date: 2010-09-01 06:55+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:51+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/ru.po b/addons/project/i18n/ru.po
index 0a420687a58..f7c5595ae17 100644
--- a/addons/project/i18n/ru.po
+++ b/addons/project/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 08:59+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/i18n/tr.po b/addons/project/i18n/tr.po
index 68243d1a501..1fe4ca3e3b0 100644
--- a/addons/project/i18n/tr.po
+++ b/addons/project/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 08:59+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project
diff --git a/addons/project/project_installer.xml b/addons/project/project_installer.xml
index 947171d4c0a..56064158683 100644
--- a/addons/project/project_installer.xml
+++ b/addons/project/project_installer.xml
@@ -26,13 +26,13 @@
-
+
-
+
diff --git a/addons/project/report/project_report.py b/addons/project/report/project_report.py
index f0cfb181f4a..b9c22faee8b 100644
--- a/addons/project/report/project_report.py
+++ b/addons/project/report/project_report.py
@@ -33,7 +33,6 @@ class report_project_task_user(osv.osv):
'user_id': fields.many2one('res.users', 'Assigned To', readonly=True),
'date_start': fields.date('Starting Date',readonly=True),
'no_of_days': fields.integer('# of Days', size=128, readonly=True),
- 'description': fields.text('Description', readonly=True),
'date_end': fields.date('Ending Date', readonly=True),
'date_deadline': fields.date('Deadline', readonly=True),
'project_id': fields.many2one('project.project', 'Project', readonly=True),
diff --git a/addons/project/test/test_project.yml b/addons/project/test/test_project.yml
index bbdaa57d617..d57cc274366 100644
--- a/addons/project/test/test_project.yml
+++ b/addons/project/test/test_project.yml
@@ -51,7 +51,6 @@
new_prj = self.read(cr, uid, [new_id], ['name', 'state'])[0]
state = new_prj['state']
name = new_prj['name']
- print "Project '%s' created"%name
assert state == 'open', "Project in %s state. Project created from template project must be in open state"%state
-
Reset project template to normal project
diff --git a/addons/project_gtd/i18n/tr.po b/addons/project_gtd/i18n/tr.po
index 88ea050f54c..73ab2820ca3 100644
--- a/addons/project_gtd/i18n/tr.po
+++ b/addons/project_gtd/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:02+0000\n"
+"PO-Revision-Date: 2010-09-04 08:46+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_gtd
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index d0bf5e29336..bf8085ba932 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -35,7 +35,7 @@ class project_issue_report(osv.osv):
_name = "project.issue.report"
_auto = False
- def _get_data(self, cr, uid, ids, field_name, arg, context=None):
+ def _get_data(self, cr, uid, ids, field_names, arg, context=None):
if context is None:
context = {}
""" @param cr: the current row, from the database cursor,
@@ -46,40 +46,24 @@ class project_issue_report(osv.osv):
res = {}
avg_ans = 0.0
- for case in self.browse(cr, uid, ids, context):
- if field_name != 'avg_answers':
- state = field_name[5:]
- cr.execute("select count(*) from crm_opportunity where \
- section_id =%s and state='%s'"%(case.section_id.id, state))
- state_cases = cr.fetchone()[0]
- perc_state = (state_cases / float(case.nbr)) * 100
-
- res[case.id] = perc_state
- else:
- model_name = self._name.split('report.')
- if len(model_name) < 2:
- res[case.id] = 0.0
- else:
- model_name = model_name[1]
-
- cr.execute("select count(*) from crm_case_log l, ir_model m \
- where l.model_id=m.id and m.model = '%s'" , model_name)
- logs = cr.fetchone()[0]
-
- avg_ans = logs / case.nbr
- res[case.id] = avg_ans
+ for report in self.browse(cr, uid, ids, context):
+ res[report.id]= {
+ 'avg_answers': 0.0,
+ 'perc_done' : 0.0,
+ 'perc_cancel': 0.0
+ }
+ #TODO: Calculate
return res
_columns = {
'name': fields.char('Year', size=64, required=False, readonly=True),
'user_id':fields.many2one('res.users', 'Responsible', readonly=True),
- 'user_id2':fields.many2one('res.users', 'Assignee', readonly=True),
'section_id':fields.many2one('crm.case.section', 'Section', readonly=True),
'state': fields.selection(AVAILABLE_STATES, 'State', size=16, readonly=True),
- 'avg_answers': fields.function(_get_data, string='Avg. Answers', method=True, type="integer"),
- 'perc_done': fields.function(_get_data, string='%Done', method=True, type="float"),
- 'perc_cancel': fields.function(_get_data, string='%Cancel', method=True, type="float"),
+ 'avg_answers': fields.function(_get_data, group_operator='avg', string='Avg. Answers', multi='avg_answers', method=True, type="integer"),
+ 'perc_done': fields.function(_get_data, group_operator='avg', string='%Done', multi='perc_done', method=True, type="float"),
+ 'perc_cancel': fields.function(_get_data, group_operator='avg', string='%Cancel', multi='perc_cancel', method=True, type="float"),
'month':fields.selection([('01', 'January'), ('02', 'February'), \
('03', 'March'), ('04', 'April'),\
('05', 'May'), ('06', 'June'), \
@@ -104,7 +88,6 @@ class project_issue_report(osv.osv):
'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority'),
'project_id':fields.many2one('project.project', 'Project',readonly=True),
'type_id': fields.many2one('crm.case.resource.type', 'Version', domain="[('object_id.model', '=', 'project.issue')]"),
- 'user_id2losed': fields.date('Close Date', readonly=True),
'assigned_to' : fields.many2one('res.users', 'Assigned to',readonly=True),
'partner_id': fields.many2one('res.partner','Partner',domain="[('object_id.model', '=', 'project.issue')]"),
'canal_id': fields.many2one('res.partner.canal', 'Channel',readonly=True),
diff --git a/addons/project_mrp/__init__.py b/addons/project_mrp/__init__.py
index c2ef40bbb1e..364dec5a437 100644
--- a/addons/project_mrp/__init__.py
+++ b/addons/project_mrp/__init__.py
@@ -18,6 +18,6 @@
# along with this program. If not, see .
#
##############################################################################
+
import project_procurement
import project_mrp
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/i18n/tr.po b/addons/project_mrp/i18n/tr.po
index e537753bada..8d6a9256490 100644
--- a/addons/project_mrp/i18n/tr.po
+++ b/addons/project_mrp/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:48+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_mrp
diff --git a/addons/project_mrp/project_mrp.py b/addons/project_mrp/project_mrp.py
index d5a76812a2d..4e99ee0b281 100644
--- a/addons/project_mrp/project_mrp.py
+++ b/addons/project_mrp/project_mrp.py
@@ -48,12 +48,13 @@ class project_task(osv.osv):
return True
project_task()
+
class product_product(osv.osv):
_inherit = "product.product"
_columns = {
'project_id': fields.many2one('project.project', 'Project', ondelete='set null',)
}
-product_product()
+product_product()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_mrp/project_procurement.py b/addons/project_mrp/project_procurement.py
index 251a4600081..393961a005d 100644
--- a/addons/project_mrp/project_procurement.py
+++ b/addons/project_mrp/project_procurement.py
@@ -29,83 +29,32 @@ class procurement_order(osv.osv):
_columns = {
'task_id': fields.many2one('project.task', 'Task')
}
+ def check_produce_service(self, cr, uid, procurement, context=[]):
+ return True
def action_produce_assign_service(self, cr, uid, ids, context=None):
if context is None:
context = {}
for procurement in self.browse(cr, uid, ids):
- sline = self.pool.get('sale.order.line')
- product_obj=self.pool.get('product.product')
- content = ''
- sale_order = self.pool.get('sale.order')
- so_ref = procurement.name.split(':')[0]
- order_ids = sale_order.search(cr, uid, [('name', '=', so_ref)], context)
-
- if order_ids:
- sale_ids = sale_order.read(cr, uid, order_ids[0], ['order_line'], context=context)['order_line']
- else:
- so_ref = procurement.origin.split(':')[0]
- sale_ids = sline.search(cr, uid, [('procurement_id', '=',procurement.id)], context)
- l = None
- project_id = None
- analytic_account_id = False
- partner_id = False
-
- for line in sline.browse(cr, uid, sale_ids, context=context):
- content += (line.notes or '')
- l = line
- partner_id = line.order_id.partner_id.id
- if line.order_id.project_id:
- analytic_account_id = line.order_id.project_id.id
- partner_id = line.order_id.partner_id.id
- content+="\n\n"+line.order_id.project_id.complete_name
- break
-
- # Creating a project for task.Project is created from Procurement.
- project_obj = self.pool.get('project.project')
- proj_name = tools.ustr(so_ref)
- product_project = procurement.product_id.project_id or False
- proj_exist_id = project_obj.search(cr, uid, [('name', '=', proj_name)], context=context)
- if not proj_exist_id:
- parent_project = False
- if product_project:
- parent_project = product_project.analytic_account_id.id
- project_id = project_obj.create(cr, uid, {'name': proj_name, 'partner_id': partner_id, 'parent_id': parent_project})
- else:
- project_id = proj_exist_id[0]
-
self.write(cr, uid, [procurement.id], {'state': 'running'})
-
- name_task = ('','')
- planned_hours=0.0
- if procurement.product_id.type == 'service':
- proc_name = procurement.name
- if procurement.origin == proc_name:
- proc_name = procurement.product_id.name
-
- name_task = (procurement.origin, proc_name or '')
- else:
- name_task = (procurement.product_id.name or procurement.origin, procurement.name or '')
- planned_hours= procurement.product_id.sale_delay + procurement.product_id. produce_delay
+ planned_hours = procurement.product_qty
task_id = self.pool.get('project.task').create(cr, uid, {
- 'name': '%s:%s' % name_task,
+ 'name': '%s:%s' % (procurement.origin or '', procurement.name),
'date_deadline': procurement.date_planned,
'planned_hours':planned_hours,
'remaining_hours': planned_hours,
'user_id': procurement.product_id.product_manager.id,
- 'notes': "b"+(l and l.order_id.note or ''),
+ 'notes': procurement.note,
'procurement_id': procurement.id,
- 'description': content,
+ 'description': procurement.note,
'date_deadline': procurement.date_planned,
+ 'project_id': procurement.product_id.project_id and procurement.product_id.project_id.id or False,
'state': 'draft',
- 'partner_id': l and l.order_id.partner_id.id or False,
'company_id': procurement.company_id.id,
- 'project_id': project_id,
},context=context)
self.write(cr, uid, [procurement.id],{'task_id':task_id})
- product_obj.write(cr,uid,[procurement.product_id.id],{'project_id':project_id})
return task_id
procurement_order()
-# 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/project_mrp/test/project_task_procurement.yml b/addons/project_mrp/test/project_task_procurement.yml
index 50bc74f82ae..a997f09fd04 100644
--- a/addons/project_mrp/test/project_task_procurement.yml
+++ b/addons/project_mrp/test/project_task_procurement.yml
@@ -35,7 +35,6 @@
product_id: product_product_partnerstraining0
product_uom: product.uom_day
product_uom_qty: 5.0
- th_weight: 0.0
type: make_to_order
picking_policy: direct
pricelist_id: product.list0
@@ -49,27 +48,23 @@
I check the procurements.
-
!python {model: procurement.order}: |
- from tools.translate import _
orderline_obj = self.pool.get('sale.order.line')
line_ids = orderline_obj.search(cr, uid, [('order_id','=', ref('sale_order_so0'))])
orders = orderline_obj.browse(cr, uid, line_ids)
proc_ids = map(lambda x: x.procurement_id.id, orders)
- assert proc_ids, _('No Procurements!')
+ assert proc_ids, 'No Procurements!'
-
The scheduler runs.
-
!function {model: procurement.order, name: run_scheduler}:
- model: procurement.order
- search: "[('state','=','confirmed')]"
+ search: "[]"
-
- Now I check the tasks.
--
- I see that one task is created for my sale order.
+ Now I check that one task is created for my sale order.
-
!python {model: project.task}: |
- from tools.translate import _
order_obj = self.pool.get('sale.order')
order = order_obj.browse(cr, uid, ref('sale_order_so0'))
- task_id = self.search(cr, uid, [('project_id.name','=', order.name)])
- assert task_id, _('No Task is created!')
-
\ No newline at end of file
+ task_id = self.search(cr, uid, [('name','like', order.name)])
+ assert task_id, 'No Task is created!'
+
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index c599d13cb98..93a5c2c81b7 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -100,7 +100,6 @@
attrs="{'readonly':[('state','!=','draft')]}"
on_change="onchange_planned(planned_hours,effective_hours)"/>
-
diff --git a/addons/project_retro_planning/i18n/tr.po b/addons/project_retro_planning/i18n/tr.po
index 8d6ddbfc9a4..578184c1edc 100644
--- a/addons/project_retro_planning/i18n/tr.po
+++ b/addons/project_retro_planning/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:53+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:48+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_retro_planning
diff --git a/addons/project_retro_planning/project_retro_planning.py b/addons/project_retro_planning/project_retro_planning.py
index fd50fe64e50..d5667145c3d 100644
--- a/addons/project_retro_planning/project_retro_planning.py
+++ b/addons/project_retro_planning/project_retro_planning.py
@@ -33,7 +33,12 @@ class project_project(osv.osv):
if vals.get('date', False):
data_project = self.browse(cr, uid, ids)
for prj in data_project:
- new_end_date = date(*time.strptime(vals['date'],'%Y-%m-%d')[:3])
+ if isinstance(vals['date'], datetime):
+ new_end_date = vals['date'].date()
+ elif isinstance(vals['date'], date):
+ new_end_date = vals['date']
+ else:
+ new_end_date = date(*time.strptime(vals['date'],'%Y-%m-%d')[:3])
if prj.date:
old_end_date = date(*time.strptime(prj.date,'%Y-%m-%d')[:3])
for task in prj.tasks:
diff --git a/addons/project_retro_planning/test/deadline_change.yml b/addons/project_retro_planning/test/deadline_change.yml
index b15fb485a86..3e778916792 100644
--- a/addons/project_retro_planning/test/deadline_change.yml
+++ b/addons/project_retro_planning/test/deadline_change.yml
@@ -18,30 +18,3 @@
project_id: project_project_retroplanning0
remaining_hours: 24.0
state: draft
--
- Check if task deadline_date and start_date changes upon changing its project's end_date
--
- !python {model: project.project}: |
- from datetime import datetime, date, timedelta
- import time
- data_project = self.browse(cr,uid,[ref("project_project_retroplanning0")])
- prj = data_project[0]
- old_end_date=''
- if prj.date:
- old_end_date = date(*time.strptime(prj.date,'%Y-%m-%d')[:3])
- if old_end_date:
- new_end_date = date.today()+timedelta(1)
- res={}
- for task in prj.tasks:
- start_dt = (datetime(*time.strptime(task.date_start,'%Y-%m-%d %H:%M:%S')[:3])+(new_end_date-old_end_date)).strftime('%Y-%m-%d %H:%M:%S')
- deadline_dt=''
- if task.date_deadline:
- deadline_dt = (datetime(*time.strptime(task.date_deadline,'%Y-%m-%d')[:3])+(new_end_date-old_end_date)).strftime('%Y-%m-%d')
- res[task.id]=[start_dt,deadline_dt]
- self.write(cr, uid, [ref("project_project_retroplanning0")], {'date' : (datetime.now()+timedelta(1)).strftime('%Y-%m-%d')})
- data_project = self.browse(cr,uid,[ref("project_project_retroplanning0")])
- prj = data_project[0]
-
- for task in prj.tasks:
- assert task.date_start == res[task.id][0], "task start date differs, expected %s, got %s"%(res[task.id][0], task.date_start)
- assert task.date_deadline == res[task.id][1], "task deadline date differs, expected %s, got %s"%(res[task.id][1], task.date_deadline)
diff --git a/addons/project_scrum/i18n/tr.po b/addons/project_scrum/i18n/tr.po
index 7af67ed4093..1823c0f0998 100644
--- a/addons/project_scrum/i18n/tr.po
+++ b/addons/project_scrum/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:18+0000\n"
+"PO-Revision-Date: 2010-09-04 08:43+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_scrum
diff --git a/addons/project_scrum/project_scrum_demo.xml b/addons/project_scrum/project_scrum_demo.xml
index bc79209b2e0..2c627c89b09 100644
--- a/addons/project_scrum/project_scrum_demo.xml
+++ b/addons/project_scrum/project_scrum_demo.xml
@@ -231,7 +231,7 @@ Demo :Bugfix - memory leak
-
+
Learn how to migration
@@ -239,7 +239,7 @@ Demo :Bugfix - memory leak
-
+
Create a script for migration and testing
@@ -247,7 +247,7 @@ Demo :Bugfix - memory leak
-
+
Add on top or bottom and shortcuts
diff --git a/addons/project_timesheet/i18n/tr.po b/addons/project_timesheet/i18n/tr.po
index 8150b76465b..50f58c9f5bc 100644
--- a/addons/project_timesheet/i18n/tr.po
+++ b/addons/project_timesheet/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:51+0000\n"
+"PO-Revision-Date: 2010-09-04 08:58+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 04:00+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: project_timesheet
diff --git a/addons/purchase/i18n/lt.po b/addons/purchase/i18n/lt.po
index 1a3423e86c2..bab43bf3832 100644
--- a/addons/purchase/i18n/lt.po
+++ b/addons/purchase/i18n/lt.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 08:49+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/i18n/pt_BR.po b/addons/purchase/i18n/pt_BR.po
index 09df3eef4da..f59358a9b2c 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 15:13+0000\n"
-"Last-Translator: Roberto Higashi \n"
+"PO-Revision-Date: 2010-09-01 06:56+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 03:52+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/i18n/tr.po b/addons/purchase/i18n/tr.po
index c53b1327f67..118222f7b9d 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:42+0000\n"
+"PO-Revision-Date: 2010-09-04 08:57+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: purchase
diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py
index 2256cffb6f1..51e294200cb 100644
--- a/addons/purchase/purchase.py
+++ b/addons/purchase/purchase.py
@@ -145,6 +145,17 @@ class purchase_order(osv.osv):
res[purchase.id] = False
return res
+ STATE_SELECTION = [
+ ('draft', 'Request for Quotation'),
+ ('wait', 'Waiting'),
+ ('confirmed', 'Waiting Supplier Ack'),
+ ('approved', 'Approved'),
+ ('except_picking', 'Shipping Exception'),
+ ('except_invoice', 'Invoice Exception'),
+ ('done', 'Done'),
+ ('cancel', 'Cancelled')
+ ]
+
_columns = {
'name': fields.char('Order Reference', size=64, required=True, select=True, help="unique number of the purchase order,computed automatically when the purchase order is created"),
'origin': fields.char('Source Document', size=64,
@@ -164,7 +175,7 @@ class purchase_order(osv.osv):
'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse', states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}),
'location_id': fields.many2one('stock.location', 'Destination', required=True, domain=[('usage','<>','view')]),
'pricelist_id':fields.many2one('product.pricelist', 'Pricelist', required=True, states={'confirmed':[('readonly',True)], 'approved':[('readonly',True)],'done':[('readonly',True)]}, help="The pricelist sets the currency used for this purchase order. It also computes the supplier price for the selected products/quantities."),
- 'state': fields.selection([('draft', 'Request for Quotation'), ('wait', 'Waiting'), ('confirmed', 'Waiting Supplier Ack'), ('approved', 'Approved'),('except_picking', 'Shipping Exception'), ('except_invoice', 'Invoice Exception'), ('done', 'Done'), ('cancel', 'Cancelled')], 'State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
+ 'state': fields.selection(STATE_SELECTION, 'State', readonly=True, help="The state of the purchase order or the quotation request. A quotation is a purchase order in a 'Draft' state. Then the order has to be confirmed by the user, the state switch to 'Confirmed'. Then the supplier must confirm the order to change the state to 'Approved'. When the purchase order is paid and received, the state becomes 'Done'. If a cancel action occurs in the invoice or in the reception of goods, the state becomes in exception.", select=True),
'order_line': fields.one2many('purchase.order.line', 'order_id', 'Order Lines', states={'approved':[('readonly',True)],'done':[('readonly',True)]}),
'validator' : fields.many2one('res.users', 'Validated by', readonly=True),
'notes': fields.text('Notes'),
@@ -220,8 +231,7 @@ class purchase_order(osv.osv):
if s['state'] in ['draft','cancel']:
unlink_ids.append(s['id'])
else:
- state_dict = {'wait':'Waiting','confirmed':'Confirmed','approved':'Approved','except_picking': 'Shipping Exception','except_invoice': 'Invoice Exception','done': 'Done'}
- raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!') %_(eval(s['state'],state_dict)))
+ raise osv.except_osv(_('Invalid action !'), _('Cannot delete Purchase Order(s) which are in %s State!') % _(dict(purchase_order.STATE_SELECTION).get(s['state'])))
# TODO: temporary fix in 5.0, to remove in 5.2 when subflows support
# automatically sending subflow.delete upon deletion
diff --git a/addons/purchase/purchase_workflow.xml b/addons/purchase/purchase_workflow.xml
index d14530e5f48..3ab41d7e6bf 100644
--- a/addons/purchase/purchase_workflow.xml
+++ b/addons/purchase/purchase_workflow.xml
@@ -187,7 +187,7 @@
action_po_assign()
-
+
check_buy()
diff --git a/addons/purchase/report/order.rml b/addons/purchase/report/order.rml
index 51dc6941f3f..cf043b0d27c 100644
--- a/addons/purchase/report/order.rml
+++ b/addons/purchase/report/order.rml
@@ -155,7 +155,7 @@
[[ repeatIn(o.dest_address_id and [o.dest_address_id] or [],'addr') ]]
Shipping address :
- [[ o.partner_id.title or '' ]] [[ o.partner_id.name ]]
+ [[ addr.partner_id.title or '' ]] [[ addr.partner_id.name ]]
[[ addr.title or '' ]] [[ addr.name ]]
[[ addr.street ]]
[[ addr.street2 or '' ]]
diff --git a/addons/report_intrastat/i18n/pt_BR.po b/addons/report_intrastat/i18n/pt_BR.po
index e9dc7b11a0b..9a8c0c4c6c8 100644
--- a/addons/report_intrastat/i18n/pt_BR.po
+++ b/addons/report_intrastat/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:55+0000\n"
+"PO-Revision-Date: 2010-09-04 08:54+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
diff --git a/addons/report_intrastat/i18n/tr.po b/addons/report_intrastat/i18n/tr.po
index d970972615c..08df3ea09c5 100644
--- a/addons/report_intrastat/i18n/tr.po
+++ b/addons/report_intrastat/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:04+0000\n"
+"PO-Revision-Date: 2010-09-04 08:47+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: report_intrastat
diff --git a/addons/sale/i18n/pt_BR.po b/addons/sale/i18n/pt_BR.po
index 63796a046e1..a669c4732c5 100644
--- a/addons/sale/i18n/pt_BR.po
+++ b/addons/sale/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 15:40+0000\n"
-"Last-Translator: Roberto Higashi \n"
+"PO-Revision-Date: 2010-09-04 09:00+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/sr.po b/addons/sale/i18n/sr.po
index 7450f19d66e..9f2fe820642 100644
--- a/addons/sale/i18n/sr.po
+++ b/addons/sale/i18n/sr.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:53+0000\n"
"Last-Translator: OpenERP Administrators \n"
"Language-Team: Serbian \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/sv.po b/addons/sale/i18n/sv.po
index f56622d3bb7..7b5e83dbc8e 100644
--- a/addons/sale/i18n/sv.po
+++ b/addons/sale/i18n/sv.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:11+0000\n"
+"PO-Revision-Date: 2010-09-04 08:51+0000\n"
"Last-Translator: Anders Eriksson (Mobila System) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/tr.po b/addons/sale/i18n/tr.po
index 34054afe19e..7087e544a7a 100644
--- a/addons/sale/i18n/tr.po
+++ b/addons/sale/i18n/tr.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:06+0000\n"
+"PO-Revision-Date: 2010-09-04 08:57+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/uk.po b/addons/sale/i18n/uk.po
index e7ddaae00d0..5a808600c3c 100644
--- a/addons/sale/i18n/uk.po
+++ b/addons/sale/i18n/uk.po
@@ -7,13 +7,13 @@ msgstr ""
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@openerp.com\n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:48+0000\n"
"Last-Translator: Jay (OpenERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/i18n/vi.po b/addons/sale/i18n/vi.po
index 12570bcceb4..84552190a5a 100644
--- a/addons/sale/i18n/vi.po
+++ b/addons/sale/i18n/vi.po
@@ -8,13 +8,13 @@ msgstr ""
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME \n"
"POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:12+0000\n"
+"PO-Revision-Date: 2010-09-04 08:54+0000\n"
"Last-Translator: Fabien (Open ERP) \n"
"Language-Team: Vietnamese \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale
diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py
index b18e539864e..3590a87c4f5 100644
--- a/addons/sale/report/sale_report.py
+++ b/addons/sale/report/sale_report.py
@@ -31,18 +31,13 @@ class sale_report(osv.osv):
'date': fields.date('Date Order', readonly=True),
'date_confirm': fields.date('Date Confirm', readonly=True),
'shipped':fields.boolean('Shipped', readonly=True),
- 'paid':fields.float('Picked', readonly=True),
'shipped_qty_1':fields.integer('Shipped Qty', readonly=True),
- 'paid_qty':fields.float('Paid Qty', readonly=True),
'year': fields.char('Year', size=4, readonly=True),
'month':fields.selection([('01','January'), ('02','February'), ('03','March'), ('04','April'),
('05','May'), ('06','June'), ('07','July'), ('08','August'), ('09','September'),
('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
'day': fields.char('Day', size=128, readonly=True),
'product_id':fields.many2one('product.product', 'Product', readonly=True),
-
- 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True),
- 'product_qty':fields.float('# of Qty', readonly=True),
'uom_name': fields.char('Default UoM', size=128, readonly=True),
'product_uom_qty':fields.float('# of Qty', readonly=True),
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 3fa024074dc..7401d1dc534 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -1196,4 +1196,4 @@ class sale_config_picking_policy(osv.osv_memory):
sale_config_picking_policy()
-# 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/sale/sale_view.xml b/addons/sale/sale_view.xml
index 9279a946ff9..6f21e925e1a 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -111,8 +111,8 @@
-
-
+
+
-
+
-
+
diff --git a/addons/sale/test/advance_invoice.yml b/addons/sale/test/advance_invoice.yml
index 7bb1ac8e902..9bf8fc9a68c 100644
--- a/addons/sale/test/advance_invoice.yml
+++ b/addons/sale/test/advance_invoice.yml
@@ -65,31 +65,17 @@
invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
- Creating a account invoice pay entry.
--
- !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
- amount: 3000.0
- date: '2010-07-17'
- journal_id: sale.account_journal_bankjournal0
- name: test
- period_id: account.period_5
--
- I pay the invoice.
+ I pay the invoice
-
- !python {model: account.invoice.pay}: |
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "active_model": "account.invoice",
- "tz":False,"record_id": so.invoice_ids[0].id, "active_ids": [so.invoice_ids[0].id], "type":
- "out_invoice", "active_id": so.invoice_ids[0].id})
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_5}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 3000.0, ref('account.cash'), ref('account.period_5'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
I verify that invoice has transit from Open to Paid state
-
@@ -138,40 +124,22 @@
invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
- Creating a account invoice pay entry.
+ I assign an analytic jounal to the bank journal
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst2}:
- amount: 14000.0
- date: '2010-07-17'
- journal_id: sale.account_journal_bankjournal0
- name: test
- period_id: account.period_5
--
- I pay the invoice.
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
-
- !python {model: account.invoice.pay}: |
+ I pay the invoice
+-
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst2")], {"lang": "en_US", "active_model": "account.invoice",
- "tz":False,"record_id": so.invoice_ids[1].id, "active_ids": [so.invoice_ids[1].id], "type":
- "out_invoice", "active_id": so.invoice_ids[1].id})
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so5"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[1].id], "type": "out_invoice", "active_id": so.invoice_ids[1].id})
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 14000.0, ref('account.cash'), ref('account.period_5'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_5'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
I verify that an invoice is in done state.
-
@@ -185,4 +153,4 @@
-
!python {model: sale.order}: |
sale_id=self.browse(cr, uid, ref("sale_order_so5"))
- assert(sale_id.invoiced == True), "Paid has not been set to true"
\ No newline at end of file
+ assert(sale_id.invoiced == True), "Paid has not been set to true"
diff --git a/addons/sale/test/invoice_on_ordered_qty.yml b/addons/sale/test/invoice_on_ordered_qty.yml
index c845a4cb741..3170aec11b9 100644
--- a/addons/sale/test/invoice_on_ordered_qty.yml
+++ b/addons/sale/test/invoice_on_ordered_qty.yml
@@ -37,11 +37,11 @@
so = self.browse(cr, uid, ref("sale_order_so9"))
assert so.picking_ids,"Picking has not been generated for sale_order_so9"
-
- Then I click on the "Products Received" button of Incoming Shipments
+ Then I confirm the picking
-
!record {model: stock.partial.picking, id: stock_partial_picking_0}:
date: '2010-07-17 17:52:09'
--
+-
Then I done the picking
-
!python {model: stock.picking }: |
@@ -86,7 +86,7 @@
inv_brw = self.browse(cr,uid,ids)[0]
for inv_lines in inv_brw.invoice_line:
qty1 = inv_lines.quantity
- assert ('qty1','=','qty'), "Quantities are not same"
+ assert qty1==qty, "Quantities are not same"
-
I open the Invoice for the SO.
-
@@ -99,40 +99,22 @@
for invoice in invoice_ids:
wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
-
- Creating a account invoice pay entry.
+ Assign analytic jounal into bank journal
+-
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
- amount: 40000.0
- date: '2010-07-17'
- journal_id: sale.account_journal_bankjournal0
- name: tst
- period_id: account.period_5
+ I pay the invoice
-
- I pay the invoice.
--
- !python {model: account.invoice.pay}: |
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
- False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
- "out_invoice", "active_id": so.invoice_ids[0].id, })
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 40000.0, ref('account.cash'), ref('account.period_9'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
I verify the invoice are in paid state or not.
-
@@ -141,10 +123,10 @@
so = sale_order_obj.browse(cr, uid, ref("sale_order_so9"))
invoice_ids = so.invoice_ids
for invoice in invoice_ids:
- assert (invoice.state) =='paid', "Invoice for SO is not in done state."
+ assert invoice.state =='paid', "Invoice for SO is not in done state."
-
I check that Paid has been set to true.
-
!python {model: sale.order}: |
sale_id=self.browse(cr, uid, ref("sale_order_so9"))
- assert(sale_id.invoiced == True), "Paid has not been set to true"
\ No newline at end of file
+ assert sale_id.invoiced == True, "Paid has not been set to true"
diff --git a/addons/sale/test/invoice_on_shipped_qty.yml b/addons/sale/test/invoice_on_shipped_qty.yml
index c399948c004..38a64620e13 100644
--- a/addons/sale/test/invoice_on_shipped_qty.yml
+++ b/addons/sale/test/invoice_on_shipped_qty.yml
@@ -1,12 +1,11 @@
-
In order to test the Sale module in OpenERP,
- I create a Sale Order for Slider Mobile for 500 quantity having Shipping Policy 'Invoice from Picking' and Invoice on 'Shipped quantities'
- in order to create an invoice based on the shipping quantity
+ I create a Sale Order for Slider Mobile for 200 quantity having Shipping Policy 'Invoice from Picking' and Invoice on 'Shipped quantities'
-
!record {model: sale.order, id: sale_order_so6}:
date_order: '2010-07-17'
invoice_quantity: order
- name: Test_SO006
+ name: Test_SO006BIS
order_line:
- name: Slider Mobile
price_unit: 200
@@ -37,12 +36,12 @@
so = self.browse(cr, uid, ref("sale_order_so6"))
assert so.picking_ids,"Picking has not been generated for sale_order_so6"
-
- Then I click on the "Products Received" button of Incoming Shipments
+ Then I click on the "Product Sent" button of Outgoing Shipments
-
!record {model: stock.partial.picking, id: stock_partial_picking_0}:
date: '2010-07-17 17:52:09'
-
- Then I done the picking
+ I change the quantity on the picking to 199, and confirm partially 100 PCE.
-
!python {model: stock.picking }: |
import time
@@ -50,22 +49,24 @@
so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
picking_id = self.search(cr, uid, [('origin','=',so.name),('type','=','out')])
if picking_id:
+ pick=self.browse(cr,uid,picking_id[0])
+ self.pool.get('stock.move').write(cr, uid, [pick.move_lines[0].id], {'product_qty': 199, 'product_uos_qty': 199})
pick=self.browse(cr,uid,picking_id[0])
pick.force_assign(cr, uid)
partial_datas = {
- 'partner_id':pick.address_id.partner_id.id,
- 'address_id': pick.address_id.id,
- 'delivery_date' : time.strftime('%Y-%m-%d'),
- }
+ 'partner_id':pick.address_id.partner_id.id,
+ 'address_id': pick.address_id.id,
+ 'delivery_date' : time.strftime('%Y-%m-%d'),
+ }
move = pick.move_lines[0]
partial_datas['move%s'%(move.id)]= {
'product_id': move.product_id.id,
'product_qty': '100',
'product_uom': move.product_uom.id,
- }
+ }
self.do_partial(cr, uid, [pick.id],partial_datas)
-
- Then I create invoice from picking
+ Then I create the invoice from the two partial picking
-
!record {model: stock.invoice.onshipping, id: stock_invoice_onshipping_6}:
invoice_date: '2010-07-17'
@@ -89,21 +90,22 @@
so = self.browse(cr, uid, ref("sale_order_so6"))
assert so.invoice_ids, "Invoices has not been generated for sale_order_so6"
-
- I verify that an invoice is created on the basis of shipped quantity
+ I verify that an invoice is created on the basis of shipped quantities 199 not ordered quantities 200
-
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
picking_obj = self.pool.get('stock.picking')
- ids = picking_obj.search(cr, uid, [('origin', '=', so.name)])
- pick_brw = picking_obj.browse(cr,uid, ids)[0]
- for lines in pick_brw.move_lines:
- qty=lines.product_qty
- inv_id = self.search(cr, uid, [('origin', '=', so.name)])
+ ids = picking_obj.search(cr, uid, [('origin', '=', so.name),('type','=','out')])
+ qty = qty1 = 0.0
+ for pick_brw in picking_obj.browse(cr,uid, ids):
+ for lines in pick_brw.move_lines:
+ qty=lines.product_qty
+ inv_id = self.search(cr, uid, [('origin', 'like', so.name)])
inv_brw = self.browse(cr,uid,inv_id)[0]
for inv_lines in inv_brw.invoice_line:
qty1=inv_lines.quantity
- assert ('qty1','=','qty'), "Quantities are not same"
+ assert abs(qty1-qty) < 0.001, "Quantities are not the same"
-
I open the Invoice for the SO.
-
@@ -116,40 +118,22 @@
for invoice in invoice_ids:
wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
-
- Creating a account invoice pay entry.
+ Assign analytic jounal into bank journal
+-
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
- amount: 40000.0
- date: '2010-07-17'
- journal_id: sale.account_journal_bankjournal0
- name: tst
- period_id: account.period_5
+ I pay the invoice
-
- I pay the invoice.
--
- !python {model: account.invoice.pay}: |
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
- False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
- "out_invoice", "active_id": so.invoice_ids[0].id, })
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
+ invoice_id = self.search(cr, uid, [('origin','like',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 40000.0, ref('account.cash'), ref('account.period_8'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
I verify the invoice are in paid state or not.
-
@@ -158,10 +142,10 @@
so = sale_order_obj.browse(cr, uid, ref("sale_order_so6"))
invoice_ids = so.invoice_ids
for invoice in invoice_ids:
- assert (invoice.state) =='paid', "Invoice for SO is not in done state."
+ assert invoice.state=='paid', "Invoice for SO is not in done state."
-
I check that Paid has been set to true.
-
!python {model: sale.order}: |
sale_id=self.browse(cr, uid, ref("sale_order_so6"))
- assert(sale_id.invoiced == True), "Paid has not been set to true"
+ assert sale_id.invoiced == True, "Paid has not been set to true"
diff --git a/addons/sale/test/manual_order_policy.yml b/addons/sale/test/manual_order_policy.yml
index 9dd12ed375c..c6ee6298d79 100644
--- a/addons/sale/test/manual_order_policy.yml
+++ b/addons/sale/test/manual_order_policy.yml
@@ -68,40 +68,22 @@
inv_brw = self.browse(cr, uid, invoice_id)[0]
assert inv_brw.move_id, "Journal Entries has not been created"
-
- Creating a account invoice pay entry.
+ Assign analytic jounal into bank journal
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
- amount: 100000.0
- date: '2010-07-17'
- journal_id: sale.account_journal_bankjournal0
- name: test
- period_id: account.period_5
--
- I pay the invoice.
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
-
- !python {model: account.invoice.pay}: |
+ I pay the invoice
+-
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "active_model": "account.invoice",
- "tz":False,"record_id": so.invoice_ids[0].id, "active_ids": [so.invoice_ids[0].id], "type":
- "out_invoice", "active_id": so.invoice_ids[0].id})
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so0"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 100000.0, ref('account.cash'), ref('account.period_8'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
I verify the invoice is in done state.
-
diff --git a/addons/sale/test/picking_order_policy.yml b/addons/sale/test/picking_order_policy.yml
index d9b2500d432..e2ae13f457d 100644
--- a/addons/sale/test/picking_order_policy.yml
+++ b/addons/sale/test/picking_order_policy.yml
@@ -92,44 +92,26 @@
wf_service = netsvc.LocalService("workflow")
invoice_ids = so.invoice_ids
for invoice in invoice_ids:
- wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
+ wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
-
- Creating a account invoice pay entry.
+ Assign analytic jounal into bank journal
+-
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
- amount: 255000.0
- date: '2010-07-15'
- journal_id: sale.account_journal_bankjournal0
- name: tst
- period_id: account.period_5
+ I pay the invoice
-
- I pay the invoice.
--
- !python {model: account.invoice.pay}: |
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
- False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
- "out_invoice", "active_id": so.invoice_ids[0].id, })
+ invoice_id = self.search(cr, uid, [('origin','like',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 255000.0, ref('account.cash'), ref('account.period_8'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so7"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id })
--
- I verify the invoice are in paid state or not.
+ I verify the invoice is in paid state.
-
!python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
diff --git a/addons/sale/test/postpaid_order_policy.yml b/addons/sale/test/postpaid_order_policy.yml
index c4cf24eb419..c3822cf3ced 100644
--- a/addons/sale/test/postpaid_order_policy.yml
+++ b/addons/sale/test/postpaid_order_policy.yml
@@ -262,48 +262,22 @@
for invoice in invoice_ids:
wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
-
- Creating a account invoice pay entry.
+ Assign analytic jounal into bank journal
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
- amount: 100000.0
- date: '2010-07-15'
- journal_id: sale.account_journal_bankjournal0
- name: test
- period_id: account.period_5
--
- I pay the invoice.
--
- !python {model: account.invoice.pay}: |
- modules = self.pool.get('ir.module.module')
- mod_pur = modules.search(cr, uid, [('name','=','purchase')])
- mod_brw = modules.browse(cr,uid,mod_pur)[0]
- if (mod_brw.state == 'installed'):
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "tz":
- False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
- "out_invoice", "active_id": so.invoice_ids[0].id})
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- modules = self.pool.get('ir.module.module')
- mod_pur = modules.search(cr, uid, [('name','=','purchase')])
- mod_brw = modules.browse(cr,uid,mod_pur)[0]
- if (mod_brw.state == 'installed'):
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
+-
+ I pay the invoice
+-
+ !python {model: account.invoice}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so8"))
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 100000.0, ref('account.cash'), ref('account.period_8'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
I verify the invoice are in paid state or not.
-
@@ -328,4 +302,4 @@
-
!python {model: sale.order}: |
so = self.browse(cr, uid, ref("sale_order_so8"))
- assert (so.state == 'done'), "Sale order is not in the done state."
\ No newline at end of file
+ assert (so.state == 'done'), "Sale order is not in the done state."
diff --git a/addons/sale/test/prepaid_order_policy.yml b/addons/sale/test/prepaid_order_policy.yml
index f5329f1540a..4ce5c5df722 100644
--- a/addons/sale/test/prepaid_order_policy.yml
+++ b/addons/sale/test/prepaid_order_policy.yml
@@ -54,40 +54,22 @@
for invoice in invoice_ids:
wf_service.trg_validate(uid, 'account.invoice',invoice.id,'invoice_open', cr)
-
- Creating a account invoice pay entry.
+ I assign an analytic jounal to the Bank journal
+-
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
- amount: 85000.0
- date: '2010-07-20'
- journal_id: sale.account_journal_bankjournal0
- name: tst
- period_id: account.period_5
+ I pay the invoice
-
- I pay the invoice.
--
- !python {model: account.invoice.pay}: |
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
- False, "active_model": 'account.invoice', "active_ids": [so.invoice_ids[0].id], "type":
- "out_invoice", "active_id": so.invoice_ids[0].id, })
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so1"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 85000.0, ref('account.cash'), ref('account.period_8'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_5'), ref('sale.account_journal_bankjournal0'),
+ name='test002')
-
I verify the invoice is in done state or not.
-
diff --git a/addons/sale/test/so_make_invoice.yml b/addons/sale/test/so_make_invoice.yml
index abd18751a11..e2413de81c1 100644
--- a/addons/sale/test/so_make_invoice.yml
+++ b/addons/sale/test/so_make_invoice.yml
@@ -183,42 +183,22 @@
for id in inv:
wf_service.trg_validate(uid, 'account.invoice',id,'invoice_open', cr)
-
- Creating a account invoice pay entry.
--
- !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
- amount: 40000.0
- date: '2010-08-02'
- journal_id: sale.account_journal_bankjournal0
- name: tst
- period_id: account.period_8
--
- I pay the invoice.
--
- !python {model: account.invoice.pay}: |
- acc_inv_obj = self.pool.get('account.invoice')
- inv_id = acc_inv_obj.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|')])
- for ids in inv_id:
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "tz":
- False, "active_model": 'account.invoice', 'record_id': ids, "active_ids": [ids], "type":
- "out_invoice", "active_id": ids, })
--
- Creating an account invoice pay writeoff entry.
+ I assign an analytic jounal to the bank journal
-
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- acc_inv_obj = self.pool.get('account.invoice')
- inv = acc_inv_obj.search(cr, uid, [('origin','=','Test_SO004|Test_SO003|')])
- for inv_id in inv:
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [inv_id], "type": "out_invoice", "active_id": inv_id, })
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
+-
+ I pay the invoice
+-
+ !python {model: account.invoice}: |
+ sale_order_obj = self.pool.get('sale.order')
+ so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 40000.0, ref('account.cash'), ref('account.period_5'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='tst')
-
I verify the invoice is in Paid sate
-
diff --git a/addons/sale/test/so_make_line_invoice.yml b/addons/sale/test/so_make_line_invoice.yml
index 07c45bec996..21b57dab90c 100644
--- a/addons/sale/test/so_make_line_invoice.yml
+++ b/addons/sale/test/so_make_line_invoice.yml
@@ -8,6 +8,7 @@
name: Test_SO003
order_line:
- name: Slider Mobile
+ sequence: 1
price_unit: 200.0
product_uom: product.product_uom_unit
product_uom_qty: 100.0
@@ -18,6 +19,7 @@
type: make_to_order
- name: LG Viewty Smart
price_unit: 170.0
+ sequence: 2
product_uom: product.product_uom_unit
product_uom_qty: 100.0
state: draft
@@ -82,40 +84,22 @@
invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
- Creating an account invoice pay entry.
+ I assign an analytic jounal to the bank journal
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst0}:
- amount: 20000.0
- date: '2010-07-12'
- journal_id: sale.account_journal_bankjournal0
- name: test
- period_id: account.period_5
--
- I pay the invoice.
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
-
- !python {model: account.invoice.pay}: |
+ I pay the invoice
+-
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst0")], {"lang": "en_US", "active_model": "account.invoice",
- "tz":False,"record_id": so.invoice_ids[0].id, "active_ids": [so.invoice_ids[0].id], "type":
- "out_invoice", "active_id": so.invoice_ids[0].id})
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_0}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_0")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[0].id], "type": "out_invoice", "active_id": so.invoice_ids[0].id, })
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 20000.0, ref('account.cash'), ref('account.period_8'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
I verify that an invoice is in done state.
-
@@ -131,19 +115,9 @@
sale_id=self.browse(cr, uid, ref("sale_order_so3"))
assert(sale_id.invoiced == True), "Paid has not been set to true"
-
- I click on the "Create Invoice" button of sale order and verify that it gives a warning message
+ I click on the "Create Invoice" button of sale order and verify that it gives a warning message
-
- !python {model: sale.order}: |
- import netsvc
- wf_service = netsvc.LocalService("workflow")
- try:
- wf_service.trg_validate(uid, 'sale.order',ref("sale_order_so3"),'manual_invoice', cr)
- except:
- pass
--
- I create an invoice for another sale order line.
--
- I click on the "Create Invoice" button of sale order line
+ I create an invoice for another sale order line. I click on the "Create Invoice" button of sale order line
-
!python {model: sale.order.line}: |
sale_order_obj = self.pool.get('sale.order')
@@ -192,40 +166,22 @@
invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
assert invoice_id, "Invoice is not in the open state"
-
- Creating a account invoice pay entry.
+ Assign analytic jounal into bank journal
-
- !record {model: account.invoice.pay, id: account_invoice_pay_tst1}:
- amount: 17000.0
- date: '2010-07-12'
- journal_id: sale.account_journal_bankjournal0
- name: test
- period_id: account.period_5
--
- I pay the invoice.
+ !record {model: account.journal, id: sale.account_journal_bankjournal0}:
+ analytic_journal_id: account.cose_journal_sale
-
- !python {model: account.invoice.pay}: |
+ I pay the invoice
+-
+ !python {model: account.invoice}: |
sale_order_obj = self.pool.get('sale.order')
so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
- self.wo_check(cr, uid, [ref("account_invoice_pay_tst1")], {"lang": "en_US", "active_model": "account.invoice",
- "tz":False,"record_id": so.invoice_ids[1].id, "active_ids": [so.invoice_ids[1].id], "type":
- "out_invoice", "active_id": so.invoice_ids[1].id})
--
- Creating an account invoice pay writeoff entry.
--
- !record {model: account.invoice.pay.writeoff, id: account_invoice_pay_writeoff_1}:
- analytic_id: account.analytic_customers
- comment: Write-Off
- writeoff_acc_id: account.a_sale
- writeoff_journal_id: sale.account_journal_bankjournal0
--
- Pay and Reconcile the Invoice.
--
- !python {model: account.invoice.pay.writeoff}: |
- sale_order_obj = self.pool.get('sale.order')
- so = sale_order_obj.browse(cr, uid, ref("sale_order_so3"))
- self.pay_and_reconcile_writeoff(cr, uid, [ref("account_invoice_pay_writeoff_1")],
- {"lang": 'en_US', "tz": False, "active_model": 'account.invoice', "active_ids":
- [so.invoice_ids[1].id], "type": "out_invoice", "active_id": so.invoice_ids[1].id})
+ invoice_id = self.search(cr, uid, [('origin','=',so.name),('state','=','open')])
+ self.pay_and_reconcile(cr, uid, invoice_id,
+ 17000.0, ref('account.cash'), ref('account.period_8'),
+ ref('sale.account_journal_bankjournal0'), ref('account.cash'),
+ ref('account.period_8'), ref('sale.account_journal_bankjournal0'),
+ name='test')
-
I verify the invoice is in done state.
-
@@ -239,4 +195,4 @@
-
!python {model: sale.order}: |
sale_id=self.browse(cr, uid, ref("sale_order_so3"))
- assert(sale_id.invoiced == True), "Paid has not been set to true"
\ No newline at end of file
+ assert(sale_id.invoiced == True), "Paid has not been set to true"
diff --git a/addons/sale_journal/i18n/pl.po b/addons/sale_journal/i18n/pl.po
index fd2a549a862..f9dad180a5a 100644
--- a/addons/sale_journal/i18n/pl.po
+++ b/addons/sale_journal/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:07+0000\n"
+"PO-Revision-Date: 2010-09-04 08:59+0000\n"
"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
diff --git a/addons/sale_journal/i18n/tr.po b/addons/sale_journal/i18n/tr.po
index 3be5b6bfdd9..8f2b3e548d1 100644
--- a/addons/sale_journal/i18n/tr.po
+++ b/addons/sale_journal/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 07:54+0000\n"
+"PO-Revision-Date: 2010-09-04 08:54+0000\n"
"Last-Translator: Fabien (Open ERP) \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: 2010-09-01 03:59+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:47+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: sale_journal
diff --git a/addons/stock/i18n/bs.po b/addons/stock/i18n/bs.po
index efcadab3880..048b359f850 100644
--- a/addons/stock/i18n/bs.po
+++ b/addons/stock/i18n/bs.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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:09+0000\n"
+"PO-Revision-Date: 2010-09-04 08:59+0000\n"
"Last-Translator: adnan \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/it.po b/addons/stock/i18n/it.po
index 28b9ae8ea6c..b4335cd0645 100644
--- a/addons/stock/i18n/it.po
+++ b/addons/stock/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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:07+0000\n"
+"PO-Revision-Date: 2010-09-04 08:43+0000\n"
"Last-Translator: Davide Corio - Domsense \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/pl.po b/addons/stock/i18n/pl.po
index 36ce24699cd..925a397f61c 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:11+0000\n"
+"PO-Revision-Date: 2010-09-04 08:46+0000\n"
"Last-Translator: Anup (OpenERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/pt_BR.po b/addons/stock/i18n/pt_BR.po
index 5f656d60f09..3f4247533b6 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 19:30+0000\n"
-"Last-Translator: Roberto Higashi \n"
+"PO-Revision-Date: 2010-09-04 08:58+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/tr.po b/addons/stock/i18n/tr.po
index 87a38f26036..f1cbc95807a 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-31 08:08+0000\n"
+"PO-Revision-Date: 2010-09-04 08:53+0000\n"
"Last-Translator: Anup (OpenERP) \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: 2010-09-01 03:57+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
diff --git a/addons/stock/i18n/zh_CN.po b/addons/stock/i18n/zh_CN.po
index 762cbdf42d3..525cf11be0b 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: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2010-08-03 04:14+0000\n"
-"Last-Translator: Black Jack \n"
+"PO-Revision-Date: 2010-09-04 09:02+0000\n"
+"Last-Translator: OpenERP Administrators \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: 2010-08-12 03:42+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:45+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#. module: stock
@@ -86,12 +86,12 @@ msgstr "计量单位"
#. module: stock
#: model:ir.actions.wizard,name:stock.return_picking
msgid "Return packing"
-msgstr "退货"
+msgstr "退回分拣单"
#. module: stock
#: field:product.category,property_stock_journal:0
msgid "Stock journal"
-msgstr "库存记录集合"
+msgstr "库存业务类型"
#. module: stock
#: wizard_view:stock.fill_inventory,init:0
@@ -103,7 +103,7 @@ msgstr "填写库存的具体库位"
#: view:stock.picking:0
#: field:stock.picking.move.wizard,picking_id:0
msgid "Packing list"
-msgstr "装箱单"
+msgstr "分拣单列表"
#. module: stock
#: rml:lot.stock.overview:0
@@ -114,19 +114,19 @@ msgstr "金额"
#. module: stock
#: view:stock.picking:0
msgid "Products Received"
-msgstr "已收到的产品"
+msgstr "接收产品"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_tree4
#: model:ir.ui.menu,name:stock.menu_action_picking_tree4
msgid "Incoming Products"
-msgstr "接收的产品"
+msgstr "进仓单"
#. module: stock
#: field:stock.picking,name:0
#: field:stock.tracking,serial:0
msgid "Reference"
-msgstr "参照"
+msgstr "关联单号"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,group:0
@@ -206,7 +206,7 @@ msgstr "打包"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "Packing result"
-msgstr "装箱单结果"
+msgstr "分拣单结果"
#. module: stock
#: selection:stock.location,icon:0
@@ -216,7 +216,7 @@ msgstr "STOCK_QUIT"
#. module: stock
#: field:stock.warehouse,lot_output_id:0
msgid "Location Output"
-msgstr "输出库存位"
+msgstr "出库库位"
#. module: stock
#: selection:stock.location,icon:0
@@ -272,12 +272,12 @@ msgstr "内部调拨"
#. module: stock
#: field:stock.move,product_packaging:0
msgid "Packaging"
-msgstr "装箱单"
+msgstr "分拣单"
#. module: stock
#: rml:stock.picking.list:0
msgid "Order(Origin)"
-msgstr "订单(来源)"
+msgstr "单据(来源)"
#. module: stock
#: rml:lot.location:0
@@ -295,7 +295,7 @@ msgstr "附加信息"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
msgid "Customer Refund"
-msgstr "客户退还"
+msgstr "客户退货"
#. module: stock
#: selection:stock.location,icon:0
@@ -461,7 +461,7 @@ msgstr "库存属性"
#. module: stock
#: wizard_button:stock.partial_picking,init,split:0
msgid "Make Picking"
-msgstr "建立装箱单"
+msgstr "创建分拣单"
#. module: stock
#: model:stock.location,name:stock.location_procurement
@@ -531,7 +531,7 @@ msgstr "STOCK_ZOOM_FIT"
#: help:product.category,property_stock_journal:0
msgid ""
"This journal will be used for the accounting move generated by stock move"
-msgstr "这记录集合用于库存调拨产生的会计凭证."
+msgstr "这业务类型用于库存调拨产生会计凭证."
#. module: stock
#: model:ir.actions.act_window,name:stock.action_picking_calendar_delivery
@@ -598,7 +598,7 @@ msgstr "STOCK_GOTO_BOTTOM"
#: model:ir.actions.act_window,name:stock.action_picking_form
#: model:ir.ui.menu,name:stock.menu_action_picking_form
msgid "New Reception Packing"
-msgstr "新接收的装箱单"
+msgstr "新的进仓单"
#. module: stock
#: wizard_field:stock.move.track,init,quantity:0
@@ -712,7 +712,7 @@ msgstr "terp-stock"
#. module: stock
#: rml:stock.picking.list:0
msgid "Packing List:"
-msgstr "装箱单:"
+msgstr "分拣单列表:"
#. module: stock
#: selection:stock.location,icon:0
@@ -752,7 +752,7 @@ msgstr "生产批次修订"
#. module: stock
#: view:stock.picking:0
msgid "Packing Done"
-msgstr "装箱完成"
+msgstr "分拣完成"
#. module: stock
#: selection:stock.move,state:0
@@ -766,7 +766,7 @@ msgstr "等待中"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree7
#: model:ir.ui.menu,name:stock.menu_picking_waiting
msgid "Available Packing"
-msgstr "有效的装箱单"
+msgstr "有效分拣单"
#. module: stock
#: model:ir.model,name:stock.model_stock_warehouse
@@ -819,7 +819,7 @@ msgstr "STOCK_CONNECT"
#: model:ir.ui.menu,name:stock.menu_action_picking_all
#: wizard_field:stock.picking.make,init,pickings:0
msgid "Packing"
-msgstr "装箱单"
+msgstr "分拣单"
#. module: stock
#: selection:stock.location,icon:0
@@ -841,7 +841,7 @@ msgstr "STOCK_OK"
#: model:ir.actions.act_window,name:stock.action_picking_tree9
#: model:ir.ui.menu,name:stock.menu_action_picking_tree9
msgid "New Internal Packing"
-msgstr "新的内部装箱单"
+msgstr "新的内部分拣单"
#. module: stock
#: view:stock.inventory:0
@@ -868,7 +868,7 @@ msgstr "成品"
#. module: stock
#: field:stock.location,location_id:0
msgid "Parent Location"
-msgstr "业务伙伴库位"
+msgstr "上级库位"
#. module: stock
#: field:stock.inventory,date:0
@@ -945,7 +945,7 @@ msgstr "STOCK_GO_BACK"
#. module: stock
#: selection:stock.picking,invoice_state:0
msgid "To Be Invoiced"
-msgstr "要开票"
+msgstr "待开票"
#. module: stock
#: view:product.product:0
@@ -992,7 +992,7 @@ msgstr "STOCK_APPLY"
#. module: stock
#: wizard_view:stock.partial_picking,end2:0
msgid "The packing has been successfully made !"
-msgstr "这装箱单已完成!"
+msgstr "这分拣单已完成!"
#. module: stock
#: field:stock.move,address_id:0
@@ -1054,7 +1054,7 @@ msgstr "取消"
#: view:stock.move:0
#: view:stock.picking:0
msgid "Split in production lots"
-msgstr "分割生产批次"
+msgstr "拆分生产批次"
#. module: stock
#: model:ir.model,name:stock.model_stock_inventory
@@ -1116,7 +1116,7 @@ msgstr "右父项"
#. module: stock
#: field:stock.picking,origin:0
msgid "Origin Reference"
-msgstr "来源参考"
+msgstr "来源单号"
#. module: stock
#: model:ir.actions.act_window,name:stock.action_move_form4
@@ -1132,7 +1132,7 @@ msgstr "STOCK_HARDDISK"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_relate_picking
msgid "Related Picking"
-msgstr "相关的装箱单"
+msgstr "关联的分拣单"
#. module: stock
#: field:stock.incoterms,name:0
@@ -1140,7 +1140,7 @@ msgstr "相关的装箱单"
#: field:stock.picking.move.wizard,name:0
#: field:stock.warehouse,name:0
msgid "Name"
-msgstr "名称"
+msgstr "仓库"
#. module: stock
#: view:stock.inventory.line:0
@@ -1160,13 +1160,13 @@ msgstr "]"
#. module: stock
#: view:stock.picking:0
msgid "Input Packing List"
-msgstr "接收的装箱单"
+msgstr "进仓分拣单"
#. module: stock
#: model:ir.model,name:stock.model_stock_picking
#: field:stock.move,picking_id:0
msgid "Packing List"
-msgstr "装箱单"
+msgstr "分拣单列表"
#. module: stock
#: selection:stock.location,icon:0
@@ -1176,7 +1176,7 @@ msgstr "STOCK_COPY"
#. module: stock
#: selection:stock.invoice_onshipping,init,type:0
msgid "Supplier Refund"
-msgstr "供应商退还"
+msgstr "供应商退货"
#. module: stock
#: model:ir.model,name:stock.model_stock_move
@@ -1207,7 +1207,7 @@ msgstr "STOCK_CDROM"
#. module: stock
#: selection:stock.picking,invoice_state:0
msgid "Not from Packing"
-msgstr "不是来自装箱单"
+msgstr "按来自订单产生的发票"
#. module: stock
#: view:stock.location:0
@@ -1222,7 +1222,7 @@ msgstr "盘存损失"
#. module: stock
#: field:stock.production.lot,ref:0
msgid "Internal Ref"
-msgstr "内部参考"
+msgstr "内部关联单号"
#. module: stock
#: selection:stock.location,icon:0
@@ -1301,7 +1301,7 @@ msgstr "送货方式"
#. module: stock
#: model:ir.actions.wizard,name:stock.partial_picking
msgid "Partial packing"
-msgstr "部分装箱"
+msgstr "部分分拣"
#. module: stock
#: selection:stock.location,icon:0
@@ -1321,7 +1321,7 @@ msgstr "STOCK_YES"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_picking_move_wizard
msgid "Fill From Unreceived Products"
-msgstr "填充未接收的产品"
+msgstr "在未接收的产品里选"
#. module: stock
#: field:stock.move,move_dest_id:0
@@ -1443,7 +1443,7 @@ msgstr "计划日期"
#: model:ir.actions.act_window,name:stock.action_picking_tree
#: model:ir.ui.menu,name:stock.menu_action_picking_tree
msgid "Outgoing Products"
-msgstr "发出的产品"
+msgstr "出仓单"
#. module: stock
#: selection:stock.location,icon:0
@@ -1463,7 +1463,7 @@ msgstr "STOCK_DELETE"
#. module: stock
#: model:account.journal,name:stock.stock_journal
msgid "Stock Journal"
-msgstr "库存记录集合"
+msgstr "库存业务类型"
#. module: stock
#: selection:stock.location,icon:0
@@ -1483,7 +1483,7 @@ msgstr "产品需求"
#. module: stock
#: model:stock.location,name:stock.stock_location_4
msgid "Maxtor Suppliers"
-msgstr "Maxtor供应商"
+msgstr "Maxtor 供应商"
#. module: stock
#: view:stock.picking:0
@@ -1583,7 +1583,7 @@ msgstr "数量(销售单位)"
#: model:ir.actions.act_window,name:stock.action_picking_tree5
#: model:ir.ui.menu,name:stock.menu_action_picking_tree5
msgid "Packing to Process"
-msgstr "装箱单处理"
+msgstr "分拣单处理"
#. module: stock
#: selection:stock.location,icon:0
@@ -1599,7 +1599,7 @@ msgstr "设为可用"
#: model:ir.actions.wizard,name:stock.make_picking
#: wizard_view:stock.picking.make,init:0
msgid "Make packing"
-msgstr "建立装箱单"
+msgstr "创建分拣单"
#. module: stock
#: field:stock.picking,backorder_id:0
@@ -1749,12 +1749,12 @@ msgstr "送货时指定批次"
#. module: stock
#: view:stock.picking:0
msgid "Split move lines in two"
-msgstr "把调拨明细线分为两部分"
+msgstr "拆分调拨明细"
#. module: stock
#: wizard_field:stock.invoice_onshipping,init,journal_id:0
msgid "Destination Journal"
-msgstr "目的地记录集合"
+msgstr "目标业务类型"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_stock_production_lot_2_stock_report_prodlots
@@ -1776,12 +1776,12 @@ msgstr "产品"
#. module: stock
#: wizard_button:stock.return.picking,init,return:0
msgid "Return"
-msgstr "退回"
+msgstr "退货"
#. module: stock
#: field:stock.picking,auto_picking:0
msgid "Auto-Packing"
-msgstr "自动装箱单"
+msgstr "自动创建分拣单"
#. module: stock
#: field:stock.move,product_uos:0
@@ -1843,7 +1843,7 @@ msgstr "STOCK_UNDO"
#. module: stock
#: model:ir.actions.wizard,name:stock.move_split
msgid "Split move line"
-msgstr "分割调拨明细"
+msgstr "拆分调拨明细"
#. module: stock
#: selection:stock.location,icon:0
@@ -2129,7 +2129,7 @@ msgstr "STOCK_GOTO_LAST"
#. module: stock
#: selection:stock.picking,invoice_state:0
msgid "Invoiced"
-msgstr "已开票"
+msgstr ""
#. module: stock
#: selection:stock.location,icon:0
@@ -2172,7 +2172,7 @@ msgstr "STOCK_JUSTIFY_CENTER"
#: model:ir.ui.menu,name:stock.menu_action_picking_tree3
#: model:ir.ui.menu,name:stock.menu_action_picking_tree8
msgid "Confirmed Packing Waiting Availability"
-msgstr "确认装箱单等待可用"
+msgstr "确认分拣单等待可用"
#. module: stock
#: field:stock.location,posy:0
@@ -2212,7 +2212,7 @@ msgstr "跟踪生产批次"
#. module: stock
#: view:stock.picking:0
msgid "Split in Two"
-msgstr "分割两个"
+msgstr "拆分"
#. module: stock
#: model:ir.actions.act_window,name:stock.act_product_stock_move_futur_open
@@ -2230,7 +2230,7 @@ msgstr "对于当前产品(模板)该库存库位默认作为产品需求的库
#. module: stock
#: model:ir.model,name:stock.model_stock_picking_move_wizard
msgid "stock.picking.move.wizard"
-msgstr "库存.装箱单.调拨.向导"
+msgstr ""
#. module: stock
#: model:res.request.link,name:stock.req_link_tracking
@@ -2291,7 +2291,7 @@ msgstr "打印产品标签"
#. module: stock
#: view:stock.move:0
msgid "Moves"
-msgstr "调拨"
+msgstr "凭证"
#. module: stock
#: field:stock.move,location_dest_id:0
@@ -2302,7 +2302,7 @@ msgstr "目标库位"
#. module: stock
#: wizard_button:stock.move.split,init,split:0
msgid "Split"
-msgstr "分割"
+msgstr "拆分"
#. module: stock
#: field:stock.location,account_id:0
@@ -2413,14 +2413,6 @@ msgstr "物理库位"
#~ msgid "Stock Management"
#~ msgstr "库存管理"
-#, python-format
-#~ msgid "No product in this location."
-#~ msgstr "该货位没有产品"
-
-#, python-format
-#~ msgid "Invoice cannot be created from Packing."
-#~ msgstr "不可从装箱单创建发票"
-
#, python-format
#~ msgid "You can only delete draft moves."
#~ msgstr "您只可删除草稿调拨"
@@ -2489,10 +2481,6 @@ msgstr "物理库位"
#~ msgid "Error, no partner !"
#~ msgstr "错误,无业务伙伴!"
-#, python-format
-#~ msgid "Return lines"
-#~ msgstr "退回明细"
-
#, python-format
#~ msgid "Message !"
#~ msgstr "消息!"
@@ -2518,10 +2506,6 @@ msgstr "物理库位"
#~ msgid "Unplanned Qty"
#~ msgstr "计划外数量"
-#, python-format
-#~ msgid "to be invoiced"
-#~ msgstr "需开发票"
-
#, python-format
#~ msgid "Produced Qty"
#~ msgstr "产品数量"
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f81de1c5faf..203b190053c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -3,7 +3,7 @@
-
+
@@ -1523,7 +1523,7 @@
+ states="draft,waiting,confirmed,assigned" groups="base.group_extended"/>
| |