openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05350
lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp-phonecalls_stages-rme into lp:~openerp-dev/openobject-addons/trunk-trunk-crm-imp-final
tfr (Openerp) has proposed merging lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp-phonecalls_stages-rme into lp:~openerp-dev/openobject-addons/trunk-trunk-crm-imp-final.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-openerp_crm_imp-phonecalls_stages-rme/+merge/57172
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-openerp_crm_imp-phonecalls_stages-rme/+merge/57172
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/trunk-openerp_crm_imp-phonecalls_stages-rme into lp:~openerp-dev/openobject-addons/trunk-trunk-crm-imp-final.
=== modified file 'account/account.py'
=== modified file 'account/account_invoice_view.xml'
=== modified file 'account/account_move_line.py'
=== modified file 'account/i18n/ca.po'
--- account/i18n/ca.po 2011-03-27 04:53:32 +0000
+++ account/i18n/ca.po 2011-04-11 14:26:52 +0000
@@ -7,15 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-26 18:10+0000\n"
+=======
+"PO-Revision-Date: 2011-03-20 18:47+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@xxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-27 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
=== modified file 'account/i18n/de.po'
--- account/i18n/de.po 2011-04-04 04:47:57 +0000
+++ account/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:24+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-13 22:46+0000\n"
+"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:49+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2729,9 +2739,13 @@
msgid ""
"The statement balance is incorrect !\n"
"The expected balance (%.2f) is different than the computed one. (%.2f)"
+<<<<<<< TREE
msgstr ""
"Der Belegsaldo ist falsch !\n"
"Der erwartete Saldo (%.2f) weicht vom errechneten ab. (%.2f)"
+=======
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -2988,12 +3002,21 @@
msgstr "Ansicht"
#. module: account
+<<<<<<< TREE
#: code:addons/account/account.py:2951
#, python-format
msgid "BNK%s"
msgstr "BNK%s"
#. module: account
+=======
+#: code:addons/account/account.py:2951
+#, python-format
+msgid "BNK%s"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
#: code:addons/account/account.py:2906
#: code:addons/account/installer.py:296
#, python-format
@@ -5813,8 +5836,13 @@
#. module: account
#: code:addons/account/invoice.py:997
#, python-format
+<<<<<<< TREE
msgid "Invoice '%s' is validated."
msgstr "Rechnung '%s' ist validiert."
+=======
+msgid "Invoice '%s' is validated."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: account
#: view:account.chart.template:0
=== modified file 'account/i18n/es.po'
--- account/i18n/es.po 2011-03-28 04:36:36 +0000
+++ account/i18n/es.po 2011-04-11 14:26:52 +0000
@@ -7,15 +7,26 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-27 11:05+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@xxxxxxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-01-18 11:21+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@xxxxxxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-28 04:36+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:54+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
=== modified file 'account/i18n/it.po'
--- account/i18n/it.po 2011-04-06 04:39:28 +0000
+++ account/i18n/it.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-05 12:13+0000\n"
"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-02-01 17:57+0000\n"
+"Last-Translator: Vincenzo Marino <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-06 04:39+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:50+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
=== modified file 'account/i18n/lv.po'
--- account/i18n/lv.po 2011-04-02 04:55:47 +0000
+++ account/i18n/lv.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,24 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-01 08:51+0000\n"
"Last-Translator: Vladimirs Kuzmins <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-12-12 02:11+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Latvian <lv@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-02 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:51+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
=== modified file 'account/i18n/nb.po'
--- account/i18n/nb.po 2011-03-31 04:36:40 +0000
+++ account/i18n/nb.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,24 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-30 13:55+0000\n"
"Last-Translator: Rolv RÃ¥en (adEgo) <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-20 22:15+0000\n"
+"Last-Translator: Terje Nauf <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Norwegian Bokmal <nb@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-31 04:36+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:52+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
=== modified file 'account/i18n/ro.po'
--- account/i18n/ro.po 2011-03-28 04:36:36 +0000
+++ account/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-27 08:22+0000\n"
"Last-Translator: filsys <office@xxxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-03-21 21:06+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-28 04:35+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-22 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: account
#: model:process.transition,name:account.process_transition_supplierreconcilepaid0
=== renamed file 'account/images/bank_statement.jpeg' => 'account/images/bank_statement.jpeg.OTHER'
Binary files account/images/bank_statement.jpeg 2011-03-22 11:00:18 +0000 and account/images/bank_statement.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'account/images/cash_register.jpeg' => 'account/images/cash_register.jpeg.OTHER'
Binary files account/images/cash_register.jpeg 2011-03-22 11:00:18 +0000 and account/images/cash_register.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'account/images/chart_of_accounts.jpeg' => 'account/images/chart_of_accounts.jpeg.OTHER'
Binary files account/images/chart_of_accounts.jpeg 2011-03-22 11:00:18 +0000 and account/images/chart_of_accounts.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'account/images/journal_entries.jpeg' => 'account/images/journal_entries.jpeg.OTHER'
Binary files account/images/journal_entries.jpeg 2011-03-22 11:00:18 +0000 and account/images/journal_entries.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'account/installer.py'
=== modified file 'account/invoice.py'
=== modified file 'account/wizard/account_invoice_refund.py'
=== modified file 'account_accountant/__openerp__.py'
--- account_accountant/__openerp__.py 2011-03-25 10:24:13 +0000
+++ account_accountant/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -24,6 +24,7 @@
"author" : "OpenERP SA",
"category": 'Finance',
"description": """
+<<<<<<< TREE
Accounting Access Rights.
=========================
@@ -32,6 +33,10 @@
It assigns manager and user access rights to the Administrator, and only
user rights to Demo user.
+=======
+This module gives the admin user the access to all the accounting features like the journal items and the chart of accounts.
+============================================================================================================================
+>>>>>>> MERGE-SOURCE
""",
'website': 'http://www.openerp.com',
'init_xml': [],
=== renamed file 'account_analytic_default/images/analytic_defaults.jpeg' => 'account_analytic_default/images/analytic_defaults.jpeg.OTHER'
Binary files account_analytic_default/images/analytic_defaults.jpeg 2011-03-22 11:00:18 +0000 and account_analytic_default/images/analytic_defaults.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'account_analytic_plans/__openerp__.py'
=== renamed file 'account_analytic_plans/images/analytic_plan.jpeg' => 'account_analytic_plans/images/analytic_plan.jpeg.OTHER'
Binary files account_analytic_plans/images/analytic_plan.jpeg 2011-03-22 11:00:18 +0000 and account_analytic_plans/images/analytic_plan.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'account_chart/__openerp__.py'
--- account_chart/__openerp__.py 2011-03-25 10:24:13 +0000
+++ account_chart/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -23,6 +23,7 @@
{
'name': 'Charts of Accounts',
'version': '1.1',
+<<<<<<< TREE
'category': 'Finance',
'description': """
Remove minimal account chart.
@@ -30,6 +31,13 @@
Deactivates minimal chart of accounts.
""",
+=======
+ 'category': 'Finance',
+ 'description': """
+Remove minimal account chart.
+=============================
+""",
+>>>>>>> MERGE-SOURCE
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['account'],
=== modified file 'account_coda/__openerp__.py'
--- account_coda/__openerp__.py 2011-03-25 10:24:13 +0000
+++ account_coda/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,10 +25,15 @@
"author" : "OpenERP SA",
"category" : "Finance",
"description": """
+<<<<<<< TREE
Module provides functionality to import bank statements from coda files.
========================================================================
Contains a wizard to import coda statements and maintains logs for the same.
+=======
+Module provides functionality to import bank statements from coda files.
+========================================================================
+>>>>>>> MERGE-SOURCE
""",
"images" : ["images/coda_logs.jpeg","images/import_coda_logs.jpeg"],
"depends" : ["account_voucher"],
=== modified file 'account_coda/i18n/hu.po'
--- account_coda/i18n/hu.po 2011-04-06 04:39:28 +0000
+++ account_coda/i18n/hu.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-05 11:29+0000\n"
"Last-Translator: Attila Tatár (Elastoffice) <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-30 16:58+0000\n"
+"Last-Translator: NOVOTRADE RENDSZERHÃZ <openerp@xxxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-06 04:39+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-31 04:57+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_coda
#: help:account.coda,journal_id:0
=== renamed file 'account_coda/images/coda_logs.jpeg' => 'account_coda/images/coda_logs.jpeg.OTHER'
Binary files account_coda/images/coda_logs.jpeg 2011-03-22 11:00:18 +0000 and account_coda/images/coda_logs.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'account_coda/images/import_coda_logs.jpeg' => 'account_coda/images/import_coda_logs.jpeg.OTHER'
Binary files account_coda/images/import_coda_logs.jpeg 2011-03-22 11:00:18 +0000 and account_coda/images/import_coda_logs.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'account_followup/__openerp__.py'
--- account_followup/__openerp__.py 2011-03-25 10:24:13 +0000
+++ account_followup/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -24,6 +24,7 @@
'version': '1.0',
'category': 'Finance',
'description': """
+<<<<<<< TREE
Modules to automate letters for unpaid invoices, with multi-level recalls.
==========================================================================
@@ -39,6 +40,24 @@
Note that if you want to check the followup level for a given partner/account entry, you can do from in the menu:
Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent
+=======
+Modules to automate letters for unpaid invoices, with multi-level recalls.
+==========================================================================
+
+You can define your multiple levels of recall through the menu:
+ Accounting/Configuration/Miscellaneous/Follow-Ups
+
+Once it is defined, you can automatically print recalls every day
+through simply clicking on the menu:
+ Accounting/Periodical Processing/Billing/Send followups
+
+It will generate a PDF with all the letters according to the the
+different levels of recall defined. You can define different policies
+for different companies. You can also send mail to the customer.
+
+Note that if you want to check the followup level for a given partner/account entry, you can do from in the menu:
+ Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
=== modified file 'account_followup/i18n/de.po'
--- account_followup/i18n/de.po 2011-04-04 04:47:57 +0000
+++ account_followup/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,25 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:25+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-12-25 10:13+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:46+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: code:addons/account_followup/wizard/account_followup_print.py:295
@@ -91,11 +102,14 @@
"\n"
"%s"
msgstr ""
+<<<<<<< TREE
"\n"
"\n"
"E-Mail ist erfolgreich an folgende Partners versendet worden. !\n"
"\n"
"%s"
+=======
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: view:account_followup.followup:0
@@ -544,9 +558,12 @@
"\n"
"%s"
msgstr ""
+<<<<<<< TREE
"Alle E-mails wurden erfolgreiche an folgende Partner versendet:.\n"
"\n"
"%s"
+=======
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: constraint:res.company:0
@@ -737,9 +754,12 @@
"\n"
"%s"
msgstr ""
+<<<<<<< TREE
"E-Mails wurde an folgende Partner nicht versendet, Email nicht vorhanden !\n"
"\n"
"%s"
+=======
+>>>>>>> MERGE-SOURCE
#. module: account_followup
#: view:account.followup.print:0
=== modified file 'account_invoice_layout/i18n/de.po'
--- account_invoice_layout/i18n/de.po 2011-04-03 04:40:09 +0000
+++ account_invoice_layout/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,25 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-02 21:15+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-13 19:57+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-03 04:39+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:33+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: account_invoice_layout
#: selection:account.invoice.line,state:0
=== renamed file 'account_payment/images/payment_order.jpeg' => 'account_payment/images/payment_order.jpeg.OTHER'
Binary files account_payment/images/payment_order.jpeg 2011-03-22 11:00:18 +0000 and account_payment/images/payment_order.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'account_sequence/__openerp__.py'
--- account_sequence/__openerp__.py 2011-03-25 10:24:13 +0000
+++ account_sequence/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -24,6 +24,7 @@
'version': '1.1',
'category': 'Finance',
'description': """
+<<<<<<< TREE
This module maintains internal sequence number for accounting entries.
======================================================================
@@ -35,6 +36,10 @@
* Next Number
* Increment Number
* Number Padding
+=======
+This module maintains internal sequence number for accounting entries.
+======================================================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== modified file 'account_sequence/i18n/es.po'
--- account_sequence/i18n/es.po 2011-03-28 04:36:36 +0000
+++ account_sequence/i18n/es.po 2011-04-11 14:26:52 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Spanish translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
@@ -233,3 +234,240 @@
#: constraint:account.move.line:0
msgid "You can not create move line on view account."
msgstr "No puede crear un movimiento en una cuenta de tipo vista."
+=======
+# Spanish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+"PO-Revision-Date: 2011-03-12 16:04+0000\n"
+"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
+"<jesteve@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Spanish <es@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-13 04:50+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+#: model:ir.actions.act_window,name:account_sequence.action_account_seq_installer
+msgid "Account Sequence Application Configuration"
+msgstr "Configuración de Aplicación de Secuencia de Cuenta"
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create entries on different periods/journals in the same move"
+msgstr ""
+"No puede crear asientos con movimientos en distintos periodos/diarios"
+
+#. module: account_sequence
+#: help:account.move,internal_sequence_number:0
+#: help:account.move.line,internal_sequence_number:0
+msgid "Internal Sequence Number"
+msgstr "Número de secuencia interno"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_next:0
+msgid "Next number of this sequence"
+msgstr "Próximo número de secuencia"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_next:0
+msgid "Next Number"
+msgstr "Proximo numero"
+
+#. module: account_sequence
+#: field:account.sequence.installer,number_increment:0
+msgid "Increment Number"
+msgstr "Incremento del número"
+
+#. module: account_sequence
+#: model:ir.module.module,description:account_sequence.module_meta_information
+msgid ""
+"\n"
+" This module maintains internal sequence number for accounting entries.\n"
+" "
+msgstr ""
+"\n"
+" Este módulo gestiona el número de secuencia interno para los asientos "
+"contables\n"
+" "
+
+#. module: account_sequence
+#: model:ir.module.module,shortdesc:account_sequence.module_meta_information
+msgid "Entries Sequence Numbering"
+msgstr "Numeración de la secuencia de asientos"
+
+#. module: account_sequence
+#: help:account.sequence.installer,number_increment:0
+msgid "The next number of the sequence will be incremented by this number"
+msgstr ""
+"El número siguiente de esta secuencia será incrementado por este número."
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure Your Account Sequence Application"
+msgstr "Configurar su Aplicación de Secuencia de la Cuenta"
+
+#. module: account_sequence
+#: field:account.sequence.installer,progress:0
+msgid "Configuration Progress"
+msgstr "Progreso de la configuración"
+
+#. module: account_sequence
+#: help:account.sequence.installer,suffix:0
+msgid "Suffix value of the record for the sequence"
+msgstr "Valor del sufijo del registro para la secuencia."
+
+#. module: account_sequence
+#: field:account.sequence.installer,company_id:0
+msgid "Company"
+msgstr "CompañÃa"
+
+#. module: account_sequence
+#: help:account.journal,internal_sequence_id:0
+msgid ""
+"This sequence will be used to maintain the internal number for the journal "
+"entries related to this journal."
+msgstr ""
+"Esta secuencia se utilizará para gestionar el número interno para los "
+"asientos relacionados con este diario."
+
+#. module: account_sequence
+#: field:account.sequence.installer,padding:0
+msgid "Number padding"
+msgstr "Relleno del número"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move_line
+msgid "Journal Items"
+msgstr "Registros del diario"
+
+#. module: account_sequence
+#: field:account.move,internal_sequence_number:0
+#: field:account.move.line,internal_sequence_number:0
+msgid "Internal Number"
+msgstr "Número interno"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "Company must be same for its related account and period."
+msgstr "La compañÃa debe ser la misma para la cuenta y periodo relacionados."
+
+#. module: account_sequence
+#: help:account.sequence.installer,padding:0
+msgid ""
+"OpenERP will automatically adds some '0' on the left of the 'Next Number' to "
+"get the required padding size."
+msgstr ""
+"OpenERP automáticamente añadirá algunos '0' a la izquierda del 'Número "
+"siguiente' para obtener el tamaño de relleno necesario."
+
+#. module: account_sequence
+#: field:account.sequence.installer,name:0
+msgid "Name"
+msgstr "Nombre"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on closed account."
+msgstr "No puede crear un movimiento sobre una cuenta cerrada."
+
+#. module: account_sequence
+#: constraint:account.move:0
+msgid ""
+"You cannot create more than one move per period on centralized journal"
+msgstr ""
+"No puede crear más de un movimiento por periodo en un diario centralizado"
+
+#. module: account_sequence
+#: sql_constraint:account.move.line:0
+msgid "Wrong credit or debit value in accounting entry !"
+msgstr "¡Valor haber o debe erróneo en el asiento contable!"
+
+#. module: account_sequence
+#: field:account.journal,internal_sequence_id:0
+msgid "Internal Sequence"
+msgstr "Secuencia interna"
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_sequence_installer
+msgid "account.sequence.installer"
+msgstr "contabilidad.secuencia.instalador"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "Configure"
+msgstr "Configurar"
+
+#. module: account_sequence
+#: help:account.sequence.installer,prefix:0
+msgid "Prefix value of the record for the sequence"
+msgstr "Valor del prefijo del registro para la secuencia."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_move
+msgid "Account Entry"
+msgstr "Entrada contable"
+
+#. module: account_sequence
+#: field:account.sequence.installer,suffix:0
+msgid "Suffix"
+msgstr "Sufijo"
+
+#. module: account_sequence
+#: field:account.sequence.installer,config_logo:0
+msgid "Image"
+msgstr "Imagen"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "title"
+msgstr "TÃtulo"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "¡El nombre del diaro debe ser único por compañÃa!"
+
+#. module: account_sequence
+#: field:account.sequence.installer,prefix:0
+msgid "Prefix"
+msgstr "Prefijo"
+
+#. module: account_sequence
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "¡El código del diario debe ser único por compañÃa!"
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid ""
+"You can not create move line on receivable/payable account without partner"
+msgstr ""
+"No puede crear un movimiento en una cuenta a cobrar/a pagar sin una empresa."
+
+#. module: account_sequence
+#: model:ir.model,name:account_sequence.model_account_journal
+msgid "Journal"
+msgstr "Diario"
+
+#. module: account_sequence
+#: view:account.sequence.installer:0
+msgid "You can enhance the Account Sequence Application by installing ."
+msgstr ""
+"Puede realzar la Aplicación de Secuencia de la Cuenta mediante instalación ."
+
+#. module: account_sequence
+#: constraint:account.move.line:0
+msgid "You can not create move line on view account."
+msgstr "No puede crear un movimiento en una cuenta de tipo vista."
+>>>>>>> MERGE-SOURCE
=== renamed file 'account_voucher/images/customer_payment.jpeg' => 'account_voucher/images/customer_payment.jpeg.OTHER'
Binary files account_voucher/images/customer_payment.jpeg 2011-03-22 11:00:18 +0000 and account_voucher/images/customer_payment.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'account_voucher/images/journal_voucher.jpeg' => 'account_voucher/images/journal_voucher.jpeg.OTHER'
Binary files account_voucher/images/journal_voucher.jpeg 2011-03-22 11:00:18 +0000 and account_voucher/images/journal_voucher.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'account_voucher/images/sales_receipt.jpeg' => 'account_voucher/images/sales_receipt.jpeg.OTHER'
Binary files account_voucher/images/sales_receipt.jpeg 2011-03-22 11:00:18 +0000 and account_voucher/images/sales_receipt.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'account_voucher/images/supplier_voucher.jpeg' => 'account_voucher/images/supplier_voucher.jpeg.OTHER'
Binary files account_voucher/images/supplier_voucher.jpeg 2011-03-22 11:00:18 +0000 and account_voucher/images/supplier_voucher.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'analytic/__openerp__.py'
--- analytic/__openerp__.py 2011-03-25 10:24:13 +0000
+++ analytic/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -26,6 +26,7 @@
"website" : "http://www.openerp.com";,
"category" : "Finance",
"depends" : ["base", "decimal_precision"],
+<<<<<<< TREE
"description": """
Module for defining analytic accounting object.
===============================================
@@ -33,6 +34,11 @@
In OpenERP, analytic accounts are linked to general accounts but are treated
totally independently. So you can enter various different analytic operations
that have no counterpart in the general financial accounts.
+=======
+ "description": """
+Module for defining analytic accounting object.
+===============================================
+>>>>>>> MERGE-SOURCE
""",
"init_xml" : [],
"update_xml": ['security/analytic_security.xml',
=== modified file 'analytic/analytic.py'
--- analytic/analytic.py 2011-04-07 11:41:45 +0000
+++ analytic/analytic.py 2011-04-11 14:26:52 +0000
@@ -115,6 +115,7 @@
result = {}
if context is None:
context = {}
+<<<<<<< TREE
for account in self.browse(cr, uid, ids, context=context):
result[account.id] = map(lambda x: x.id, [child for child in account.child_ids if child.state != 'template'])
@@ -146,6 +147,14 @@
else:
result[rec.id] = rec.currency_id.id
return result
+=======
+
+ for account in self.browse(cr, uid, ids, context=context):
+ result[account.id] = map(lambda x: x.id, [child for child in account.child_ids if child.state != 'template'])
+
+ return result
+
+>>>>>>> MERGE-SOURCE
_columns = {
'name': fields.char('Account Name', size=128, required=True),
=== modified file 'anonymization/__openerp__.py'
--- anonymization/__openerp__.py 2011-03-22 13:21:41 +0000
+++ anonymization/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -27,6 +27,7 @@
'category': 'Tools',
'description': """
This module allows you to anonymize a database.
+<<<<<<< TREE
===============================================
This module allows you to keep your data confidential for a given database.
@@ -36,6 +37,9 @@
by ‘XXX’ characters). Then you can send the anonymized database to the migration
team. Once you get back your migrated database, you restore it and reverse the
anonymization process to recover your previous data.
+=======
+===============================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== renamed file 'anonymization/images/anonymization1.jpeg' => 'anonymization/images/anonymization1.jpeg.OTHER'
Binary files anonymization/images/anonymization1.jpeg 2011-03-21 13:37:47 +0000 and anonymization/images/anonymization1.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'anonymization/images/anonymization3.jpeg' => 'anonymization/images/anonymization3.jpeg.OTHER'
Binary files anonymization/images/anonymization3.jpeg 2011-03-21 13:37:47 +0000 and anonymization/images/anonymization3.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'association/__openerp__.py'
--- association/__openerp__.py 2011-03-25 10:24:13 +0000
+++ association/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,12 +25,19 @@
'version': '0.1',
'category': 'General',
'category': 'Profile',
+<<<<<<< TREE
'description': """
This module is to configure modules related to an association.
==============================================================
It installs the profile for associations to manage events, registrations, memberships, membership products (schemes), etc.
""",
+=======
+ 'description': """
+This module is to configure modules related to an association.
+==============================================================
+ """,
+>>>>>>> MERGE-SOURCE
'author': 'OpenERP SA',
'depends': ['membership', 'event'],
'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'],
=== modified file 'association/i18n/ro.po'
--- association/i18n/ro.po 2011-03-25 04:40:36 +0000
+++ association/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-24 12:12+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-12 11:38+0000\n"
+"Last-Translator: <>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: association
#: field:profile.association.config.install_modules_wizard,wiki:0
=== modified file 'auction/__openerp__.py'
--- auction/__openerp__.py 2011-03-25 10:24:13 +0000
+++ auction/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,20 +25,36 @@
'version': '1.0',
'category': 'General',
'description': """
-This module manages the records of artists, auction articles, buyers and sellers.
-=================================================================================
-
-It completely manages an auction such as managing bids,
-keeping track of the sold articles along with the paid
-and unpaid objects including delivery of the articles.
-
-The dashboard for auction includes:
- * Latest Objects (list)
- * Latest Deposits (list)
- * Objects Statistics (list)
- * Total Adjudications (graph)
- * Min/Adj/Max (graph)
- * Objects By Day (graph)
+<<<<<<< TREE
+This module manages the records of artists, auction articles, buyers and sellers.
+=================================================================================
+
+It completely manages an auction such as managing bids,
+keeping track of the sold articles along with the paid
+and unpaid objects including delivery of the articles.
+
+The dashboard for auction includes:
+ * Latest Objects (list)
+ * Latest Deposits (list)
+ * Objects Statistics (list)
+ * Total Adjudications (graph)
+ * Min/Adj/Max (graph)
+ * Objects By Day (graph)
+=======
+This module manages the records of artists, auction articles, buyers and sellers.
+=================================================================================
+
+It completely manages an auction such as managing bids,
+keeping track of the sold articles along with the paid
+and unpaid objects including delivery of the articles.
+The dashboard for auction includes:
+ * Latest Objects (list)
+ * Latest Deposits (list)
+ * Objects Statistics (list)
+ * Total Adjudications (graph)
+ * Min/Adj/Max (graph)
+ * Objects By Day (graph)
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'depends': ['base', 'account', 'hr_attendance'],
=== modified file 'auction/i18n/pt_BR.po'
--- auction/i18n/pt_BR.po 2011-03-23 04:36:07 +0000
+++ auction/i18n/pt_BR.po 2011-04-11 14:26:52 +0000
@@ -13,8 +13,13 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-22 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: auction
#: model:ir.ui.menu,name:auction.auction_report_menu
=== renamed file 'auction/images/auction1.jpeg' => 'auction/images/auction1.jpeg.OTHER'
Binary files auction/images/auction1.jpeg 2011-03-21 13:37:47 +0000 and auction/images/auction1.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'auction/images/auction3.jpeg' => 'auction/images/auction3.jpeg.OTHER'
Binary files auction/images/auction3.jpeg 2011-03-21 13:37:47 +0000 and auction/images/auction3.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'audittrail/images/audittrail2.jpeg' => 'audittrail/images/audittrail2.jpeg.OTHER'
Binary files audittrail/images/audittrail2.jpeg 2011-03-21 13:37:47 +0000 and audittrail/images/audittrail2.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'base_action_rule/__openerp__.py'
--- base_action_rule/__openerp__.py 2011-03-25 10:24:13 +0000
+++ base_action_rule/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -24,6 +24,7 @@
'version': '1.0',
'category': 'Tools',
'category': 'Generic Modules/Others',
+<<<<<<< TREE
'description': """
This module allows to implement action rules for any object.
============================================================
@@ -34,6 +35,12 @@
sales team, or an opportunity which still has status pending after 14 days might
trigger an automatic reminder email.
""",
+=======
+ 'description': """
+This module allows to implement action rules for any object.
+============================================================
+ """,
+>>>>>>> MERGE-SOURCE
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['base'],
=== modified file 'base_action_rule/i18n/sr@xxxxxxxx'
--- base_action_rule/i18n/sr@xxxxxxxx 2011-03-29 04:40:41 +0000
+++ base_action_rule/i18n/sr@xxxxxxxx 2011-04-11 14:26:52 +0000
@@ -8,14 +8,24 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-28 20:48+0000\n"
"Last-Translator: Olivier Dony (OpenERP) <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-12-23 16:14+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Serbian latin <sr@latin@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-29 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_action_rule
#: help:base.action.rule,act_mail_to_user:0
=== renamed file 'base_action_rule/images/base_action_rule3.jpeg' => 'base_action_rule/images/base_action_rule3.jpeg.OTHER'
Binary files base_action_rule/images/base_action_rule3.jpeg 2011-03-21 13:37:47 +0000 and base_action_rule/images/base_action_rule3.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'base_contact/__openerp__.py'
--- base_contact/__openerp__.py 2011-03-25 10:24:13 +0000
+++ base_contact/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,6 +25,7 @@
'version': '1.0',
'category': 'Tools',
'description': """
+<<<<<<< TREE
This module allows you to manage your contacts entirely.
========================================================
@@ -38,6 +39,21 @@
Sales / Address Book / Contacts
Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
+=======
+This module allows you to manage your contacts entirely.
+========================================================
+
+It lets you define
+ *contacts unrelated to a partner,
+ *contacts working at several addresses (possibly for different partners),
+ *contacts with possibly different functions for each of its job's addresses
+
+It also adds new menu items located in
+ Purchases / Address Book / Contacts
+ Sales / Address Book / Contacts
+
+Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object.
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== renamed file 'base_contact/images/base_contact1.jpeg' => 'base_contact/images/base_contact1.jpeg.OTHER'
Binary files base_contact/images/base_contact1.jpeg 2011-03-23 10:12:01 +0000 and base_contact/images/base_contact1.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'base_contact/images/base_contact2.jpeg' => 'base_contact/images/base_contact2.jpeg.OTHER'
Binary files base_contact/images/base_contact2.jpeg 2011-03-23 10:12:01 +0000 and base_contact/images/base_contact2.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'base_contact/images/base_contact3.jpeg' => 'base_contact/images/base_contact3.jpeg.OTHER'
Binary files base_contact/images/base_contact3.jpeg 2011-03-23 10:12:01 +0000 and base_contact/images/base_contact3.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'base_iban/__openerp__.py'
=== renamed file 'base_module_doc_rst/images/base_module_doc_rst1.jpeg' => 'base_module_doc_rst/images/base_module_doc_rst1.jpeg.OTHER'
Binary files base_module_doc_rst/images/base_module_doc_rst1.jpeg 2011-03-21 13:37:47 +0000 and base_module_doc_rst/images/base_module_doc_rst1.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'base_module_quality/i18n/de.po'
--- base_module_quality/i18n/de.po 2011-04-04 04:47:57 +0000
+++ base_module_quality/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,25 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:23+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-15 22:47+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:58+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: base_module_quality
#: code:addons/base_module_quality/object_test/object_test.py:187
@@ -389,8 +400,13 @@
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:116
#, python-format
+<<<<<<< TREE
msgid "Error in Read method: %s"
msgstr "Fehler beim Lesen: %s"
+=======
+msgid "Error in Read method: %s"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: base_module_quality
#: code:addons/base_module_quality/speed_test/speed_test.py:138
=== renamed file 'base_module_quality/images/base_module_quality2.jpeg' => 'base_module_quality/images/base_module_quality2.jpeg.OTHER'
Binary files base_module_quality/images/base_module_quality2.jpeg 2011-03-21 13:37:47 +0000 and base_module_quality/images/base_module_quality2.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'base_module_quality/images/base_module_quality3.jpeg' => 'base_module_quality/images/base_module_quality3.jpeg.OTHER'
Binary files base_module_quality/images/base_module_quality3.jpeg 2011-03-21 13:37:47 +0000 and base_module_quality/images/base_module_quality3.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'base_module_record/images/base_module_record1.jpeg' => 'base_module_record/images/base_module_record1.jpeg.OTHER'
Binary files base_module_record/images/base_module_record1.jpeg 2011-03-21 13:37:47 +0000 and base_module_record/images/base_module_record1.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'base_synchro/__openerp__.py'
--- base_synchro/__openerp__.py 2011-03-25 10:24:13 +0000
+++ base_synchro/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -23,6 +23,7 @@
"name":"Server Object Synchronization",
"version":"0.1",
"author":"OpenERP SA",
+<<<<<<< TREE
"category":"Tools",
"description": """
Synchronization with all objects.
@@ -30,6 +31,13 @@
Configure servers and trigger synchronization with its database objects.
""",
+=======
+ "category":"Tools",
+ "description": """
+Synchronization with all objects.
+=================================
+ """,
+>>>>>>> MERGE-SOURCE
"depends":["base"],
"demo_xml":[],
"update_xml":[ "wizard/base_synchro_view.xml",
=== modified file 'base_tools/__openerp__.py'
--- base_tools/__openerp__.py 2011-03-22 13:21:41 +0000
+++ base_tools/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -6,10 +6,15 @@
"depends": ["base"],
"category" : "Tools",
'description': """
+<<<<<<< TREE
Common base for tools modules.
==============================
Creates menu link for Tools from where tools like survey, lunch, idea, etc. are accessible if installed.
+=======
+Common base for tools modules.
+==============================
+>>>>>>> MERGE-SOURCE
""",
"init_xml": [],
"update_xml": [
=== renamed file 'base_vat/images/1_partner_vat.jpeg' => 'base_vat/images/1_partner_vat.jpeg.OTHER'
Binary files base_vat/images/1_partner_vat.jpeg 2011-03-23 10:12:01 +0000 and base_vat/images/1_partner_vat.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'board/i18n/ro.po'
--- board/i18n/ro.po 2011-03-27 04:53:32 +0000
+++ board/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:14+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-26 06:04+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-01-19 21:03+0000\n"
+"Last-Translator: Mihai Boiciuc <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-27 04:53+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-20 04:53+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: board
#: view:res.log.report:0
=== renamed file 'board/images/3_admin_dashboard.jpeg' => 'board/images/3_admin_dashboard.jpeg.OTHER'
Binary files board/images/3_admin_dashboard.jpeg 2011-03-21 13:37:47 +0000 and board/images/3_admin_dashboard.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'caldav/images/calendars.jpeg' => 'caldav/images/calendars.jpeg.OTHER'
Binary files caldav/images/calendars.jpeg 2011-03-21 13:37:47 +0000 and caldav/images/calendars.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'crm/__openerp__.py'
--- crm/__openerp__.py 2011-03-25 10:24:13 +0000
+++ crm/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -45,11 +45,18 @@
The CRM module has a email gateway for the synchronisation interface
between mails and OpenERP.
+<<<<<<< TREE
Creates a dashboard for CRM that includes:
* Opportunities by Categories (graph)
* Opportunities by Stage (graph)
* Planned Revenue by Stage and User (graph)
+=======
+Creates a dashboard for CRM that includes:
+ * Opportunities by Categories (graph)
+ * Opportunities by Stage (graph)
+ * Planned Revenue by Stage and User (graph)
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
@@ -133,6 +140,10 @@
'installable': True,
'active': False,
'certificate': '0079056041421',
+<<<<<<< TREE
'images': ['images/sale_crm_crm_dashboard.png', 'images/crm_dashboard.jpeg','images/leads.jpeg','images/meetings.jpeg','images/opportunities.jpeg','images/outbound_calls.jpeg','images/stages.jpeg'],
+=======
+ 'images': ['images/crm_dashboard.jpeg','images/leads.jpeg','images/meetings.jpeg','images/opportunities.jpeg','images/outbound_calls.jpeg','images/stages.jpeg'],
+>>>>>>> MERGE-SOURCE
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'crm/crm.py'
--- crm/crm.py 2011-03-04 12:53:34 +0000
+++ crm/crm.py 2011-04-11 14:26:52 +0000
@@ -570,7 +570,7 @@
'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of case stages."),
'probability': fields.float('Probability (%)', required=True, help="This percentage depicts the default/average probability of the Case for this stage to be a success"),
'on_change': fields.boolean('Change Probability Automatically', \
- help="Change Probability on next and previous stages."),
+ help="If checked, OpenERP will set the probability of the opportunity to the probability defined in the stage. If you set a probability of 0%/100% on check the 'Change Probability Automatically' field, OpenERP will assign this stage when the opportunity is marked as Lost/Won."),
'requirements': fields.text('Requirements'),
'type': fields.selection(_get_type_value, 'Type', required=True),
}
@@ -725,9 +725,14 @@
_name = "crm.case.resource.type"
_description = "Campaign"
_rec_name = "name"
+
+ def _get_resource_type_value(self, cr, user, context=None):
+ return [('crm_case','Lead / Opportunity')]
+
_columns = {
'name': fields.char('Campaign Name', size=64, required=True, translate=True),
'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+ 'type': fields.selection(_get_resource_type_value, 'Type')
}
crm_case_resource_type()
=== modified file 'crm/crm_lead.py'
--- crm/crm_lead.py 2011-04-07 09:27:30 +0000
+++ crm/crm_lead.py 2011-04-11 14:26:52 +0000
@@ -310,7 +310,22 @@
message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
self.log(cr, uid, case.id, message)
return super(crm_lead,self).write(cr, uid, ids, vals, context)
-
+<<<<<<< TREE
+
+=======
+
+ def stage_historize(self, cr, uid, ids, stage, context=None):
+ stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, stage, context=context)
+ self.history(cr, uid, ids, _('Stage'), details=stage_obj.name)
+ for case in self.browse(cr, uid, ids, context=context):
+ if case.type == 'lead':
+ message = _("The stage of lead '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+ elif case.type == 'opportunity':
+ message = _("The stage of opportunity '%s' has been changed to '%s'.") % (case.name, stage_obj.name)
+ self.log(cr, uid, case.id, message)
+ return True
+
+>>>>>>> MERGE-SOURCE
def stage_next(self, cr, uid, ids, context=None):
stage = super(crm_lead, self).stage_next(cr, uid, ids, context=context)
if stage:
=== modified file 'crm/crm_lead_data.xml'
--- crm/crm_lead_data.xml 2011-01-14 00:11:01 +0000
+++ crm/crm_lead_data.xml 2011-04-11 14:26:52 +0000
@@ -57,41 +57,49 @@
<record model="crm.case.resource.type" id="type_lead1">
<field name="name">Telesales</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
<record model="crm.case.resource.type" id="type_lead2">
<field name="name">Mail Campaign 1</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
<record model="crm.case.resource.type" id="type_lead3">
<field name="name">Mail Campaign 2</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
<record model="crm.case.resource.type" id="type_lead4">
<field name="name">Twitter Ads</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
<record model="crm.case.resource.type" id="type_lead5">
<field name="name">Google Adwords</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
<record model="crm.case.resource.type" id="type_lead6">
<field name="name">Google Adwords 2</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
<record model="crm.case.resource.type" id="type_lead7">
<field name="name">Television</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
<record model="crm.case.resource.type" id="type_lead8">
<field name="name">Newsletter</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
</data>
=== modified file 'crm/crm_lead_view.xml'
--- crm/crm_lead_view.xml 2011-04-07 09:27:30 +0000
+++ crm/crm_lead_view.xml 2011-04-11 14:26:52 +0000
@@ -71,19 +71,16 @@
string="Convert to Opportunity"
help="Convert to Opportunity" icon="gtk-go-forward"
type="object"/>
- <newline />
+ <newline/>
<field name="user_id" />
<field name="section_id" widget="selection" />
- <field name="stage_id" domain="[('type','=','lead'),('section_ids', '=', section_id)]" />
- <group col="2" colspan="1">
- <button name="stage_previous" string=""
- states="open,pending,draft" type="object"
- icon="gtk-go-back" context="{'stage_type': 'lead'}" />
- <button name="stage_next" string=""
- states="open,pending,draft" type="object"
- icon="gtk-go-forward" context="{'stage_type': 'lead'}" />
- </group>
<field name="type" invisible="1"/>
+ <label string="" colspan="2"/>
+ <button
+ string="Schedule/Log Call"
+ name="%(opportunity2phonecall_act)d"
+ icon="terp-call-start"
+ type="action"/>
</group>
<notebook colspan="4">
<page string="Lead">
@@ -156,7 +153,7 @@
<field name="company_id"
groups="base.group_multi_company"
widget="selection" colspan="2" />
- <field name="type_id" select="1" widget="selection"/>
+ <field name="type_id" select="1" widget="selection" domain="[('type','=','crm_case')]"/>
<field name="channel_id" select="1" widget="selection"/>
<field name="referred"/>
</group>
=== modified file 'crm/crm_opportunity_data.xml'
--- crm/crm_opportunity_data.xml 2011-01-14 00:11:01 +0000
+++ crm/crm_opportunity_data.xml 2011-04-11 14:26:52 +0000
@@ -99,10 +99,12 @@
<record model="crm.case.resource.type" id="type_oppor1">
<field name="name">Campaign 2</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
<record model="crm.case.resource.type" id="type_oppor2">
<field name="name">Campaign 1</field>
<field name="section_id" ref="section_sales_department"/>
+ <field name="type">crm_case</field>
</record>
</data>
=== modified file 'crm/crm_opportunity_view.xml'
--- crm/crm_opportunity_view.xml 2011-04-07 09:27:30 +0000
+++ crm/crm_opportunity_view.xml 2011-04-11 14:26:52 +0000
@@ -126,7 +126,7 @@
</group>
<group colspan="2" col="2">
<separator string="Categorization" colspan="2"/>
- <field name="type_id" widget="selection" groups="base.group_extended"/>
+ <field name="type_id" widget="selection" groups="base.group_extended" domain="[('type','=','crm_case')]"/>
<field name="channel_id" widget="selection"/>
</group>
<group colspan="2" col="2">
=== modified file 'crm/crm_phonecall.py'
--- crm/crm_phonecall.py 2011-01-31 13:29:31 +0000
+++ crm/crm_phonecall.py 2011-04-11 14:26:52 +0000
@@ -53,13 +53,13 @@
('draft', 'Draft'),
('open', 'Todo'),
('cancel', 'Cancelled'),
- ('done', 'Done'),
- ('pending', 'Pending'),
+ ('done', 'Called Log'),
+ ('pending', 'Schedule Call'),
], 'State', size=16, readonly=True,
help='The state is set to \'Draft\', when a case is created.\
\nIf the case is in progress the state is set to \'Open\'.\
- \nWhen the case is over, the state is set to \'Done\'.\
- \nIf the case needs to be reviewed then the state is set to \'Pending\'.'),
+ \nWhen the case is over, the state is set to \'Called Log\'.\
+ \nIf the case needs to be reviewed then the state is set to \'Schedule\'.'),
'email_from': fields.char('Email', size=128, help="These people will receive email."),
'date_open': fields.datetime('Opened', readonly=True),
# phonecall fields
@@ -81,6 +81,7 @@
'date': fields.datetime('Date'),
'opportunity_id': fields.many2one ('crm.lead', 'Opportunity'),
'message_ids': fields.one2many('mailgate.message', 'res_id', 'Messages', domain=[('model','=',_name)]),
+ 'category': fields.char('Category', size=128),
}
_defaults = {
@@ -101,6 +102,13 @@
res['value']['partner_phone'] = address.phone
res['value']['partner_mobile'] = address.mobile
return res
+
+ def onchange_categ_id(self, cr, uid, ids, categ_id):
+ v={}
+ if categ_id:
+ categ = self.pool.get('crm.case.categ').browse(cr, uid, categ_id)
+ v['category']=categ.name
+ return {'value': v}
def case_close(self, cr, uid, ids, *args):
"""Overrides close for crm_case for setting close date
@@ -113,9 +121,14 @@
for phone in self.browse(cr, uid, ids):
phone_id= phone.id
data = {'date_closed': time.strftime('%Y-%m-%d %H:%M:%S')}
+ phone_type_obj = self.pool.get('crm.case.categ')
+ phone_type_ids = phone_type_obj.search(cr, uid, [('name', '=', 'Log A Call')], limit=1)
+ if not phone_type_ids:
+ raise osv.except_osv(_('Error !'),
+ _('There is no phonecall type/category "Log A Call" defined'))
if phone.duration <=0:
duration = datetime.now() - datetime.strptime(phone.date, '%Y-%m-%d %H:%M:%S')
- data.update({'duration': duration.seconds/float(60)})
+ data.update({'duration': duration.seconds/float(60), 'categ_id':phone_type_ids[0]})
res = super(crm_phonecall, self).case_close(cr, uid, [phone_id], args)
self.write(cr, uid, ids, data)
return res
@@ -145,6 +158,23 @@
self.write(cr, uid, ids, {'date_open': time.strftime('%Y-%m-%d %H:%M:%S')})
return res
+ def case_pending(self, cr, uid, ids, *args):
+ """Marks case as pending
+ @param self: The object pointer
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of case Ids
+ @param *args: Tuple Value for additional Params
+ """
+ phone_type_obj = self.pool.get('crm.case.categ')
+ res = super(crm_phonecall, self).case_pending(cr, uid, ids, args)
+ phone_type_ids = phone_type_obj.search(cr, uid, [('name', '=', 'Schedule Call')], limit=1)
+ if not phone_type_ids:
+ raise osv.except_osv(_('Error !'),
+ _('There is no phonecall type/category "Schedule Call" defined'))
+ self.pool.get('crm.phonecall').write(cr, uid, ids,{'categ_id':phone_type_ids[0], 'state' : 'pending'})
+ return res
+
def action_make_meeting(self, cr, uid, ids, context=None):
"""
This opens Meeting's calendar view to schedule meeting on current Phonecall
=== modified file 'crm/crm_phonecall_data.xml'
--- crm/crm_phonecall_data.xml 2011-01-14 00:11:01 +0000
+++ crm/crm_phonecall_data.xml 2011-04-11 14:26:52 +0000
@@ -5,13 +5,13 @@
Phonecall Categories
-->
<record model="crm.case.categ" id="categ_phone1">
- <field name="name">Inbound</field>
+ <field name="name">Log A Call</field>
<field name="section_id" ref="section_sales_department"/>
<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
</record>
<record model="crm.case.categ" id="categ_phone2">
- <field name="name">Outbound</field>
+ <field name="name">Schedule Call</field>
<field name="section_id" ref="section_sales_department"/>
<field name="object_id" search="[('model','=','crm.phonecall')]" model="ir.model"/>
</record>
=== modified file 'crm/crm_phonecall_menu.xml'
--- crm/crm_phonecall_menu.xml 2011-01-27 09:49:39 +0000
+++ crm/crm_phonecall_menu.xml 2011-04-11 14:26:52 +0000
@@ -60,54 +60,15 @@
groups="base.group_extended,base.group_sale_salesman"
parent="base.menu_base_partner" sequence="4" />
- <record model="ir.actions.act_window" id="crm_case_categ_phone_incoming0">
- <field name="name">Inbound</field>
- <field name="res_model">crm.phonecall</field>
- <field name="view_type">form</field>
- <field name="view_mode">tree,calendar</field>
- <field name="view_id" ref="crm_case_phone_tree_view"/>
- <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone1'))+')]'"/>
- <field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1,\'search_default_today\':1, \'default_categ_id\': ' + str(ref('categ_phone1')) +'}'"/>
- <field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
- <field name="help">The Inbound Calls tool allows you to log your inbound calls on the fly. Each call you get will appear on the partner form to trace every contact you have with a partner. From the phone call form, you can trigger a request for another call, a meeting or an opportunity.</field>
-
- </record>
-
- <record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_incoming0">
- <field name="sequence" eval="1"/>
- <field name="view_mode">tree</field>
- <field name="view_id" ref="crm_case_inbound_phone_tree_view"/>
- <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
- </record>
-
- <record model="ir.actions.act_window.view" id="action_crm_tag_calendar_phone_incoming0">
- <field name="sequence" eval="2"/>
- <field name="view_mode">calendar</field>
- <field name="view_id" ref="crm_case_phone_calendar_view"/>
- <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
- </record>
-
- <record model="ir.actions.act_window.view" id="action_crm_tag_form_phone_incoming0">
- <field name="sequence" eval="3"/>
- <field name="view_mode">form</field>
- <field name="view_id" ref="crm_case_inbound_phone_form_view"/>
- <field name="act_window_id" ref="crm_case_categ_phone_incoming0"/>
- </record>
-
- <menuitem name="Inbound" id="menu_crm_case_phone_inbound"
- parent="crm.menu_crm_case_phone"
- action="crm_case_categ_phone_incoming0" />
-
<record model="ir.actions.act_window" id="crm_case_categ_phone_outgoing0">
- <field name="name">Outbound</field>
+ <field name="name">Phone Calls</field>
<field name="res_model">crm.phonecall</field>
<field name="view_type">form</field>
<field name="view_mode">tree,calendar</field>
<field name="view_id" ref="crm_case_phone_tree_view"/>
- <field name="domain" eval="'[(\'categ_id\',\'=\','+str(ref('categ_phone2'))+')]'"/>
<field name="context" eval="'{\'search_default_section_id\':section_id, \'default_state\':\'open\', \'search_default_current\':1, \'default_categ_id\': ' + str(ref('categ_phone2')) +'}'"/>
<field name="search_view_id" ref="crm.view_crm_case_phonecalls_filter"/>
- <field name="help">Outbound Calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
+ <field name="help">Phone Calls list all the calls to be done by your sales team. A salesman can record the information about the call in the form view. This information will be stored in the partner form to trace every contact you have with a customer. You can also import a .CSV file with a list of calls to be done by your sales team.</field>
</record>
<record model="ir.actions.act_window.view" id="action_crm_tag_tree_phone_outgoing0">
@@ -131,7 +92,7 @@
<field name="act_window_id" ref="crm_case_categ_phone_outgoing0"/>
</record>
- <menuitem name="Outbound" id="menu_crm_case_phone_outbound"
+ <menuitem name="Phone Calls" id="menu_crm_case_phone_outbound"
parent="crm.menu_crm_case_phone"
action="crm_case_categ_phone_outgoing0" />
=== modified file 'crm/crm_phonecall_view.xml'
--- crm/crm_phonecall_view.xml 2011-01-17 22:22:19 +0000
+++ crm/crm_phonecall_view.xml 2011-04-11 14:26:52 +0000
@@ -61,9 +61,10 @@
<group colspan="6" col="7">
<field name="name" required="1"/>
<field name="partner_phone"/>
- <field name="duration" widget="float_time" required="1"/>
+ <field name="category" invisible="1"/>
+ <field name="duration" widget="float_time"
+ attrs="{'required':['|',('category', '=', 'Schedule Call'),('state', '=', 'pending'),('state', '!=', 'done')]}" />
<button string="Schedule a Meeting" name="action_make_meeting" icon="gtk-redo" type="object"/>
-
<field name="date" required="1"/>
<field name="user_id"/>
<field name="section_id" colspan="1" widget="selection" />
@@ -98,6 +99,7 @@
<group col="2" colspan="2">
<separator colspan="2" string="Categorization" />
<field name="categ_id" widget="selection"
+ on_change="onchange_categ_id(categ_id)"
domain="[('object_id.model', '=', 'crm.phonecall')]"
string="Type" />
<field name="priority"/>
@@ -127,105 +129,6 @@
</field>
</record>
- <!--Inbound Phonecalls Form View -->
-
- <record model="ir.ui.view" id="crm_case_inbound_phone_form_view">
- <field name="name">CRM - Inbound Phone Call Form</field>
- <field name="model">crm.phonecall</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Phone Call">
- <group colspan="4" col="7">
- <field name="name" required="1"/>
- <field name="partner_phone"/>
- <field name="duration" widget="float_time"/>
- <button string="Schedule a Meeting"
- name="action_make_meeting"
- icon="gtk-redo"
- type="object" />
-
- <field name="date" required="1"/>
- <field name="user_id"/>
- <field name="section_id" colspan="1" widget="selection" />
- <button string="Convert to Opportunity"
- name="%(phonecall2opportunity_act)d"
- icon="gtk-index" type="action"
- attrs="{'invisible':[('opportunity_id','!=',False)]}" />
- <label colspan="6" string=""/>
- <button string="Schedule Other Call"
- icon="terp-call-start"
- name="%(phonecall_to_phonecall_act)d"
- type="action" />
-
- </group>
- <group col="3" colspan="2">
- <separator colspan="3" string="Contacts" />
- <field name="partner_id"
- on_change="onchange_partner_id(partner_id, email_from)" />
- <button string="Create a Partner"
- icon="terp-partner"
- name="%(action_crm_phonecall2partner)d"
- type="action"
- attrs="{'invisible':[('partner_id','!=',False)]}"
- groups="base.group_partner_manager" />
- <newline/>
- <field name="partner_address_id"
- on_change="onchange_partner_address_id(partner_address_id, email_from)" />
- <newline/>
- <field name="partner_mobile" />
- </group>
- <group col="2" colspan="2">
- <separator colspan="2" string="Categorization" />
- <field name="categ_id" widget="selection"
- domain="[('object_id.model', '=', 'crm.phonecall')]"
- string="Type" />
- <field name="priority"/>
- <field name="opportunity_id"/>
- </group>
- <separator string="Description" colspan="4" />
- <field name="description" nolabel="1" colspan="4" />
- <separator colspan="4" />
- </form>
- </field>
- </record>
-
- <!--Inbound Phonecalls Tree View -->
-
- <record model="ir.ui.view" id="crm_case_inbound_phone_tree_view">
- <field name="name">CRM - Inbound Phone Calls Tree</field>
- <field name="model">crm.phonecall</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Phone Calls" colors="grey:state in ('cancel','done');blue:state in ('pending',)" editable="top">
- <field name="date"/>
- <field name="name"/>
- <field name="partner_id"
- on_change="onchange_partner_id(partner_id)"
- string="Partner" />
- <field name="partner_address_id"
- on_change="onchange_partner_address_id(partner_address_id)" />
- <field name="partner_phone"/>
- <field name="user_id"/>
- <field name="categ_id" widget="selection"
- domain="[('object_id.model', '=', 'crm.phonecall')]"
- string="Type" />
- <field name="state" invisible="1"/>
- <field name="create_date" invisible="1"/>
- <button string="Schedule Other Call"
- icon="terp-call-start"
- name="%(phonecall_to_phonecall_act)d"
- type="action" />
- <button string="Convert to Opportunity"
- name="%(phonecall2opportunity_act)d"
- states="draft,open,pending"
- icon="gtk-index"
- type="action" attrs="{'invisible':[('opportunity_id','!=',False)]}" />
- <button string="Meeting"
- states="draft,open,pending" icon="gtk-redo"
- name="action_make_meeting" type="object" />
- </tree>
- </field>
- </record>
<!-- Phonecalls Calendar View -->
@@ -290,6 +193,8 @@
domain="[]" context="{'group_by':'create_date'}" />
<filter string="Date" icon="terp-go-month" domain="[]"
context="{'group_by':'date'}" help="Date of Call" />
+ <filter string="Type" icon="terp-stock_symbol-selection" domain="[]"
+ context="{'group_by':'categ_id'}" />
</group>
</search>
</field>
=== modified file 'crm/crm_view.xml'
--- crm/crm_view.xml 2011-02-18 04:33:13 +0000
+++ crm/crm_view.xml 2011-04-11 14:26:52 +0000
@@ -187,6 +187,7 @@
<tree string="Campaign">
<field name="name"/>
<field name="section_id"/>
+ <field name="type"/>
</tree>
</field>
</record>
@@ -201,6 +202,7 @@
<form string="Campaign">
<field name="name" select="1"/>
<field name="section_id" select="1" widget="selection"/>
+ <field name="type"/>
</form>
</field>
</record>
=== modified file 'crm/i18n/de.po'
--- crm/i18n/de.po 2011-04-04 04:47:57 +0000
+++ crm/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:22+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-18 20:41+0000\n"
+"Last-Translator: Felix Schubert <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:43+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: crm
#: view:crm.lead.report:0
@@ -2514,12 +2524,21 @@
"Die Stufe für die Verkaufschance ist von '%s' nach '%s' geändert worden."
#. module: crm
+<<<<<<< TREE
#: code:addons/crm/crm_lead.py:282
#, python-format
msgid "Changed Stage to: %s"
msgstr "Status auf: %s geändert."
#. module: crm
+=======
+#: code:addons/crm/crm_lead.py:282
+#, python-format
+msgid "Changed Stage to: %s"
+msgstr ""
+
+#. module: crm
+>>>>>>> MERGE-SOURCE
#: selection:crm.segmentation.line,operator:0
msgid "Mandatory Expression"
msgstr "Verbindlich"
=== modified file 'crm/i18n/ru.po'
--- crm/i18n/ru.po 2011-04-01 04:47:55 +0000
+++ crm/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-31 18:13+0000\n"
+=======
+"PO-Revision-Date: 2011-03-14 18:33+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-01 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:44+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: crm
#: view:crm.lead.report:0
@@ -1720,9 +1729,15 @@
"organise their sales pipeline. Stages will allow them to easily track how a "
"specific lead or opportunity is positioned in the sales cycle."
msgstr ""
+<<<<<<< TREE
"Добавление Ñпециальных Ñтапов к кандидатам и предложениÑм позволÑет лучше "
"организовать процеÑÑ Ð¿Ñ€Ð¾Ð´Ð°Ð¶. Ðтапы позволÑÑŽÑ‚ легче отÑлеживать нахождение "
"кандидатов и предложений в процеÑÑе продаж."
+=======
+"Добавление Ñпециальных Ñтапов к кандидатам и Ñделкам позволÑет лучше "
+"организовать процеÑÑ Ð¿Ñ€Ð¾Ð´Ð°Ð¶. Ðтапы позволÑÑŽÑ‚ легче отÑлеживать нахождение "
+"кандидатов и Ñделок в процеÑÑе продаж."
+>>>>>>> MERGE-SOURCE
#. module: crm
#: view:crm.lead.report:0
@@ -2187,11 +2202,19 @@
"The opportunities and sales order displayed, will automatically be filtered "
"according to his team."
msgstr ""
+<<<<<<< TREE
"Определение отдела продаж Ð´Ð»Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸ различных продавцов или отделов "
"продаж в отдельные команды. ÐšÐ°Ð¶Ð´Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° будет работать Ñо Ñвоим ÑпиÑком "
"предложений, заказов и Ñ‚.д. Каждый пользователь может уÑтановить команду по "
"умолчанию в Ñвоих наÑтройках. Выводимые Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð¸ заказы, будут "
"автоматичеÑки фильтроватьÑÑ Ð² ÑоответÑтвии Ñ Ð¾Ñ‚Ð´ÐµÐ»Ð¾Ð¼ продаж пользователÑ."
+=======
+"Определение отдела продаж Ð´Ð»Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¸ различных продавцов или отделов "
+"продаж в отдельные команды. ÐšÐ°Ð¶Ð´Ð°Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° будет работать Ñо Ñвоим ÑпиÑком "
+"Ñделок, заказов и Ñ‚.д. Каждый пользователь может уÑтановить команду по "
+"умолчанию в Ñвоих наÑтройках. Выводимые Ñделки и заказы, будут "
+"автоматичеÑки фильтроватьÑÑ Ð² ÑоответÑтвии Ñ Ð¾Ñ‚Ð´ÐµÐ»Ð¾Ð¼ продаж пользователÑ."
+>>>>>>> MERGE-SOURCE
#. module: crm
#: help:crm.meeting,count:0
@@ -2269,6 +2292,7 @@
"email gateway: new emails may create leads, each of them automatically gets "
"the history of the conversation with the prospect."
msgstr ""
+<<<<<<< TREE
"Кандидаты позволÑÑŽÑ‚ управлÑÑ‚ÑŒ и отÑлеживать вÑе первоначальные контакты Ñ "
"предполагаемыми клиентами или партнерами проÑвившими Ð¸Ð½Ñ‚ÐµÑ€ÐµÑ Ðº вашей "
"продукции или уÑлугам. Кандидат - обычно первый шаг в процеÑÑе продажи. "
@@ -2279,6 +2303,18 @@
"кандидатами в OpenERP. Кандидаты могут быть подÑоединены к почтовому шлюзу: "
"новые Ñл. пиÑьма могут Ñоздавать кандидатов, каждый из них автоматичеÑки "
"получает иÑторию переговоров Ñ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÐ¼Ñ‹Ð¼ клиентом."
+=======
+"Кандидаты позволÑÑŽÑ‚ управлÑÑ‚ÑŒ и отÑлеживать вÑе первоначальные контакты Ñ "
+"предполагаемыми клиентами или партнерами проÑвившими Ð¸Ð½Ñ‚ÐµÑ€ÐµÑ Ðº вашей "
+"продукции или уÑлугам. Кандидат - обычно первый шаг в процеÑÑе продажи. "
+"ПоÑле оценки, кандидат может быть преобразован в Ñделку Ñ Ñозданием "
+"ÑоответÑтвующего партнера Ð´Ð»Ñ Ð±ÑƒÐ´ÑƒÑ‰ÐµÐ³Ð¾ отÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ ÑвÑзанной Ñ Ð½Ð¸Ð¼ "
+"деÑтельноÑти. Ð’Ñ‹ можете импортировать базу данных предполагаемых клиентов, "
+"работать Ñ Ð²Ð¸Ð·Ð¸Ñ‚Ð½Ñ‹Ð¼Ð¸ карточками или интегрировать запроÑÑ‹ Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ Ñайта Ñ "
+"кандидатами в OpenERP. Кандидаты могут быть подÑоединены к почтовому шлюзу: "
+"новые Ñл. пиÑьма могут Ñоздавать кандидатов, каждый из них автоматичеÑки "
+"получает иÑторию переговоров Ñ Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ð»Ð°Ð³Ð°ÐµÐ¼Ñ‹Ð¼ клиентом."
+>>>>>>> MERGE-SOURCE
#. module: crm
#: selection:crm.lead2opportunity.partner,action:0
@@ -2431,6 +2467,12 @@
msgstr "Ðтап изменен на: %s"
#. module: crm
+#: code:addons/crm/crm_lead.py:282
+#, python-format
+msgid "Changed Stage to: %s"
+msgstr ""
+
+#. module: crm
#: selection:crm.segmentation.line,operator:0
msgid "Mandatory Expression"
msgstr "ОбÑзательное выражение"
@@ -2770,8 +2812,12 @@
"The name of the future partner that will be created while converting the "
"into opportunity"
msgstr ""
+<<<<<<< TREE
"Ðазвание будущего партнера, который будет Ñоздан при преобразовании в "
"предложение"
+=======
+"Ðазвание будущего партнера, который будет Ñоздан при преобразовании в Ñделку"
+>>>>>>> MERGE-SOURCE
#. module: crm
#: field:crm.opportunity2phonecall,user_id:0
@@ -2872,6 +2918,7 @@
"opportunities, convert them into quotations, manage related documents, track "
"all customer related activities, and much more."
msgstr ""
+<<<<<<< TREE
"С предложениÑми вы можете управлÑÑ‚ÑŒ и отÑлеживать процеÑÑ Ð¿Ñ€Ð¾Ð´Ð°Ð¶ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ "
"ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñпецифичных Ð´Ð»Ñ Ð·Ð°ÐºÐ°Ð·Ñ‡Ð¸ÐºÐ° или предполагаемого клиента документов "
"Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð°Ð¶. Может быть Ñохранена Ñ‚Ð°ÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ: ожидаемый доход, Ñтап "
@@ -2884,6 +2931,19 @@
"звонки по предложениÑм, превращать их в запроÑÑ‹ цен, управлÑÑ‚ÑŒ ÑвÑзанными "
"документами, отÑлеживать деÑтельноÑÑ‚ÑŒ ÑвÑзанную Ñ Ð·Ð°ÐºÐ°Ð·Ñ‡Ð¸ÐºÐ¾Ð¼, и многое "
"другое."
+=======
+"Со Ñделками вы можете управлÑÑ‚ÑŒ и отÑлеживать процеÑÑ Ð¿Ñ€Ð¾Ð´Ð°Ð¶ Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ "
+"ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñпецифичных Ð´Ð»Ñ Ð·Ð°ÐºÐ°Ð·Ñ‡Ð¸ÐºÐ° или предполагаемого клиента документов "
+"Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð°Ð¶. Может быть Ñохранена Ñ‚Ð°ÐºÐ°Ñ Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ: ожидаемый доход, Ñтап "
+"Ñделки, Ð¾Ð¶Ð¸Ð´Ð°ÐµÐ¼Ð°Ñ Ð´Ð°Ñ‚Ð° закрытиÑ, иÑÑ‚Ð¾Ñ€Ð¸Ñ Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¸ многое другое. Сделки "
+"могут быть ÑвÑзаны Ñ Ð¿Ð¾Ñ‡Ñ‚Ð¾Ð²Ñ‹Ð¼ шлюзом: новые ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¼Ð¾Ð³ÑƒÑ‚ Ñоздавать "
+"Ñделки, ÐºÐ°Ð¶Ð´Ð°Ñ Ð¸Ð· них автоматичеÑки получает иÑторию Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ñ ÐºÐ»Ð¸ÐµÐ½Ñ‚Ð¾Ð¼.\n"
+"\n"
+"Ð’Ñ‹ и ваш отдел будете иметь возможноÑÑ‚ÑŒ планировать вÑтречи и телефонные "
+"звонки по Ñделкам, превращать их в запроÑÑ‹ цен, управлÑÑ‚ÑŒ ÑвÑзанными "
+"документами, отÑлеживать деÑтельноÑÑ‚ÑŒ ÑвÑзанную Ñ Ð·Ð°ÐºÐ°Ð·Ñ‡Ð¸ÐºÐ¾Ð¼, и многое "
+"другое."
+>>>>>>> MERGE-SOURCE
#. module: crm
#: view:crm.meeting:0
@@ -3027,10 +3087,17 @@
"instance reflect your product structure or the different types of sales you "
"do."
msgstr ""
+<<<<<<< TREE
"Создавать Ñпециальные категории, которые подходÑÑ‚ к деÑтельноÑти вашей "
"компании, чтобы лучше клаÑÑифицировать и анализировать ваших кандидатов и "
"предложениÑ. Такие категории, могут, например, отражать вашу Ñтруктуру "
"продукции или различные типы продаж."
+=======
+"Создавать Ñпециальные категории, которые подходÑÑ‚ к деÑтельноÑти вашей "
+"компании, чтобы лучше клаÑÑифицировать и анализировать ваших кандидатов и "
+"Ñделки. Такие категории, могут, например, отражать вашу Ñтруктуру продукции "
+"или различные типы продаж."
+>>>>>>> MERGE-SOURCE
#. module: crm
#: help:crm.segmentation,som_interval_decrease:0
@@ -3615,9 +3682,15 @@
"them to easily track how is positioned a specific opportunity in the sales "
"cycle."
msgstr ""
+<<<<<<< TREE
"Добавление Ñпециальных Ñтапов, которые будут помогать лучше организовывать "
"процеÑÑ Ð¿Ñ€Ð¾Ð´Ð°Ð¶. Ðтапы позволÑÑŽÑ‚ легче отÑлеживать положение предложений в "
"процеÑÑе продаж."
+=======
+"Добавление Ñпециальных Ñтапов, которые будут помогать лучше организовывать "
+"процеÑÑ Ð¿Ñ€Ð¾Ð´Ð°Ð¶. Ðтапы позволÑÑŽÑ‚ легче отÑлеживать положение Ñделок в "
+"процеÑÑе продаж."
+>>>>>>> MERGE-SOURCE
#. module: crm
#: model:process.process,name:crm.process_process_contractprocess0
=== modified file 'crm/i18n/zh_CN.po'
--- crm/i18n/zh_CN.po 2011-04-11 04:54:09 +0000
+++ crm/i18n/zh_CN.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-10 15:13+0000\n"
"Last-Translator: Black Jack <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-13 14:37+0000\n"
+"Last-Translator: Wei \"oldrev\" Li <oldrev@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-11 04:53+0000\n"
"X-Generator: Launchpad (build 12735)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:45+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: crm
#: view:crm.lead.report:0
@@ -2393,6 +2403,12 @@
msgstr "修改阶段为'%s'"
#. module: crm
+#: code:addons/crm/crm_lead.py:282
+#, python-format
+msgid "Changed Stage to: %s"
+msgstr ""
+
+#. module: crm
#: selection:crm.segmentation.line,operator:0
msgid "Mandatory Expression"
msgstr "强制的表达å¼1"
=== renamed file 'crm/images/crm_dashboard.jpeg' => 'crm/images/crm_dashboard.jpeg.OTHER'
Binary files crm/images/crm_dashboard.jpeg 2011-03-21 13:37:47 +0000 and crm/images/crm_dashboard.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'crm/images/leads.jpeg' => 'crm/images/leads.jpeg.OTHER'
Binary files crm/images/leads.jpeg 2011-03-21 13:37:47 +0000 and crm/images/leads.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'crm/wizard/crm_lead_to_opportunity.py'
--- crm/wizard/crm_lead_to_opportunity.py 2011-04-11 08:51:20 +0000
+++ crm/wizard/crm_lead_to_opportunity.py 2011-04-11 14:26:52 +0000
@@ -160,9 +160,15 @@
@return : View dictionary opening the Opportunity form view
"""
+<<<<<<< TREE
if not context:
context = {}
+=======
+ if not context:
+ context = {}
+
+>>>>>>> MERGE-SOURCE
record_id = context and context.get('active_ids') or False
if not record_id:
return {'type': 'ir.actions.act_window_close'}
@@ -205,9 +211,14 @@
partner_id = False
self._convert(cr, uid, ids, lead, partner_id, stage_ids, context=context)
+<<<<<<< TREE
self.send_mail_to_salesman(lead)
#If we convert in mass, don't merge if there is no other opportunity but no warning
if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
+=======
+ #If we convert in mass, don't merge if there is no other opportunity but no warning
+ if data.name == 'merge' and (len(data.opportunity_ids) > 1 or not context.get('mass_convert') ):
+>>>>>>> MERGE-SOURCE
merge_obj = self.pool.get('crm.merge.opportunity')
self.write(cr, uid, ids, {'opportunity_ids' : [(6,0, [data.opportunity_ids[0].id])]}, context=context)
context.update({'lead_ids' : record_id, "convert" : True})
@@ -230,6 +241,7 @@
crm_lead2opportunity_partner()
+<<<<<<< TREE
class crm_lead2opportunity_mass_convert(osv.osv_memory):
_name = 'crm.lead2opportunity.partner.mass'
_description = 'Mass Lead To Opportunity Partner'
@@ -292,4 +304,68 @@
}
crm_lead2opportunity_mass_convert()
+=======
+class crm_lead2opportunity_mass_convert(osv.osv_memory):
+ _name = 'crm.lead2opportunity.partner.mass'
+ _description = 'Mass Lead To Opportunity Partner'
+ _inherit = 'crm.lead2opportunity.partner'
+
+
+ _columns = {
+ 'user_ids': fields.many2many('res.users', 'mass_convert_rel', 'user_id', 'wizard_id', 'Salesmans'),
+ 'section_id': fields.many2one('crm.case.section', 'Sales Team'),
+
+ }
+
+ def mass_convert(self, cr, uid, ids, context=None):
+ lead_obj = self.pool.get('crm.lead')
+ if not context:
+ context = {}
+
+ active_ids = context.get('active_ids')
+ data = self.browse(cr, uid, ids, context=context)[0]
+
+ salesteam = data.section_id and data.section_id.id
+ if data.user_ids:
+ salesmans = map(lambda x : x.id, data.user_ids)
+ index = 0
+ else:
+ salesmans = False
+
+ for lead_id in active_ids:
+ value = {}
+ if salesteam:
+ value['section_id'] = salesteam
+ if salesmans:
+ value['user_id'] = salesmans[index]
+ index += 1
+ index = index < len(salesmans) and index or 0
+ if value:
+ lead_obj.write(cr, uid, [lead_id], value, context=context)
+
+ context['active_ids'] = [lead_id]
+ value = self.default_get(cr, uid, ['partner_id', 'opportunity_ids'], context=context)
+ value['opportunity_ids'] = [(6, 0, value['opportunity_ids'])]
+ self.write(cr, uid, ids, value, context=context)
+
+ self.action_apply(cr, uid, ids, context=context)
+
+
+
+ models_data = self.pool.get('ir.model.data')
+ result = models_data._get_id(cr, uid, 'crm', 'view_crm_case_opportunities_filter')
+ opportunity_view_search = models_data.browse(cr, uid, result, context=context).res_id
+
+ return {
+ 'name': _('Opportunity'),
+ 'view_type': 'form',
+ 'view_mode': 'tree,form',
+ 'res_model': 'crm.lead',
+ 'domain': [('type', '=', 'opportunity'), ('id', 'in', active_ids)],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': opportunity_view_search,
+ }
+
+crm_lead2opportunity_mass_convert()
+>>>>>>> MERGE-SOURCE
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'crm/wizard/crm_lead_to_partner.py'
=== modified file 'crm/wizard/crm_merge_opportunities.py'
--- crm/wizard/crm_merge_opportunities.py 2011-04-11 08:51:20 +0000
+++ crm/wizard/crm_merge_opportunities.py 2011-04-11 14:26:52 +0000
@@ -78,8 +78,13 @@
opp_obj = self.pool.get('crm.lead')
message_obj = self.pool.get('mailgate.message')
+<<<<<<< TREE
lead_ids = context and context.get('lead_ids', []) or []
+=======
+ lead_ids = context and context.pop('lead_ids', []) or []
+
+>>>>>>> MERGE-SOURCE
if len(op_ids) <= 1:
raise osv.except_osv(_('Warning !'),_('Please select more than one opportunities.'))
@@ -111,6 +116,7 @@
'section_id' : self._get_first_not_null_id('section_id', op_ids, oldest_opp), #!!
'state_id' : self._get_first_not_null_id('state_id', op_ids, oldest_opp),
'description' : self._concat_all('description', op_ids), #not lost
+<<<<<<< TREE
'email' : self._get_first_not_null('email', op_ids, oldest_opp), # !!
'fax' : self._get_first_not_null('fax', op_ids, oldest_opp),
'mobile' : self._get_first_not_null('mobile', op_ids, oldest_opp),
@@ -130,6 +136,21 @@
'email_from' : self._get_first_not_null('email_from', op_ids, oldest_opp),
'email_cc' : self._get_first_not_null('email_cc', op_ids, oldest_opp),
'partner_name' : self._get_first_not_null('partner_name', op_ids, oldest_opp),
+=======
+ 'email' : self._get_first_not_null('email', op_ids), # !!
+ 'fax' : self._get_first_not_null('fax', op_ids),
+ 'mobile' : self._get_first_not_null('mobile', op_ids),
+ 'partner_latitude' : hasattr(opp_obj,'partner_latitude') and self._get_first_not_null('partner_latitude', op_ids),
+ 'partner_longitude' : hasattr(opp_obj,'partner_longitude') and self._get_first_not_null('partner_longitude', op_ids),
+ 'partner_name' : self._get_first_not_null('partner_name', op_ids),
+ 'phone' : self._get_first_not_null('phone', op_ids),
+ 'probability' : self._get_first_not_null('probability', op_ids),
+ 'planned_revenue' : self._get_first_not_null('planned_revenue', op_ids),
+ 'street' : self._get_first_not_null('street', op_ids),
+ 'street2' : self._get_first_not_null('street2', op_ids),
+ 'zip' : self._get_first_not_null('zip', op_ids),
+ 'state' : 'open'
+>>>>>>> MERGE-SOURCE
}
=== modified file 'crm_claim/crm_claim.py'
--- crm_claim/crm_claim.py 2011-03-16 12:38:21 +0000
+++ crm_claim/crm_claim.py 2011-04-11 14:26:52 +0000
@@ -22,6 +22,7 @@
from osv import fields, osv
from crm import crm
import time
+<<<<<<< TREE
import binascii
import tools
from tools.translate import _
@@ -31,6 +32,16 @@
crm.AVAILABLE_STATES[3][0], # Done
crm.AVAILABLE_STATES[4][0], # Pending
)
+=======
+import binascii
+import tools
+
+CRM_CLAIM_PENDING_STATES = (
+ crm.AVAILABLE_STATES[2][0], # Cancelled
+ crm.AVAILABLE_STATES[3][0], # Done
+ crm.AVAILABLE_STATES[4][0], # Pending
+)
+>>>>>>> MERGE-SOURCE
class crm_claim(crm.crm_case, osv.osv):
"""
@@ -281,5 +292,21 @@
crm_stage_claim()
+class crm_case_resource_type(osv.osv):
+ """ Resource Type of case """
+ _inherit = "crm.case.resource.type"
+ _description = "Campaign"
+
+ def _get_resource_type_value(self, cr, user, context=None):
+ type_list = super(crm_case_resource_type, self)._get_resource_type_value(cr, user, context)
+ type_list.append(('claim','Claim'))
+ return type_list
+
+ _columns ={
+ 'type': fields.selection(_get_resource_type_value, 'Type')
+ }
+
+crm_case_resource_type()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'crm_claim/crm_claim_data.xml'
--- crm_claim/crm_claim_data.xml 2011-01-14 00:11:01 +0000
+++ crm_claim/crm_claim_data.xml 2011-04-11 14:26:52 +0000
@@ -31,11 +31,13 @@
<record model="crm.case.resource.type" id="type_claim1">
<field name="name">Corrective</field>
<field name="section_id" ref="crm.section_sales_department"/>
+ <field name="type">claim</field>
</record>
<record model="crm.case.resource.type" id="type_claim2">
<field name="name">Preventive</field>
<field name="section_id" ref="crm.section_sales_department"/>
+ <field name="type">claim</field>
</record>
<!--
=== renamed file 'crm_claim/images/claim_stages.jpeg' => 'crm_claim/images/claim_stages.jpeg.OTHER'
Binary files crm_claim/images/claim_stages.jpeg 2011-03-21 13:37:47 +0000 and crm_claim/images/claim_stages.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'crm_claim/images/claims.jpeg' => 'crm_claim/images/claims.jpeg.OTHER'
Binary files crm_claim/images/claims.jpeg 2011-03-21 13:37:47 +0000 and crm_claim/images/claims.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'crm_fundraising/__openerp__.py'
--- crm_fundraising/__openerp__.py 2011-03-25 10:24:13 +0000
+++ crm_fundraising/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -21,6 +21,7 @@
{
+<<<<<<< TREE
'category': 'Sales',
'name': 'CRM Fundraising',
'version': '1.0',
@@ -37,6 +38,18 @@
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['crm'],
+=======
+ 'category': 'Sales',
+ 'name': 'CRM Fundraising',
+ 'version': '1.0',
+ 'description': """
+Fundraising.
+============
+ """,
+ 'author': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ['crm'],
+>>>>>>> MERGE-SOURCE
'init_xml': [
'crm_fundraising_data.xml',
],
=== modified file 'crm_fundraising/crm_fundraising.py'
--- crm_fundraising/crm_fundraising.py 2011-01-14 00:11:01 +0000
+++ crm_fundraising/crm_fundraising.py 2011-04-11 14:26:52 +0000
@@ -110,3 +110,19 @@
crm_stage_fundraising()
+
+class crm_case_resource_type(osv.osv):
+ """ Resource Type of case """
+ _inherit = "crm.case.resource.type"
+ _description = "Campaign"
+
+ def _get_resource_type_value(self, cr, user, context=None):
+ type_list = super(crm_case_resource_type, self)._get_resource_type_value(cr, user, context)
+ type_list.append(('fundraising','Fundraising'))
+ return type_list
+
+ _columns ={
+ 'type': fields.selection(_get_resource_type_value, 'Type')
+ }
+
+crm_case_resource_type()
=== modified file 'crm_fundraising/crm_fundraising_data.xml'
--- crm_fundraising/crm_fundraising_data.xml 2011-01-14 00:11:01 +0000
+++ crm_fundraising/crm_fundraising_data.xml 2011-04-11 14:26:52 +0000
@@ -33,21 +33,25 @@
<record model="crm.case.resource.type" id="type_fund1">
<field name="name">Cash</field>
<field name="section_id" ref="crm.section_sales_department"/>
+ <field name="type">fundraising</field>
</record>
<record model="crm.case.resource.type" id="type_fund2">
<field name="name">Cheque</field>
<field name="section_id" ref="crm.section_sales_department"/>
+ <field name="type">fundraising</field>
</record>
<record model="crm.case.resource.type" id="type_fund3">
<field name="name">Credit Card</field>
<field name="section_id" ref="crm.section_sales_department"/>
+ <field name="type">fundraising</field>
</record>
<record model="crm.case.resource.type" id="type_fund4">
<field name="name">Demand Draft</field>
<field name="section_id" ref="crm.section_sales_department"/>
+ <field name="type">fundraising</field>
</record>
</data>
=== modified file 'crm_fundraising/crm_fundraising_view.xml'
--- crm_fundraising/crm_fundraising_view.xml 2011-02-22 14:15:01 +0000
+++ crm_fundraising/crm_fundraising_view.xml 2011-04-11 14:26:52 +0000
@@ -111,7 +111,7 @@
<field name="user_id" string="Responsible"/>
<field name="date"/>
<field name="categ_id" select="1" widget="selection" domain="[('object_id.model', '=', 'crm.fundraising')]"/>
- <field name="type_id" string="Payment Mode" select="1" widget="selection"/>
+ <field name="type_id" string="Payment Mode" select="1" widget="selection" domain="[('type','=','fundraising')]"/>
</group>
<notebook colspan="4">
<page string="Funds">
=== renamed file 'crm_fundraising/images/funds.jpeg' => 'crm_fundraising/images/funds.jpeg.OTHER'
Binary files crm_fundraising/images/funds.jpeg 2011-03-21 13:37:47 +0000 and crm_fundraising/images/funds.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'crm_helpdesk/__openerp__.py'
--- crm_helpdesk/__openerp__.py 2011-03-25 10:24:13 +0000
+++ crm_helpdesk/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -21,6 +21,7 @@
{
+<<<<<<< TREE
'category': 'Sales',
'name': 'CRM Helpdesk',
'version': '1.0',
@@ -36,6 +37,18 @@
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['crm'],
+=======
+ 'category': 'Sales',
+ 'name': 'CRM Helpdesk',
+ 'version': '1.0',
+ 'description': """
+Helpdesk Management.
+====================
+ """,
+ 'author': 'OpenERP SA',
+ 'website': 'http://www.openerp.com',
+ 'depends': ['crm'],
+>>>>>>> MERGE-SOURCE
'init_xml': [
'crm_helpdesk_data.xml',
],
=== renamed file 'crm_helpdesk/images/helpdesk_analysis.jpeg' => 'crm_helpdesk/images/helpdesk_analysis.jpeg.OTHER'
Binary files crm_helpdesk/images/helpdesk_analysis.jpeg 2011-03-21 13:37:47 +0000 and crm_helpdesk/images/helpdesk_analysis.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'crm_helpdesk/images/helpdesk_requests.jpeg' => 'crm_helpdesk/images/helpdesk_requests.jpeg.OTHER'
Binary files crm_helpdesk/images/helpdesk_requests.jpeg 2011-03-21 13:37:47 +0000 and crm_helpdesk/images/helpdesk_requests.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'crm_partner_assign/__openerp__.py'
--- crm_partner_assign/__openerp__.py 2011-04-07 09:27:30 +0000
+++ crm_partner_assign/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,6 +25,7 @@
'version': '1.0',
'category': 'Sales',
'description': """
+<<<<<<< TREE
This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization.
======================================================================================================
@@ -34,6 +35,10 @@
Determine the GPS coordinates according to the address of the partner.
The most appropriate partner can be assigned.
You can also use the geolocalization without using the GPS coordinates.
+=======
+This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization.
+======================================================================================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'depends': ['crm'],
=== modified file 'crm_partner_assign/i18n/ru.po'
--- crm_partner_assign/i18n/ru.po 2011-03-24 04:50:30 +0000
+++ crm_partner_assign/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,23 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-23 13:46+0000\n"
+=======
+"PO-Revision-Date: 2011-03-14 19:21+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: Russian <ru@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-15 04:55+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: crm_partner_assign
#: field:crm.lead.forward.to.partner,name:0
@@ -308,7 +317,11 @@
#. module: crm_partner_assign
#: view:crm.lead.report.assign:0
msgid "Opportunities Assignment Analysis"
+<<<<<<< TREE
msgstr "Ðнализ раÑÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹"
+=======
+msgstr "Ðнализ раÑÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ Ñделок"
+>>>>>>> MERGE-SOURCE
#. module: crm_partner_assign
#: view:res.partner:0
=== modified file 'crm_partner_assign/security/ir.model.access.csv'
=== modified file 'crm_partner_assign/wizard/crm_forward_to_partner.py'
--- crm_partner_assign/wizard/crm_forward_to_partner.py 2011-04-07 09:27:30 +0000
+++ crm_partner_assign/wizard/crm_forward_to_partner.py 2011-04-11 14:26:52 +0000
@@ -288,8 +288,13 @@
defaults.update({
'subject' : '%s: %s - %s' % (_('Fwd'), 'Openerp lead forward', lead.name),
'body' : body,
+<<<<<<< TREE
'email_cc' : email_cc,
'email_to' : email or 'dummy@xxxxxxxx'
+=======
+ 'email_cc' : email_cc,
+ 'email_to' : email,
+>>>>>>> MERGE-SOURCE
})
return defaults
=== modified file 'crm_partner_assign/wizard/crm_forward_to_partner_view.xml'
--- crm_partner_assign/wizard/crm_forward_to_partner_view.xml 2011-03-08 16:40:02 +0000
+++ crm_partner_assign/wizard/crm_forward_to_partner_view.xml 2011-04-11 14:26:52 +0000
@@ -48,6 +48,7 @@
<field name="target">new</field>
</record>
+<<<<<<< TREE
<record model="ir.ui.view" id="crm_forward_mass_mail_view">
<field name="name">crm.new.mass.forward.mail.form</field>
@@ -103,5 +104,61 @@
+=======
+
+ <record model="ir.ui.view" id="crm_forward_mass_mail_view">
+ <field name="name">crm.new.mass.forward.mail.form</field>
+ <field name="model">crm.lead.mass.forward.to.partner</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Send Mail" col="4">
+ <group colspan="4" col="2">
+ <separator string="Forward to Partner" colspan="4" />
+
+ <field name="history" colspan="2" on_change="on_change_history(history, context)" invisible="1"/>
+ <field name="email_from"/>
+ <field name="reply_to"/>
+ <field name="email_cc" invisible="1" />
+ <field name="subject" invisible="1" />
+ <field name="html"/>
+ </group>
+ <notebook colspan="6" >
+ <page string="Message" >
+ <field name="body" nolabel="1" colspan="4" default_focus="1" readonly="1"/>
+ </page>
+ <page string="Attachments" >
+ <field name="attachment_ids" colspan="4" nolabel="1">
+ <form string="Attachment">
+ <field name="binary" filename="name" />
+ <field name="name" />
+ </form>
+ <tree string="Attachments">
+ <field name="name" />
+ </tree>
+ </field>
+ </page>
+ </notebook>
+ <separator string="" colspan="6"/>
+ <group colspan="6" col="4" >
+ <field name="state" />
+ <button string="_Cancel" icon="gtk-cancel" special="cancel" />
+ <button name="action_mass_forward" type="object" string="_Mass forward" icon="gtk-go-forward" />
+ </group>
+ </form>
+ </field>
+ </record>
+
+ <act_window id="action_crm_send_mass_forward"
+ multi="True"
+ key2="client_action_multi" name="Mass forward to partner"
+ res_model="crm.lead.mass.forward.to.partner" src_model="crm.lead"
+ view_mode="form" target="new" view_type="form"
+ context="{'mass_forward' : True}"
+ view_id="crm_forward_mass_mail_view"
+ />
+
+
+
+>>>>>>> MERGE-SOURCE
</data>
</openerp>
=== modified file 'crm_profiling/i18n/zh_CN.po'
--- crm_profiling/i18n/zh_CN.po 2011-04-11 04:54:09 +0000
+++ crm_profiling/i18n/zh_CN.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-10 18:32+0000\n"
"Last-Translator: Black Jack <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-08-03 03:23+0000\n"
+"Last-Translator: Black Jack <onetimespeed@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-11 04:53+0000\n"
"X-Generator: Launchpad (build 12735)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:42+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: crm_profiling
#: view:crm_profiling.questionnaire:0
=== modified file 'delivery/i18n/ru.po'
--- delivery/i18n/ru.po 2011-04-01 04:47:55 +0000
+++ delivery/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-31 18:17+0000\n"
+=======
+"PO-Revision-Date: 2011-03-20 11:27+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-01 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: delivery
#: report:sale.shipping:0
=== modified file 'document/__openerp__.py'
--- document/__openerp__.py 2011-03-25 10:24:13 +0000
+++ document/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -35,9 +35,14 @@
* New Files (list)
* Files by Resource Type (graph)
* Files by Partner (graph)
+<<<<<<< TREE
* Files Size by Month (graph)
ATTENTION:
+=======
+ * Files Size by Month (graph)
+ATTENTION:
+>>>>>>> MERGE-SOURCE
- When you install this module in a running company that have already PDF files stored into the database,
you will lose them all.
- After installing this module PDF's are no longer stored into the database,
=== modified file 'document/i18n/ro.po'
--- document/i18n/ro.po 2011-03-29 04:40:41 +0000
+++ document/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-28 16:59+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-08-03 03:30+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-29 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:46+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: document
#: field:document.directory,parent_id:0
@@ -1026,6 +1036,7 @@
#. module: document
#: field:document.directory.content,extension:0
msgid "Document Type"
+<<<<<<< TREE
msgstr "Tip document"
#~ msgid ""
@@ -1066,3 +1077,45 @@
#~ msgid "All Users files (This month)"
#~ msgstr "Fişierele tuturor utilizatorilor (luna curentă)"
+=======
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+#~ "special !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nume invalid de model în definirea acțiunii"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
+
+#~ msgid "Files Per Month"
+#~ msgstr "Fişiere pe lună"
+
+#~ msgid "All Months"
+#~ msgstr "Toate lunile"
+
+#~ msgid "My files"
+#~ msgstr "FiÅŸierele mele"
+
+#~ msgid "My files (All months)"
+#~ msgstr "FiÅŸierele mele (toale lunile)"
+
+#~ msgid "Last Posted File Name"
+#~ msgstr "Numele ultimului fiÅŸier postat"
+
+#~ msgid "My files (This months)"
+#~ msgstr "Fişierele mele (luna curentă)"
+
+#~ msgid "Document Management - Reporting"
+#~ msgstr "Management documente - Raportări"
+
+#~ msgid "All Users files (All months)"
+#~ msgstr "Toate fiÅŸierele utilizatorilor (toate lunile)"
+
+#~ msgid "All Users files (This month)"
+#~ msgstr "Fişierele tuturor utilizatorilor (luna curentă)"
+>>>>>>> MERGE-SOURCE
=== modified file 'document_ics/__openerp__.py'
--- document_ics/__openerp__.py 2011-03-25 10:24:13 +0000
+++ document_ics/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -23,6 +23,7 @@
{
'name': 'Support for iCal based on Document Management System',
'version': '1.0',
+<<<<<<< TREE
'category': 'Tools',
'description': """
Allows to synchronise calendars with others applications.
@@ -30,6 +31,13 @@
Will allow you to synchronise your OpenERP calendars with your phone, outlook, Sunbird, ical, ...
""",
+=======
+ 'category': 'Tools',
+ 'description': """
+Allows to synchronise calendars with others applications.
+=========================================================
+ """,
+>>>>>>> MERGE-SOURCE
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
'depends': ['document', 'crm'],
=== renamed file 'document_ics/images/2_doc_type_ics.jpeg' => 'document_ics/images/2_doc_type_ics.jpeg.OTHER'
Binary files document_ics/images/2_doc_type_ics.jpeg 2011-03-21 13:37:47 +0000 and document_ics/images/2_doc_type_ics.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'document_webdav/__openerp__.py'
--- document_webdav/__openerp__.py 2011-03-25 10:24:13 +0000
+++ document_webdav/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -34,28 +34,52 @@
"author" : "OpenERP SA",
"category" : "Tools",
"website": "http://www.openerp.com";,
- "description": """
-With this module, the WebDAV server for documents is activated.
-===============================================================
-
-You can then use any compatible browser to remotely see the attachments of OpenObject.
-
-After installation, the WebDAV server can be controlled by a [webdav] section in the server's config.
-Server Configuration Parameter:
-
- [webdav]
- ; enable = True ; Serve webdav over the http(s) servers
- ; vdir = webdav ; the directory that webdav will be served at
- ; this default val means that webdav will be
- ; on "http://localhost:8069/webdav/
- ; verbose = True ; Turn on the verbose messages of webdav
- ; debug = True ; Turn on the debugging messages of webdav
- ; since the messages are routed to the python logging, with
- ; levels "debug" and "debug_rpc" respectively, you can leave
- ; these options on
-
-Also implements IETF RFC 5785 for services discovery on a http server,
-which needs explicit configuration in openerp-server.conf, too.
+<<<<<<< TREE
+ "description": """
+With this module, the WebDAV server for documents is activated.
+===============================================================
+
+You can then use any compatible browser to remotely see the attachments of OpenObject.
+
+After installation, the WebDAV server can be controlled by a [webdav] section in the server's config.
+Server Configuration Parameter:
+
+ [webdav]
+ ; enable = True ; Serve webdav over the http(s) servers
+ ; vdir = webdav ; the directory that webdav will be served at
+ ; this default val means that webdav will be
+ ; on "http://localhost:8069/webdav/
+ ; verbose = True ; Turn on the verbose messages of webdav
+ ; debug = True ; Turn on the debugging messages of webdav
+ ; since the messages are routed to the python logging, with
+ ; levels "debug" and "debug_rpc" respectively, you can leave
+ ; these options on
+
+Also implements IETF RFC 5785 for services discovery on a http server,
+which needs explicit configuration in openerp-server.conf, too.
+=======
+ "description": """
+With this module, the WebDAV server for documents is activated.
+===============================================================
+
+You can then use any compatible browser to remotely see the attachments of OpenObject.
+
+After installation, the WebDAV server can be controlled by a [webdav] section in the server's config.
+Server Configuration Parameter:
+ [webdav]
+ ; enable = True ; Serve webdav over the http(s) servers
+ ; vdir = webdav ; the directory that webdav will be served at
+ ; this default val means that webdav will be
+ ; on "http://localhost:8069/webdav/
+ ; verbose = True ; Turn on the verbose messages of webdav
+ ; debug = True ; Turn on the debugging messages of webdav
+ ; since the messages are routed to the python logging, with
+ ; levels "debug" and "debug_rpc" respectively, you can leave
+ ; these options on
+
+Also implements IETF RFC 5785 for services discovery on a http server,
+which needs explicit configuration in openerp-server.conf, too.
+>>>>>>> MERGE-SOURCE
""",
"depends" : ["base", "document"],
"init_xml" : [],
=== modified file 'email_template/__openerp__.py'
--- email_template/__openerp__.py 2011-03-25 10:24:13 +0000
+++ email_template/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -28,6 +28,7 @@
"category" : "Tools",
"depends" : ['marketing', 'base_tools'],
"description": """
+<<<<<<< TREE
Email Template is extraction of Power Email basically just to send emails.
==========================================================================
@@ -37,6 +38,10 @@
For each email template, you can have OpenERP generate a Wizard Action / Button
that will be related to the object. So if you choose to do marketing campaigns
for leads, the action will be added to the right side panel of the Lead form.
+=======
+Email Template is extraction of Power Email basically just to send emails.
+==========================================================================
+>>>>>>> MERGE-SOURCE
""",
"init_xml": ['email_template_scheduler_data.xml'],
"update_xml": [
=== modified file 'email_template/i18n/de.po'
--- email_template/i18n/de.po 2011-04-04 04:47:57 +0000
+++ email_template/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,25 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:27+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-12 18:09+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:59+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: email_template
#: help:email_template.account,auto_delete:0
@@ -948,8 +959,13 @@
#. module: email_template
#: code:addons/email_template/email_template.py:319
#, python-format
+<<<<<<< TREE
msgid "Copy of template %s"
msgstr "Kopie der Vorlage %s"
+=======
+msgid "Copy of template %s"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: email_template
#: view:email_template.send.wizard:0
=== modified file 'email_template/i18n/pt_BR.po'
--- email_template/i18n/pt_BR.po 2011-03-27 04:53:32 +0000
+++ email_template/i18n/pt_BR.po 2011-04-11 14:26:52 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Brazilian Portuguese translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
@@ -1307,3 +1308,1314 @@
#, python-format
msgid "No Description"
msgstr ""
+=======
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-01 03:40+0000\n"
+"Last-Translator: Adriano Prado <adrianojprado@xxxxxxxxxxx>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-18 04:59+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: email_template
+#: help:email_template.account,auto_delete:0
+msgid "Permanently delete emails after sending"
+msgstr "Excluir Permanentemente o email após o envio"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Email Account Configuration"
+msgstr "Configuração da conta de E-mail"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:195
+#, python-format
+msgid "Emails for multiple items saved in outbox."
+msgstr "Emails para multiplos itens salvos na caixa de saida"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid ""
+"No personal email accounts are configured for you. \n"
+"Either ask admin to enforce an account for this template or get yourself a "
+"personal email account."
+msgstr ""
+"Não existem contas de e-mail pessoal configuradas para você.\n"
+"Solicite ao admin para aplicar uma conta para esse modelo ou Obtenha-se uma "
+"conta de e-mail pessoal."
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Personal Emails"
+msgstr "Email Pessoal"
+
+#. module: email_template
+#: field:email.template,file_name:0
+msgid "Report Filename"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Email Content "
+msgstr "Contexto do E-mail "
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send mail Wizard"
+msgstr "Assistente para envio de email"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text & HTML with no attachments"
+msgstr "Texto e HTML sem anexos"
+
+#. module: email_template
+#: help:email.template,model_object_field:0
+msgid ""
+"Select the field from the model you want to use.\n"
+"If it is a relationship field you will be able to choose the nested values "
+"in the box below\n"
+"(Note:If there are no values make sure you have selected the correct model)"
+msgstr ""
+"Selecione o campo do modelo que voce deseja usar.\n"
+"Se é um campo de relacionamento, voce poderá escolher o próximo valor na "
+"caixa abaixo\n"
+"(Obs.: Se não existir valores, tenha certeza de que selecionou o modelo "
+"correto)"
+
+#. module: email_template
+#: field:email_template.preview,body_html:0
+#: field:email_template.preview,body_text:0
+#: field:email_template.send.wizard,body_html:0
+#: field:email_template.send.wizard,body_text:0
+msgid "Body"
+msgstr "Corpo"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Deletion of Record failed"
+msgstr "Falha na exclusão do registro"
+
+#. module: email_template
+#: help:email_template.account,company:0
+msgid ""
+"Select if this mail account does not belong to specific user but to the "
+"organization as a whole. eg: info@xxxxxxxxxxxxxxxxx"
+msgstr ""
+"Selecione se esta conta de email não pertence a um usuário especÃfico, mas à "
+"organização como um todo. por exemplo: info@xxxxxxxxxxxxxxxxx"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send now"
+msgstr "Enviar agora"
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Not Applicable"
+msgstr "Não Aplicável"
+
+#. module: email_template
+#: view:email_template.account:0
+#: model:ir.ui.menu,name:email_template.menu_email_account_all_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_account_all
+msgid "Email Accounts"
+msgstr "Contas de E-mail"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Send all mails"
+msgstr "Enviar todos emails"
+
+#. module: email_template
+#: help:email_template.account,smtpuname:0
+msgid ""
+"Specify the username if your SMTP server requires authentication, otherwise "
+"leave it empty."
+msgstr ""
+"Especifique o nome de usuário se o seu servidor SMTP requer autenticação, "
+"caso contrário, deixe-o vazio."
+
+#. module: email_template
+#: field:email_template.mailbox,server_ref:0
+msgid "Server Reference of mail"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Approved"
+msgstr "Aprovado"
+
+#. module: email_template
+#: help:email.template,def_cc:0
+msgid ""
+"Carbon Copy address(es), comma-separated. Placeholders can be used here. "
+"e.g. ${object.email_cc}"
+msgstr ""
+"Endereço(s) Com Cópia, separados por vÃrgulas. Espaços reservados podem ser "
+"usados aqui. por exemplo ${object.email_cc}"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Account"
+msgstr "Conta"
+
+#. module: email_template
+#: field:email.template,table_html:0
+msgid "HTML code"
+msgstr "Código HTML"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Send Mail"
+msgstr "Enviar Email"
+
+#. module: email_template
+#: help:email_template.account,name:0
+msgid ""
+"The description is used as the Sender name along with the provided From "
+"Email, unless it is already specified in the From Email, e.g: John Doe "
+"<john@xxxxxxx>"
+msgstr ""
+"A descrição é usada como o nome do remetente juntamente com os fornecidos "
+"pelo e-mail, a menos que já estiver especificado no 'E-mail De', por "
+"exemplo: John Doe <john@xxxxxxx>"
+
+#. module: email_template
+#: field:email.template,from_account:0
+msgid "Email Account"
+msgstr "Conta de Email"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#, python-format
+msgid "Email sending failed for one or more objects."
+msgstr "Falha ao enviar email para um ou mais objetos."
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Add here all attachments of the current document you want to include in the "
+"Email."
+msgstr ""
+"Adicione aqui todos os anexos do documento atual que você quiser incluir no "
+"e-mail."
+
+#. module: email_template
+#: help:email.template,lang:0
+msgid ""
+"The default language for the email. Placeholders can be used here. eg. "
+"${object.partner_id.lang}"
+msgstr ""
+"O idioma padrão para o email. Objetos podem ser usados aqui. ex.: "
+"${object.partner_id.lang}"
+
+#. module: email_template
+#: help:email.template,sub_model_object_field:0
+msgid ""
+"When you choose relationship fields this field will specify the sub value "
+"you can use."
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Wizard Complete"
+msgstr "Assistente Completo"
+
+#. module: email_template
+#: field:email.template,reply_to:0
+#: field:email_template.mailbox,reply_to:0
+#: field:email_template.preview,reply_to:0
+#: field:email_template.send.wizard,reply_to:0
+msgid "Reply-To"
+msgstr "Responder-Para"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Delete Action"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Approve Account"
+msgstr "Aprovar Conta"
+
+#. module: email_template
+#: field:email_template.preview,rel_model_ref:0
+#: field:email_template.send.wizard,rel_model_ref:0
+msgid "Referred Document"
+msgstr "Documento Referido"
+
+#. module: email_template
+#: field:email_template.send.wizard,full_success:0
+msgid "Complete Success"
+msgstr "ConcluÃdo com sucesso!"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Mixed)"
+msgstr "Ambos HTML e Texto (Misto)"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "OK"
+msgstr "OK"
+
+#. module: email_template
+#: field:email_template.account,auto_delete:0
+msgid "Auto Delete"
+msgstr "Auto Excluir"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Both HTML & Text (Alternative)"
+msgstr "Ambos HTML e Texto (Alternativo)"
+
+#. module: email_template
+#: field:email_template.send.wizard,requested:0
+msgid "No of requested Mails"
+msgstr "No de E-mails Solicitados"
+
+#. module: email_template
+#: field:email.template,def_body_text:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,body_text:0
+msgid "Standard Body (Text)"
+msgstr "Corpo padrão(Texto)"
+
+#. module: email_template
+#: field:email.template,attachment_ids:0
+msgid "Attached Files"
+msgstr "Arquivos Anexados"
+
+#. module: email_template
+#: field:email_template.account,smtpssl:0
+msgid "SSL/TLS (only in python 2.6)"
+msgstr "SSL/TLS (Somente no python 2.6)"
+
+#. module: email_template
+#: field:email_template.account,email_id:0
+msgid "From Email"
+msgstr "Do Email"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:304
+#, python-format
+msgid "Warning"
+msgstr "Alerta"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_account_tree_all
+msgid "Accounts"
+msgstr "Contas"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Text)"
+msgstr "Corpo (Texto)"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Company Emails"
+msgstr "E-mails da Empresa"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"Tip: Multiple emails are sent in the same language (the first one is "
+"proposed). We suggest you send emails in groups according to language."
+msgstr ""
+"Dica: Multiplos e-mails são enviados na mesma lÃngua (o primeiro é "
+"proposto). Sugerimos que você envie e-mails em grupos de acordo com a "
+"linguagem."
+
+#. module: email_template
+#: help:email_template.preview,reply_to:0
+#: help:email_template.send.wizard,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here."
+msgstr ""
+"Os destinatários endereço devem responder para, se for diferente do endereço "
+"de origem. Códigos reservados podem ser usados aqui."
+
+#. module: email_template
+#: field:email.template,def_subject:0
+#: field:email_template.mailbox,subject:0
+#: field:email_template.preview,subject:0
+#: field:email_template.send.wizard,subject:0
+msgid "Subject"
+msgstr "Assunto"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:256
+#, python-format
+msgid "Reason: %s"
+msgstr "Motivo: %s"
+
+#. module: email_template
+#: field:email_template.mailbox,email_from:0
+msgid "From"
+msgstr "De"
+
+#. module: email_template
+#: field:email_template.preview,ref_template:0
+#: field:email_template.send.wizard,ref_template:0
+msgid "Template"
+msgstr "Modêlo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:367
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason: Server Send Error\n"
+" Description: %s"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Insert Simple Field"
+msgstr "Inserir um campo simples"
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Body(Html)"
+msgstr "Corpo(Html)"
+
+#. module: email_template
+#: help:email.template,def_bcc:0
+msgid ""
+"Blind Carbon Copy address(es), comma-separated. Placeholders can be used "
+"here. e.g. ${object.email_bcc}"
+msgstr ""
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.wizard_email_template_preview
+msgid "Template Preview"
+msgstr "Visualizar Modelo"
+
+#. module: email_template
+#: field:email.template,def_body_html:0
+msgid "Body (Text-Web Client Only)"
+msgstr "Corpo(Texto - Somente Cliente Web)"
+
+#. module: email_template
+#: field:email_template.account,state:0
+#: view:email_template.mailbox:0
+msgid "State"
+msgstr "Status"
+
+#. module: email_template
+#: field:email.template,ref_ir_value:0
+msgid "Wizard Button"
+msgstr "Botão Assistente"
+
+#. module: email_template
+#: help:email_template.account,email_id:0
+msgid "eg: 'john@xxxxxxx' or 'John Doe <john@xxxxxxx>'"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: field:email.template,object_name:0
+msgid "Resource"
+msgstr "Recurso"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:255
+#, python-format
+msgid "Out going connection test failed"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:371
+#, python-format
+msgid "Mail from Account %s successfully Sent."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Standard Body"
+msgstr "Corpo Padrão"
+
+#. module: email_template
+#: selection:email.template,template_language:0
+msgid "Mako Templates"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_body_html:0
+#: help:email.template,def_body_text:0
+msgid "The text version of the mail"
+msgstr "Versão texto do email"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:449
+#, python-format
+msgid " (Email Attachment)"
+msgstr " (Anexo do E-Mail)"
+
+#. module: email_template
+#: selection:email_template.mailbox,folder:0
+msgid "Sent Items"
+msgstr "Itens Enviados"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Test Outgoing Connection"
+msgstr "Teste de conexão de saÃda"
+
+#. module: email_template
+#: model:ir.actions.act_window,name:email_template.action_email_template_mailbox
+msgid "Mailbox"
+msgstr "Caixa de Correio"
+
+#. module: email_template
+#: help:email.template,reply_to:0
+msgid ""
+"The address recipients should reply to, if different from the From address. "
+"Placeholders can be used here. e.g. ${object.email_reply_to}"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_value:0
+msgid ""
+"Button in the side bar of the form view of this Resource that will invoke "
+"the Window Action"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,account_id:0
+msgid "User account"
+msgstr "Conta do usuário"
+
+#. module: email_template
+#: field:email_template.send.wizard,signature:0
+msgid "Attach my signature to mail"
+msgstr "Anexar minha assinatura"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:255
+#: view:email.template:0
+#, python-format
+msgid "Report"
+msgstr "Relatório"
+
+#. module: email_template
+#: field:email.template,sub_model_object_field:0
+msgid "Sub Field"
+msgstr "Sub campo"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+msgid "Advanced"
+msgstr "Avançado"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "My Emails"
+msgstr "Meus E-Mails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Expression Builder"
+msgstr "Construtor de Expressão"
+
+#. module: email_template
+#: help:email.template,sub_object:0
+msgid ""
+"When a relation field is used this field will show you the type of field you "
+"have selected"
+msgstr ""
+"Quando um campo de relação é usado, mostrará o tipo de campo que deve ser "
+"selecionado"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "HTML Body"
+msgstr "Corpo HTML"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Suspend Account"
+msgstr "Conta Suspensa"
+
+#. module: email_template
+#: help:email.template,null_value:0
+msgid "This Value is used if the field is empty"
+msgstr "Este valor será usado se o campo estiver vazio"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Preview Template"
+msgstr "Visualizar Modelo"
+
+#. module: email_template
+#: field:email_template.account,smtpserver:0
+msgid "Server"
+msgstr "Servidor"
+
+#. module: email_template
+#: help:email.template,copyvalue:0
+msgid ""
+"Copy and paste the value in the location you want to use a system value."
+msgstr ""
+
+#. module: email_template
+#: help:email.template,track_campaign_item:0
+msgid ""
+"Enable this is you wish to include a special tracking marker in outgoing "
+"emails so you can identify replies and link them back to the corresponding "
+"resource record. This is useful for CRM leads for example"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Raw HTML)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,use_sign:0
+msgid "Signature"
+msgstr "Assinatura"
+
+#. module: email_template
+#: field:email.template,sub_object:0
+msgid "Sub-model"
+msgstr "Sub-modelo"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Options"
+msgstr "Opções"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (Plain Text)"
+msgstr "Corpo(Texto Simples)"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Body (Text)"
+msgstr "Corpo(Texto)"
+
+#. module: email_template
+#: field:email_template.mailbox,date_mail:0
+msgid "Rec/Sent Date"
+msgstr "Data de Receb./Envio"
+
+#. module: email_template
+#: selection:email_template.account,state:0
+msgid "Initiated"
+msgstr "Iniciado"
+
+#. module: email_template
+#: field:email.template,report_template:0
+msgid "Report to send"
+msgstr "Relatório à Enviar"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Server Information"
+msgstr "Informação do Servidor"
+
+#. module: email_template
+#: field:email_template.send.wizard,generated:0
+msgid "No of generated Mails"
+msgstr "No de E-Mails Gerados"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Mail Details"
+msgstr "Detalhes do E-mail"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:235
+#, python-format
+msgid "SMTP SERVER or PORT not specified"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Note: This is Raw HTML."
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Group by..."
+msgstr "Agrupar por..."
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Multiple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,user:0
+msgid "Related User"
+msgstr "Usuário Relacionado"
+
+#. module: email_template
+#: field:email_template.mailbox,body_html:0
+msgid "Body (Rich Text Clients Only)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "Yes"
+msgstr "Sim"
+
+#. module: email_template
+#: field:email.template,ref_ir_act_window:0
+msgid "Window Action"
+msgstr "Ação da Janela"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "HTML, otherwise Text"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Drafts"
+msgstr "Rascunhos"
+
+#. module: email_template
+#: selection:email_template.account,company:0
+msgid "No"
+msgstr "Não"
+
+#. module: email_template
+#: field:email_template.account,smtpport:0
+msgid "SMTP Port"
+msgstr "Porta SMTP"
+
+#. module: email_template
+#: field:email_template.mailbox,mail_type:0
+msgid "Mail Contents"
+msgstr "Conteúdo do E-mail"
+
+#. module: email_template
+#: sql_constraint:email.template:0
+msgid "The template name must be unique !"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_bcc:0
+#: field:email_template.mailbox,email_bcc:0
+#: field:email_template.preview,bcc:0
+#: field:email_template.send.wizard,bcc:0
+msgid "BCC"
+msgstr "CCO"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Plain Text"
+msgstr "Texto Simples"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Draft"
+msgstr "Rascunho"
+
+#. module: email_template
+#: field:email.template,model_int_name:0
+msgid "Model Internal Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,message_id:0
+#: field:email_template.mailbox,message_id:0
+#: field:email_template.preview,message_id:0
+#: field:email_template.send.wizard,message_id:0
+msgid "Message-ID"
+msgstr "ID da Mensagem"
+
+#. module: email_template
+#: help:email_template.mailbox,server_ref:0
+msgid "Applicable for inward items only"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid ""
+"After clicking send all mails, mails will be sent to outbox and cleared in "
+"next Send/Recieve"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.mailbox,state:0
+#: field:email_template.send.wizard,state:0
+msgid "Status"
+msgstr "Status"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Outgoing"
+msgstr "Saindo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:427
+#, python-format
+msgid "Datetime Extraction failed.Date:%s \tError:%s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,use_sign:0
+msgid "the signature from the User details will be appended to the mail"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,from:0
+msgid "From Account"
+msgstr "Da Conta"
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Intermixed content"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Request Re-activation"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+#: model:ir.actions.act_window,name:email_template.action_email_template_tree_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all
+#: model:ir.ui.menu,name:email_template.menu_email_template_all_tools
+msgid "Email Templates"
+msgstr "Modelos de Email"
+
+#. module: email_template
+#: field:email_template.account,smtpuname:0
+msgid "User Name"
+msgstr "Nome do Usuário"
+
+#. module: email_template
+#: field:email_template.mailbox,user:0
+msgid "User"
+msgstr "Usuário"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Advanced Options"
+msgstr "Opções Avançadas"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Outbox"
+msgstr "Caixa de SaÃda"
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Save in Drafts"
+msgstr "Salvar em Rascunhos"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:362
+#, python-format
+msgid ""
+"Mail from Account %s failed. Probable Reason:MIME Error\n"
+"Description: %s"
+msgstr ""
+"Email da conta %s falhou. Razão provável: Erro MIME\n"
+"Descrição: %s"
+
+#. module: email_template
+#: field:email_template.account,smtptls:0
+msgid "TLS"
+msgstr "TLS"
+
+#. module: email_template
+#: field:email.template,lang:0
+msgid "Language"
+msgstr "Idioma"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:362
+#: code:addons/email_template/email_template_account.py:371
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:424
+#: code:addons/email_template/wizard/email_template_send_wizard.py:201
+#: model:ir.ui.menu,name:email_template.menu_email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_config_tools
+#: model:ir.ui.menu,name:email_template.menu_email_template_configuration
+#: model:ir.ui.menu,name:email_template.menu_email_template_tools
+#, python-format
+msgid "Email Template"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Send/Receive"
+msgstr "Enviar/Receber"
+
+#. module: email_template
+#: model:ir.ui.menu,name:email_template.menu_email_template_personal_mails
+msgid "Personal Mails"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.account:0
+#: selection:email_template.account,state:0
+msgid "Suspended"
+msgstr "Suspenso"
+
+#. module: email_template
+#: help:email.template,allowed_groups:0
+msgid ""
+"Only users from these groups will be allowed to send mails from this Template"
+msgstr ""
+"Somente usuários destes grupos tem permissão para enviar emails deste Modelo"
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:284
+#, python-format
+msgid "Send Mail (%s)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_subject:0
+msgid "The subject of email. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.send.wizard,report:0
+msgid "Report File Name"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,copyvalue:0
+msgid "Expression"
+msgstr "Expressão"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,history:0
+msgid "History"
+msgstr "Histórico"
+
+#. module: email_template
+#: view:email.template:0
+#: view:email_template.mailbox:0
+#: field:email_template.mailbox,attachments_ids:0
+#: view:email_template.send.wizard:0
+#: field:email_template.send.wizard,attachment_ids:0
+msgid "Attachments"
+msgstr "Anexos"
+
+#. module: email_template
+#: field:email_template.preview,to:0
+#: field:email_template.send.wizard,to:0
+msgid "To"
+msgstr "Para"
+
+#. module: email_template
+#: selection:email_template.account,send_pref:0
+msgid "Text, otherwise HTML"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:319
+#, python-format
+msgid "Copy of template %s"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Discard Mail"
+msgstr "Descartar E-Mail"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template
+msgid "Email Templates for Models"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Close"
+msgstr "Fechar"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:49
+#, python-format
+msgid "Error sending mail: %s"
+msgstr "Erro ao enviar e-mail: %s"
+
+#. module: email_template
+#: constraint:email_template.account:0
+msgid "Error: You are not allowed to have more than 1 account."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Body (HTML-Web Client Only)"
+msgstr "Corpo (HTML-Somente Cliente Web)"
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:253
+#, python-format
+msgid "%s (Email Attachment)"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,state:0
+msgid "Sending"
+msgstr "Enviando"
+
+#. module: email_template
+#: model:ir.actions.act_window,help:email_template.action_email_template_mailbox
+msgid ""
+"An email template is an email document that will be sent as part of a "
+"marketing campaign. You can personalize it according to specific customer "
+"profile fields, so that a partner name or other partner related information "
+"may be inserted automatically."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,allowed_groups:0
+msgid "Allowed User Groups"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,model_object_field:0
+msgid "Field"
+msgstr "Campo"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "User Information"
+msgstr "Informação do Usuário"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Actions"
+msgstr "Ações"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:363
+#: code:addons/email_template/email_template_account.py:368
+#, python-format
+msgid ""
+"Server Send Error\n"
+"Description: %s"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,file_name:0
+msgid ""
+"Name of the generated report file. Placeholders can be used in the filename. "
+"eg: 2009_SO003.pdf"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.mailbox,date_mail:0
+msgid "Date on which Email Sent or Received"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: selection:email_template.mailbox,folder:0
+msgid "Trash"
+msgstr "Lixeira"
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_mailbox
+msgid "Email Mailbox"
+msgstr "Caixa de E-mail"
+
+#. module: email_template
+#: code:addons/email_template/email_template_mailbox.py:116
+#, python-format
+msgid ""
+"Sending of Mail %s failed. Probable Reason:Could not login to server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:60
+#, python-format
+msgid "Missing mail account"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:250
+#, python-format
+msgid "SMTP Test Connection Was Successful"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,shortdesc:email_template.module_meta_information
+msgid "Email Template for OpenERP"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,name:0
+msgid "Description"
+msgstr "Descrição"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Create Action"
+msgstr ""
+
+#. module: email_template
+#: help:email_template.account,smtpserver:0
+msgid "Enter name of outgoing server, eg: smtp.yourdomain.com"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,attachment_ids:0
+msgid ""
+"You may attach existing files to this template, so they will be added in all "
+"emails created from this template"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,message_id:0
+msgid ""
+"Specify the Message-ID SMTP header to use in outgoing emails. Please note "
+"that this overrides the Resource tracking option! Placeholders can be used "
+"here."
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_to:0
+#: field:email_template.mailbox,email_to:0
+msgid "Recipient (To)"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,null_value:0
+msgid "Null Value"
+msgstr "Valor Nulo"
+
+#. module: email_template
+#: field:email.template,template_language:0
+msgid "Templating Language"
+msgstr ""
+
+#. module: email_template
+#: field:email.template,def_cc:0
+#: field:email_template.mailbox,email_cc:0
+#: field:email_template.preview,cc:0
+#: field:email_template.send.wizard,cc:0
+msgid "CC"
+msgstr "CC"
+
+#. module: email_template
+#: view:email_template.mailbox:0
+msgid "Sent"
+msgstr ""
+
+#. module: email_template
+#: sql_constraint:email_template.account:0
+msgid "Another setting already exists with this email ID !"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,ref_ir_act_window:0
+msgid "Action that will open this email template on Resource records"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,smtppass:0
+msgid "Password"
+msgstr "Senha:"
+
+#. module: email_template
+#: help:email_template.preview,message_id:0
+#: help:email_template.send.wizard,message_id:0
+msgid ""
+"The Message-ID header value, if you need tospecify it, for example to "
+"automatically recognize the replies later. Placeholders can be used here."
+msgstr ""
+
+#. module: email_template
+#: view:email_template.mailbox:0
+#: model:ir.ui.menu,name:email_template.menu_email_template_mails_tools
+msgid "Emails"
+msgstr "E-mails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Templates"
+msgstr "Modelos"
+
+#. module: email_template
+#: field:email_template.preview,report:0
+msgid "Report Name"
+msgstr "Nome do Relatório"
+
+#. module: email_template
+#: field:email.template,name:0
+msgid "Name"
+msgstr "Nome"
+
+#. module: email_template
+#: field:email.template,track_campaign_item:0
+msgid "Resource Tracking"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_preview
+msgid "Email Template Preview"
+msgstr ""
+
+#. module: email_template
+#: view:email_template.preview:0
+msgid "Email Preview"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,def_to:0
+msgid ""
+"The Recipient of email. Placeholders can be used here. e.g. "
+"${object.email_to}"
+msgstr ""
+
+#. module: email_template
+#: view:email.template:0
+msgid "Existing files"
+msgstr ""
+
+#. module: email_template
+#: model:ir.module.module,description:email_template.module_meta_information
+msgid ""
+"\n"
+" Email Template is extraction of Power Email basically just to send the "
+"emails.\n"
+" "
+msgstr ""
+
+#. module: email_template
+#: view:email_template.send.wizard:0
+msgid "Body (HTML)"
+msgstr ""
+
+#. module: email_template
+#: help:email.template,table_html:0
+msgid ""
+"Copy this html code to your HTML message body for displaying the info in "
+"your mail."
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_account
+msgid "email_template.account"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.preview,rel_model:0
+#: field:email_template.send.wizard,rel_model:0
+msgid "Model"
+msgstr "Modelo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:236
+#, python-format
+msgid "Core connection for the given ID does not exist"
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,company:0
+msgid "Corporate"
+msgstr "Corporativo"
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:275
+#, python-format
+msgid ""
+"Mail from Account %s failed on login. Probable Reason:Could not login to "
+"server\n"
+"Error: %s"
+msgstr ""
+
+#. module: email_template
+#: model:ir.model,name:email_template.model_email_template_send_wizard
+msgid "This is the wizard for sending mail"
+msgstr "Este Assistente envia emails"
+
+#. module: email_template
+#: view:email.template:0
+msgid "Addresses"
+msgstr "Endereços"
+
+#. module: email_template
+#: help:email.template,from_account:0
+msgid "Emails will be sent from this approved account."
+msgstr ""
+
+#. module: email_template
+#: field:email_template.account,send_pref:0
+msgid "Mail Format"
+msgstr "Formato do email"
+
+#. module: email_template
+#: field:email_template.mailbox,folder:0
+msgid "Folder"
+msgstr "Pasta"
+
+#. module: email_template
+#: view:email_template.account:0
+msgid "Company Accounts"
+msgstr "Conta da Empresa"
+
+#. module: email_template
+#: help:email_template.account,smtpport:0
+msgid "Enter port number, eg: 25 or 587"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/wizard/email_template_send_wizard.py:59
+#, python-format
+msgid "email-template"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template_account.py:280
+#: code:addons/email_template/email_template_account.py:374
+#: code:addons/email_template/email_template_account.py:375
+#, python-format
+msgid "Mail from Account %s failed. Probable Reason:Account not approved"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.send.wizard,state:0
+msgid "Simple Mail Wizard Step 1"
+msgstr ""
+
+#. module: email_template
+#: selection:email_template.mailbox,mail_type:0
+msgid "Has Attachments"
+msgstr ""
+
+#. module: email_template
+#: code:addons/email_template/email_template.py:452
+#: code:addons/email_template/wizard/email_template_send_wizard.py:256
+#, python-format
+msgid "No Description"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== renamed file 'email_template/images/2_email_template.jpeg' => 'email_template/images/2_email_template.jpeg.OTHER'
Binary files email_template/images/2_email_template.jpeg 2011-03-21 13:37:47 +0000 and email_template/images/2_email_template.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'event/images/2_events.jpeg' => 'event/images/2_events.jpeg.OTHER'
Binary files event/images/2_events.jpeg 2011-03-21 13:37:47 +0000 and event/images/2_events.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'event/images/3_registrations.jpeg' => 'event/images/3_registrations.jpeg.OTHER'
Binary files event/images/3_registrations.jpeg 2011-03-21 13:37:47 +0000 and event/images/3_registrations.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'fetchmail/images/1_email_servers.jpeg' => 'fetchmail/images/1_email_servers.jpeg.OTHER'
Binary files fetchmail/images/1_email_servers.jpeg 2011-03-21 13:37:47 +0000 and fetchmail/images/1_email_servers.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'hr/hr.py'
--- hr/hr.py 2011-04-07 09:27:30 +0000
+++ hr/hr.py 2011-04-11 14:26:52 +0000
@@ -151,8 +151,13 @@
'work_email': fields.char('Work E-mail', size=240),
'work_location': fields.char('Office Location', size=32),
'notes': fields.text('Notes'),
+<<<<<<< TREE
'parent_id': fields.many2one('hr.employee', 'Manager'),
'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'emp_id', 'category_id', 'Category'),
+=======
+ 'parent_id': fields.many2one('hr.employee', 'Manager'),
+ 'category_ids': fields.many2many('hr.employee.category', 'employee_category_rel', 'category_id', 'emp_id', 'Category'),
+>>>>>>> MERGE-SOURCE
'child_ids': fields.one2many('hr.employee', 'parent_id', 'Subordinates'),
'resource_id': fields.many2one('resource.resource', 'Resource', ondelete='cascade', required=True),
'coach_id': fields.many2one('hr.employee', 'Coach'),
=== modified file 'hr_holidays/__openerp__.py'
--- hr_holidays/__openerp__.py 2011-03-25 10:24:13 +0000
+++ hr_holidays/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -41,12 +41,22 @@
* The first will allow to choose employees by department and is used by clicking the menu item located in
Human Resources/Reporting/Holidays/Leaves by Department
* The second will allow you to choose the holidays report for specific employees. Go on the list
+<<<<<<< TREE
Human Resources/Human Resources/Employees
then select the ones you want to choose, click on the print icon and select the option
'Employee's Holidays'
+=======
+ Human Resources/Human Resources/Employees
+ then select the ones you want to choose, click on the print icon and select the option
+ 'Employee's Holidays'
+>>>>>>> MERGE-SOURCE
- The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in
Administration / Users / Users
+<<<<<<< TREE
for example, you maybe will do it for the user 'admin'.
+=======
+ for example, you maybe will do it for the user 'admin'.
+>>>>>>> MERGE-SOURCE
""",
'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'],
'depends': ['hr', 'crm', 'process', 'resource'],
=== modified file 'hr_payroll/__openerp__.py'
--- hr_payroll/__openerp__.py 2011-03-25 10:24:13 +0000
+++ hr_payroll/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -38,7 +38,11 @@
""",
'author':'OpenERP SA',
'website':'http://www.openerp.com',
+<<<<<<< TREE
'images': ['images/hr_company_contributions.jpeg','images/hr_salary_heads.jpeg','images/hr_salary_structure.jpeg','images/hr_employee_payslip.jpeg','images/hr_payment_advice.jpeg','images/hr_payroll_register.jpeg'],
+=======
+ 'images': ['images/hr_employee_payslip.jpeg','images/hr_payment_advice.jpeg','images/hr_payroll_register.jpeg'],
+>>>>>>> MERGE-SOURCE
'depends': [
'hr',
'hr_contract',
=== renamed file 'hr_payroll/images/hr_employee_payslip.jpeg' => 'hr_payroll/images/hr_employee_payslip.jpeg.OTHER'
Binary files hr_payroll/images/hr_employee_payslip.jpeg 2011-03-23 09:36:22 +0000 and hr_payroll/images/hr_employee_payslip.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'hr_payroll/images/hr_payment_advice.jpeg' => 'hr_payroll/images/hr_payment_advice.jpeg.OTHER'
Binary files hr_payroll/images/hr_payment_advice.jpeg 2011-03-23 09:36:22 +0000 and hr_payroll/images/hr_payment_advice.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'hr_payroll/images/hr_payroll_register.jpeg' => 'hr_payroll/images/hr_payroll_register.jpeg.OTHER'
Binary files hr_payroll/images/hr_payroll_register.jpeg 2011-03-23 09:36:22 +0000 and hr_payroll/images/hr_payroll_register.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'hr_recruitment/i18n/pt_BR.po'
--- hr_recruitment/i18n/pt_BR.po 2011-03-26 05:00:46 +0000
+++ hr_recruitment/i18n/pt_BR.po 2011-04-11 14:26:52 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Brazilian Portuguese translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
@@ -965,3 +966,962 @@
#: field:hr.job,survey_id:0
msgid "Survey"
msgstr "Avaliação"
+=======
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-02-11 13:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-02-12 05:00+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+
+#. module: hr_recruitment
+#: help:hr.applicant,active:0
+msgid ""
+"If the active field is set to false, it will allow you to hide the case "
+"without removing it."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: field:hr.recruitment.stage,requirements:0
+msgid "Requirements"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_open:0
+msgid "Avg. Delay to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,nbr:0
+msgid "# of Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Group By..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,department_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,department_id:0
+#: field:hr.recruitment.stage,department_id:0
+msgid "Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_action:0
+msgid "Next Action Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,company_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,company_id:0
+msgid "Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_cc:0
+msgid "Watchers Emails"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.partner.create,close:0
+msgid "Close job request"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_open:0
+msgid "Days to Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,note:0
+msgid "Goals"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,partner_address_id:0
+msgid "Partner Contact Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: view:hr.recruitment.partner.create:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_partner_create
+msgid "Create Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,day:0
+msgid "Day"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contract Data"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Add Internal Note"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_mobile:0
+msgid "Mobile"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Notes"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next Actions"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job2
+msgid "Junior Developer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,job_id:0
+#: field:hr.recruitment.report,job_id:0
+msgid "Applied Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_graduate
+msgid "Graduate"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job1
+msgid "Initial Jobs Demand"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_address_id:0
+msgid "Partner Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,reference:0
+msgid "Reference"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:board.board:0
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_applicants_status
+msgid "Applicants Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "My Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,title_action:0
+msgid "Next Action"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_recruitment
+msgid "Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop:0
+msgid "Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,partner_id:0
+msgid "Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Avg Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.recruitment.report,available:0
+msgid "Availability"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Previous"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_phonecall.py:107
+#: view:hr.applicant:0
+#, python-format
+msgid "Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Convert To Partner"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_report
+msgid "Recruitments Statistics"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Next"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_job
+msgid "Job Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Send New Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:39
+#, python-format
+msgid "A partner is already defined on this job request."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "New"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,email_from:0
+msgid "Email"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,availability:0
+msgid "Availability (Days)"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Available"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:38
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "Error !"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.hr_job_stage_act
+msgid ""
+"Define here your stages of the recruitment process, for example: "
+"qualification call, first interview, second interview, refused, hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,create_date:0
+#: view:hr.recruitment.report:0
+msgid "Creation Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,deadline:0
+msgid "Planned Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,priority:0
+#: field:hr.recruitment.report,priority:0
+msgid "Appreciation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,stage_id:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,stage_id:0
+#: view:hr.recruitment.stage:0
+msgid "Stage"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job3
+msgid "Second Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_exp:0
+msgid "Salary Expected"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_expected:0
+#: view:hr.recruitment.report:0
+msgid "Expected Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "July"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Subject"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: model:ir.actions.act_window,name:hr_recruitment.crm_case_categ0_act_job
+#: model:ir.ui.menu,name:hr_recruitment.menu_crm_case_categ0_act_job
+msgid "Applicants"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History Information"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Dates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid " Month-1 "
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_bac5
+msgid " > Bac +5"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_applicant
+msgid "Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.stage,sequence:0
+msgid "Gives the sequence order when displaying a list of stages."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Contact"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Qualification"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "March"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_stage
+msgid "Stage of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_stage_act
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_stage
+msgid "Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "In progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Jobs - Recruitment Form"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,probability:0
+msgid "Probability"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "September"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "December"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,shortdesc:hr_recruitment.module_meta_information
+msgid "HR - Recruitement"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Job Info"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job2
+msgid "First Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,write_date:0
+msgid "Update Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,salary_proposed:0
+#: view:hr.recruitment.report:0
+msgid "Proposed Salary"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.categ,name:hr_recruitment.categ_job1
+msgid "Salesman"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Search Jobs"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,category_id:0
+msgid "Category"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_name:0
+msgid "Applicant's Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Very Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "# Cases"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_open:0
+msgid "Opened"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Group By ..."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+msgid "In Progress"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reset to New"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_expected:0
+msgid "Salary Expected by Applicant"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_cc:0
+msgid ""
+"These email addresses will be added to the CC field of all inbound and "
+"outbound emails for this record before being sent. Separate multiple email "
+"addresses with a comma"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date_closed:0
+#: field:hr.recruitment.report,date_closed:0
+msgid "Closed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.stage:0
+msgid "Stage Definition"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Answer"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,delay_close:0
+msgid "Avg. Delay to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,salary_proposed:0
+msgid "Salary Proposed by the Organisation"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Meeting"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Pending"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Status"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Communication & History"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "August"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,type_id:0
+#: view:hr.recruitment.degree:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,type_id:0
+#: model:ir.actions.act_window,name:hr_recruitment.hr_recruitment_degree_action
+msgid "Degree"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,partner_phone:0
+msgid "Phone"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Global CC"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "October"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "June"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_stage_act
+msgid "Applicant Stages"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job7
+msgid "Refused by Company"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,day_close:0
+msgid "Days to Close"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,user_id:0
+msgid "User"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Excellent"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,active:0
+msgid "Active"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "November"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+msgid "Extended Filters..."
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,response:0
+msgid "Response"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.degree,name:hr_recruitment.degree_licenced
+msgid "Licenced"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.report,salary_prop_avg:0
+msgid "Avg Salary Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_phonecall
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_job2phonecall
+msgid "Schedule Phone Call"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "January"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.applicant,email_from:0
+msgid "These people will receive email."
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "Not Good"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,date:0
+#: field:hr.recruitment.report,date:0
+msgid "Date"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+msgid "Phone Call Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.partner.create:0
+msgid "Are you sure you want to create a partner based on this job request ?"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,help:hr_recruitment.crm_case_categ0_act_job
+msgid ""
+"From this menu you can track applicants in the recruitment process and "
+"manage all operations: meetings, interviews, phone calls, etc. If you setup "
+"the email gateway, applicants and their attached CV are created "
+"automatically when an email is sent to jobs@xxxxxxxxxxxxxxx. If you install "
+"the document management modules, all documents (CV and motivation letters) "
+"are indexed automatically, so that you can easily search through their "
+"content."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "History"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Attachments"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job4
+msgid "Contract Proposed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,state:0
+msgid "State"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.job2phonecall:0
+#: view:hr.recruitment.partner.create:0
+msgid "Cancel"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.actions.act_window,name:hr_recruitment.hr_job_categ_action
+msgid "Applicant Categories"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,state:0
+msgid "Open"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/wizard/hr_recruitment_create_partner_job.py:57
+#, python-format
+msgid "A partner is already existing with the same name."
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.degree,sequence:0
+msgid "Gives the sequence order when displaying a list of degrees."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: field:hr.applicant,user_id:0
+#: view:hr.recruitment.report:0
+msgid "Responsible"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: model:ir.actions.act_window,name:hr_recruitment.action_hr_recruitment_report_all
+#: model:ir.ui.menu,name:hr_recruitment.menu_hr_recruitment_report_all
+msgid "Recruitment Analysis"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Current"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.module.module,description:hr_recruitment.module_meta_information
+msgid ""
+"\n"
+"Manages job positions and the recruitement process. It's integrated with "
+"the\n"
+"survey module to allow you to define interview for different jobs.\n"
+"\n"
+"This module is integrated with the mail gateway to automatically tracks "
+"email\n"
+"sent to jobs@xxxxxxxxxxxxxxx. It's also integrated with the document "
+"management\n"
+"system to store and search in your CV base.\n"
+" "
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Details"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Cases By Stage and Estimates"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Reply"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+msgid "Interview"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,month:0
+msgid "Month"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,description:0
+msgid "Description"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "May"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job5
+msgid "Contract Signed"
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: selection:hr.recruitment.report,state:0
+msgid "Refused"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:412
+#, python-format
+msgid "Applicant '%s' is being hired."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.applicant:0
+#: selection:hr.applicant,state:0
+#: view:hr.recruitment.report:0
+#: selection:hr.recruitment.report,state:0
+msgid "Hired"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:hr.recruitment.stage,name:hr_recruitment.stage_job6
+msgid "Refused by Employee"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.applicant,priority:0
+#: selection:hr.recruitment.report,priority:0
+msgid "On Average"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_degree
+msgid "Degree of Recruitment"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "February"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,name:0
+#: field:hr.recruitment.degree,name:0
+#: field:hr.recruitment.stage,name:0
+msgid "Name"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:ir.model,name:hr_recruitment.model_hr_recruitment_partner_create
+msgid "Create Partner from job application"
+msgstr ""
+
+#. module: hr_recruitment
+#: selection:hr.recruitment.report,month:0
+msgid "April"
+msgstr ""
+
+#. module: hr_recruitment
+#: model:crm.case.section,name:hr_recruitment.section_hr_department
+msgid "HR Department"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.degree,sequence:0
+#: field:hr.recruitment.stage,sequence:0
+msgid "Sequence"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.recruitment.job2phonecall,user_id:0
+msgid "Assign To"
+msgstr ""
+
+#. module: hr_recruitment
+#: code:addons/hr_recruitment/hr_recruitment.py:396
+#, python-format
+msgid "The job request '%s' has been set 'in progress'."
+msgstr ""
+
+#. module: hr_recruitment
+#: view:hr.recruitment.report:0
+#: field:hr.recruitment.report,year:0
+msgid "Year"
+msgstr ""
+
+#. module: hr_recruitment
+#: help:hr.recruitment.report,delay_close:0
+#: help:hr.recruitment.report,delay_open:0
+msgid "Number of Days to close the project issue"
+msgstr ""
+
+#. module: hr_recruitment
+#: field:hr.applicant,survey:0
+#: field:hr.job,survey_id:0
+msgid "Survey"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== modified file 'hr_timesheet_invoice/i18n/pt_BR.po'
--- hr_timesheet_invoice/i18n/pt_BR.po 2011-04-04 04:47:57 +0000
+++ hr_timesheet_invoice/i18n/pt_BR.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,24 @@
"Project-Id-Version: pt_BR\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 15:28+0000\n"
"Last-Translator: Emerson <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-03-01 00:59+0000\n"
+"Last-Translator: Joe Pimentel <joe.b.pimentel@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: <pt@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-02 04:38+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: hr_timesheet_invoice
#: view:report.timesheet.line:0
=== modified file 'hr_timesheet_sheet/hr_timesheet_sheet.py'
=== modified file 'html_view/__openerp__.py'
--- html_view/__openerp__.py 2011-03-25 10:24:13 +0000
+++ html_view/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -7,10 +7,15 @@
"init_xml" : ['html_view.xml'],
"demo_xml" : [],
"description": """
+<<<<<<< TREE
This is the test module which shows HTML tag support in normal XML form view.
=============================================================================
Creates a sample form-view using HTML tags. It is visible only in OpenERP Web.
+=======
+This is the test module which shows HTML tag support in normal XML form view.
+=============================================================================
+>>>>>>> MERGE-SOURCE
""",
'update_xml': ['security/ir.model.access.csv','html_view.xml',],
'installable': True,
=== modified file 'knowledge/__openerp__.py'
--- knowledge/__openerp__.py 2011-03-25 10:24:13 +0000
+++ knowledge/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,6 +25,7 @@
"version" : "1.0",
"depends" : ["base"],
"author" : "OpenERP SA",
+<<<<<<< TREE
"category": 'Tools',
"description": """
Installer for knowledge-based tools.
@@ -32,6 +33,12 @@
Makes the Knowledge Application Configuration available from where you can install
document and Wiki based tools.
+=======
+ "category": 'Tools',
+ "description": """
+Installer for knowledge-based tools.
+====================================
+>>>>>>> MERGE-SOURCE
""",
'website': 'http://www.openerp.com',
'init_xml': [],
=== modified file 'l10n_be/__openerp__.py'
--- l10n_be/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_be/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -27,11 +27,18 @@
After installing this module, the Configuration wizard for accounting is launched.
* We have the account templates which can be helpful to generate Charts of Accounts.
+<<<<<<< TREE
* On that particular wizard, you will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate, the code for your account and bank account, currency to create journals.
Thus, the pure copy of Chart Template is generated.
Wizards provided by this module:
+=======
+ * On that particular wizard, you will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate, the code for your account and bank account, currency to create journals.
+Thus,the pure copy of Chart Template is generated.
+
+Wizards provided by this module:
+>>>>>>> MERGE-SOURCE
* Partner VAT Intra: Enlist the partners with their related VAT and invoiced amounts.Prepares an XML file format.
Path to access : Accounting/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing
* Periodical VAT Declaration: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.
=== modified file 'l10n_br/__openerp__.py'
--- l10n_br/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_br/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -21,6 +21,7 @@
{
'name': 'Brazilian Localization',
'description': 'Brazilian Localization',
+<<<<<<< TREE
'category': 'Finance',
'description': """
This is the base module to manage the accounting chart for Brazil in OpenERP.
@@ -28,6 +29,13 @@
Brazilian accounting chart and localization.
""",
+=======
+ 'category': 'Finance',
+ 'description': """
+This is the base module to manage the accounting chart for Brazil in OpenERP.
+==============================================================================
+ """,
+>>>>>>> MERGE-SOURCE
'author': 'OpenERP Brasil',
'website': 'http://openerpbrasil.org',
'version': '0.6',
=== modified file 'l10n_ca/__openerp__.py'
--- l10n_ca/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_ca/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -23,6 +23,7 @@
"version" : "1.0",
"author" : "Savoir-faire Linux",
"website" : "http://www.savoirfairelinux.com";,
+<<<<<<< TREE
"category" : "Finance",
"description": """
This is the module to manage the English and French - Canadian accounting chart in OpenERP.
@@ -30,6 +31,13 @@
Canadian accounting charts and localizations.
""",
+=======
+ "category" : "Finance",
+ "description": """
+This is the module to manage the English and French - Canadian accounting chart in OpenERP.
+===========================================================================================
+ """,
+>>>>>>> MERGE-SOURCE
"depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
"init_xml" : [],
"update_xml" : [
=== renamed file 'l10n_cr/images/l10n_cr_chart.jpeg' => 'l10n_cr/images/l10n_cr_chart.jpeg.OTHER'
Binary files l10n_cr/images/l10n_cr_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_cr/images/l10n_cr_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'l10n_de/__openerp__.py'
--- l10n_de/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_de/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -125,6 +125,7 @@
"version" : "1.0",
"author" : "openbig.org",
"website" : "http://www.openbig.org";,
+<<<<<<< TREE
"category" : "Finance",
"description": """
Dieses Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
@@ -132,6 +133,13 @@
German accounting chart and localization.
""",
+=======
+ "category" : "Finance",
+ "description": """
+Dieses Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.
+==============================================================================
+ """,
+>>>>>>> MERGE-SOURCE
"depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'],
"init_xml" : [ ],
"demo_xml" : [ ],
=== modified file 'l10n_ec/__openerp__.py'
--- l10n_ec/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_ec/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -22,10 +22,15 @@
'version': '1.1',
'category': 'Finance',
'description': """
+<<<<<<< TREE
This is the base module to manage the accounting chart for Ecuador in OpenERP.
==============================================================================
Accounting chart and localization for Ecuador.
+=======
+This is the base module to manage the accounting chart for Ecuador in OpenERP.
+==============================================================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'depends': [
=== renamed file 'l10n_ec/images/l10n_ec_chart.jpeg' => 'l10n_ec/images/l10n_ec_chart.jpeg.OTHER'
Binary files l10n_ec/images/l10n_ec_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_ec/images/l10n_ec_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'l10n_es/images/l10n_es_chart.jpeg' => 'l10n_es/images/l10n_es_chart.jpeg.OTHER'
Binary files l10n_es/images/l10n_es_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_es/images/l10n_es_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'l10n_fr/images/l10n_fr_chart.jpeg' => 'l10n_fr/images/l10n_fr_chart.jpeg.OTHER'
Binary files l10n_fr/images/l10n_fr_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_fr/images/l10n_fr_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'l10n_gr/__openerp__.py'
--- l10n_gr/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_gr/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -24,6 +24,7 @@
"version" : "0.2",
"author" : "P. Christeas, OpenERP SA.",
"website": "http://openerp.hellug.gr/";,
+<<<<<<< TREE
"category" : "Finance",
"description": """
This is the base module to manage the accounting chart for Greece.
@@ -31,6 +32,13 @@
Greek accounting chart and localization.
""",
+=======
+ "category" : "Finance",
+ "description": """
+This is the base module to manage the accounting chart for Greece.
+==================================================================
+ """,
+>>>>>>> MERGE-SOURCE
"depends" : ["base", "account", "base_iban", "base_vat", "account_chart"],
"init_xml" : [],
"demo_xml" : [],
=== renamed file 'l10n_gr/images/l10n_gr_chart.jpeg' => 'l10n_gr/images/l10n_gr_chart.jpeg.OTHER'
Binary files l10n_gr/images/l10n_gr_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_gr/images/l10n_gr_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'l10n_in/__openerp__.py'
--- l10n_in/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_in/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -23,10 +23,15 @@
"name": "Indian Chart of Account",
"version": "1.0",
"description": """
+<<<<<<< TREE
Indian Accounting : Chart of Account.
=====================================
Indian accounting chart and localization.
+=======
+Indian Accounting : Chart of Account.
+=====================================
+>>>>>>> MERGE-SOURCE
""",
"author": ['OpenERP SA', 'Axelor'],
"category": "Finance",
=== renamed file 'l10n_in/images/l10n_in_chart.jpeg' => 'l10n_in/images/l10n_in_chart.jpeg.OTHER'
Binary files l10n_in/images/l10n_in_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_in/images/l10n_in_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'l10n_it/__openerp__.py'
--- l10n_it/__openerp__.py 2011-03-25 16:06:33 +0000
+++ l10n_it/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -30,10 +30,15 @@
"depends" : ['base_vat','account_chart','base_iban'],
"author" : "OpenERP Italian Community",
"description": """
+<<<<<<< TREE
Piano dei conti italiano di un'impresa generica.
================================================
Italian accounting chart and localization.
+=======
+Piano dei conti italiano di un'impresa generica.
+================================================
+>>>>>>> MERGE-SOURCE
""",
"license": "AGPL-3",
"category" : "Finance",
=== renamed file 'l10n_it/images/l10n_it_chart.jpeg' => 'l10n_it/images/l10n_it_chart.jpeg.OTHER'
Binary files l10n_it/images/l10n_it_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_it/images/l10n_it_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'l10n_lu/__openerp__.py'
=== renamed file 'l10n_lu/images/l10n_lu_chart.jpeg' => 'l10n_lu/images/l10n_lu_chart.jpeg.OTHER'
Binary files l10n_lu/images/l10n_lu_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_lu/images/l10n_lu_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'l10n_mx/__openerp__.py'
--- l10n_mx/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_mx/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -23,6 +23,7 @@
"name" : "Mexico - Chart of Account",
"version" : "1.0",
"author" : "RelTek Mexico",
+<<<<<<< TREE
"category" : "Finance",
"description": """
This is the module to manage the accounting chart for Mexico in OpenERP.
@@ -30,6 +31,13 @@
Mexican accounting chart and localization.
""",
+=======
+ "category" : "Finance",
+ "description": """
+This is the module to manage the accounting chart for Mexico in OpenERP.
+========================================================================
+ """,
+>>>>>>> MERGE-SOURCE
"depends" : ["account", "base_vat", "account_chart"],
"demo_xml" : [],
"update_xml" : ['account_tax_code.xml',"account_chart.xml",
=== modified file 'l10n_ro/__openerp__.py'
--- l10n_ro/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_ro/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -26,12 +26,19 @@
"website": "http://www.filsystem.ro";,
"category" : "Finance",
"depends" : ["account_chart", 'base_vat'],
+<<<<<<< TREE
"description": """
This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
================================================================================================================
Romanian accounting chart and localization.
""",
+=======
+ "description": """
+This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP.
+================================================================================================================
+ """,
+>>>>>>> MERGE-SOURCE
"demo_xml" : [],
"update_xml" : ['partner_view.xml','account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_ro_wizard.xml'],
"active": False,
=== modified file 'l10n_th/__openerp__.py'
--- l10n_th/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_th/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -24,10 +24,15 @@
'version': '1.0',
'category': 'Finance',
'description': """
+<<<<<<< TREE
Chart of Accounts for Thailand.
===============================
Thai accounting chart and localization.
+=======
+Chart of Accounts for Thailand.
+===============================
+>>>>>>> MERGE-SOURCE
""",
'author': 'Almacom',
'website': 'http://almacom.co.th/',
=== renamed file 'l10n_th/images/l10n_th_chart.jpeg' => 'l10n_th/images/l10n_th_chart.jpeg.OTHER'
Binary files l10n_th/images/l10n_th_chart.jpeg 2011-03-21 13:37:47 +0000 and l10n_th/images/l10n_th_chart.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'l10n_uk/__openerp__.py'
--- l10n_uk/__openerp__.py 2011-03-25 10:24:13 +0000
+++ l10n_uk/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -60,6 +60,7 @@
{
'name': 'United Kingdom - minimal',
'version': '1.1',
+<<<<<<< TREE
'category': 'Finance',
'description': """
This is the base module to manage the accounting chart for United Kingdom in OpenERP.
@@ -67,6 +68,13 @@
British accounting chart and localization.
""",
+=======
+ 'category': 'Finance',
+ 'description': """
+This is the base module to manage the accounting chart for United Kingdom in OpenERP.
+=====================================================================================
+ """,
+>>>>>>> MERGE-SOURCE
'author': 'Seath Solutions Ltd',
'website': 'http://www.seathsolutions.com',
'depends': ['base_iban', 'base_vat', 'account_chart'],
=== modified file 'mail_gateway/i18n/de.po'
--- mail_gateway/i18n/de.po 2011-04-04 04:47:57 +0000
+++ mail_gateway/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,25 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:21+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-12-29 10:38+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:59+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: mail_gateway
#: field:mailgate.message,res_id:0
@@ -117,8 +128,13 @@
#. module: mail_gateway
#: code:addons/mail_gateway/mail_gateway.py:250
#, python-format
+<<<<<<< TREE
msgid " wrote on %s:\n"
msgstr " geschrieben am %s:\n"
+=======
+msgid " wrote on %s:\n"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: mail_gateway
#: view:mailgate.message:0
@@ -290,8 +306,13 @@
#. module: mail_gateway
#: code:addons/mail_gateway/mail_gateway.py:254
#, python-format
+<<<<<<< TREE
msgid " on %s:\n"
msgstr " am %s:\n"
+=======
+msgid " on %s:\n"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: mail_gateway
#: view:mailgate.message:0
=== modified file 'mail_gateway/mail_gateway.py'
--- mail_gateway/mail_gateway.py 2011-04-07 09:27:30 +0000
+++ mail_gateway/mail_gateway.py 2011-04-11 14:26:52 +0000
@@ -251,7 +251,11 @@
for message in self.browse(cr, uid, ids, context=context):
msg_txt = ''
if message.history:
+<<<<<<< TREE
msg_txt += _('%s wrote on %s: \n Subject: %s \n\t') % (message.email_from or '/', format_date_tz(message.date, tz), message.name)
+=======
+ msg_txt += _('%s wrote on %s:\n\t') % (message.email_from or '/', format_date_tz(message.date, tz))
+>>>>>>> MERGE-SOURCE
if message.description:
msg_txt += self.truncate_data(cr, uid, message.description, context=context)
else:
=== modified file 'marketing_campaign/__openerp__.py'
--- marketing_campaign/__openerp__.py 2011-03-22 13:12:14 +0000
+++ marketing_campaign/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -61,6 +61,10 @@
'installable': True,
'active': False,
'certificate' : '00421723279617928365',
+<<<<<<< TREE
'images': ['images/campaign.png', 'images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
+=======
+ 'images': ['images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'],
+>>>>>>> MERGE-SOURCE
}
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== renamed file 'marketing_campaign/images/email_templates.jpeg' => 'marketing_campaign/images/email_templates.jpeg.OTHER'
Binary files marketing_campaign/images/email_templates.jpeg 2011-03-21 13:37:47 +0000 and marketing_campaign/images/email_templates.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'marketing_campaign_crm_demo/__openerp__.py'
--- marketing_campaign_crm_demo/__openerp__.py 2011-03-25 10:24:13 +0000
+++ marketing_campaign_crm_demo/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -27,6 +27,7 @@
"crm",
],
"author" : "OpenERP SA",
+<<<<<<< TREE
"category": 'Sales',
"description": """
Demo data for the module marketing_campaign.
@@ -34,6 +35,13 @@
Creates demo data like leads, campaigns and segments for the module marketing_campaign.
""",
+=======
+ "category": 'Sales',
+ "description": """
+Demo data for the module marketing_campaign.
+============================================
+ """,
+>>>>>>> MERGE-SOURCE
'website': 'http://www.openerp.com',
'init_xml': [],
'update_xml': [],
=== renamed file 'marketing_campaign_crm_demo/images/campaigns.jpeg' => 'marketing_campaign_crm_demo/images/campaigns.jpeg.OTHER'
Binary files marketing_campaign_crm_demo/images/campaigns.jpeg 2011-03-21 13:37:47 +0000 and marketing_campaign_crm_demo/images/campaigns.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'marketing_campaign_crm_demo/images/email_templates.jpeg' => 'marketing_campaign_crm_demo/images/email_templates.jpeg.OTHER'
Binary files marketing_campaign_crm_demo/images/email_templates.jpeg 2011-03-21 13:37:47 +0000 and marketing_campaign_crm_demo/images/email_templates.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'membership/__openerp__.py'
--- membership/__openerp__.py 2011-03-25 10:24:13 +0000
+++ membership/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -30,7 +30,12 @@
It supports different kind of members:
* Free member
+<<<<<<< TREE
* Associated member (eg.: a group subscribes to a membership for all subsidiaries)
+=======
+* Associated member (eg.: a group subscribes to a membership for all
+ subsidiaries)
+>>>>>>> MERGE-SOURCE
* Paid members,
* Special member prices, ...
=== modified file 'mrp/i18n/ca.po'
--- mrp/i18n/ca.po 2011-03-27 04:53:32 +0000
+++ mrp/i18n/ca.po 2011-04-11 14:26:52 +0000
@@ -7,15 +7,25 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-26 18:50+0000\n"
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@xxxxxxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-27 12:27+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-27 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 05:00+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: field:mrp.production,move_created_ids:0
=== modified file 'mrp/i18n/de.po'
--- mrp/i18n/de.po 2011-04-04 04:47:57 +0000
+++ mrp/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:21+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-18 11:32+0000\n"
+"Last-Translator: Ferdinand-chricar <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:46+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 05:00+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: field:mrp.production,move_created_ids:0
@@ -605,8 +615,13 @@
#. module: mrp
#: help:mrp.workcenter,costs_cycle:0
+<<<<<<< TREE
msgid "Specify Cost of Work Center per cycle."
msgstr "Kosten des Arbeitsplatzes je Zyklus"
+=======
+msgid "Specify Cost of Work Center per cycle."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: selection:mrp.production,state:0
@@ -848,8 +863,13 @@
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+<<<<<<< TREE
msgid "Work Center Usage"
msgstr "Arbeitsplatz Auslastung"
+=======
+msgid "Work Center Usage"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production
@@ -1026,8 +1046,11 @@
"Number of operations this Work Center can do in parallel. If this Work "
"Center represents a team of 5 workers, the capacity per cycle is 5."
msgstr ""
+<<<<<<< TREE
"Anzahl der parallel durchführbaren Arbeitsgäng je Arbeitsplatz. Wenn der "
"Arbeitsplatz 5 Mitarbeiter darstellt, dann beträgt die Kapazität 5."
+=======
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: model:process.transition,note:mrp.process_transition_servicerfq0
@@ -2284,10 +2307,13 @@
"Routing is indicated then,the third tab of a production order (Work Centers) "
"will be automatically pre-completed."
msgstr ""
+<<<<<<< TREE
"Der Fertigungsablauf bestimmt, wie lange und wieviele Zyklen der jeweiligen "
"Arbeitsplätze verwendet werden. Wenn ein Fertigungsablauf definiert ist, "
"wird der entsprechende Reiter eines Produktionsauftrages (Arbeitsplätze) "
"automatisch vorausgefüllt"
+=======
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_bom_revision
@@ -2317,8 +2343,11 @@
"Description of the Work Center. Explain here what's a cycle according to "
"this Work Center."
msgstr ""
+<<<<<<< TREE
"Beschreibung des Arbeitsplatzes. Was ist unter Zyklus dieses Arbetisplatzes "
"zu verstehen."
+=======
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_routing
=== modified file 'mrp/i18n/ro.po'
--- mrp/i18n/ro.po 2011-03-24 04:50:30 +0000
+++ mrp/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-23 12:20+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-03-09 21:08+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-24 04:49+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 05:01+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: field:mrp.production,move_created_ids:0
@@ -842,8 +852,13 @@
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_routing_workcenter
+<<<<<<< TREE
msgid "Work Center Usage"
msgstr "Utilizare post de lucru"
+=======
+msgid "Work Center Usage"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: model:ir.model,name:mrp.model_mrp_production
@@ -1722,7 +1737,11 @@
#: field:mrp.production,date_finished:0
#: field:mrp.production.order,date_finished:0
msgid "End Date"
+<<<<<<< TREE
msgstr "Dată de sfârșit"
+=======
+msgstr "Data de sfîrșit"
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: field:mrp.workcenter,resource_id:0
=== modified file 'mrp/i18n/ru.po'
--- mrp/i18n/ru.po 2011-03-25 04:40:36 +0000
+++ mrp/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-24 16:01+0000\n"
"Last-Translator: Viktor Prokopiev <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-11-27 11:08+0000\n"
+"Last-Translator: qdp (OpenERP) <qdp-launchpad@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-12 05:01+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: field:mrp.production,move_created_ids:0
@@ -282,7 +292,11 @@
#. module: mrp
#: view:mrp.installer:0
msgid "title"
+<<<<<<< TREE
msgstr "title"
+=======
+msgstr "заголовок"
+>>>>>>> MERGE-SOURCE
#. module: mrp
#: model:ir.ui.menu,name:mrp.menu_mrp_bom
@@ -2456,6 +2470,7 @@
#: view:mrp.production.order:0
#: field:mrp.production.order,year:0
msgid "Year"
+<<<<<<< TREE
msgstr "Год"
#~ msgid "-"
@@ -2977,3 +2992,512 @@
#~ msgstr ""
#~ "ОпиÑание рабочего центра. ОбъÑÑните здеÑÑŒ, каков цикл Ð´Ð»Ñ Ñтого рабочего "
#~ "центра."
+=======
+msgstr ""
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "Packing list"
+#~ msgstr "Упаковочный лиÑÑ‚"
+
+#~ msgid "Origin"
+#~ msgstr "ПроиÑхождение"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ðеправильный XML Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра архитектуры!"
+
+#~ msgid "Product & Location"
+#~ msgstr "ÐŸÑ€Ð¾Ð´ÑƒÐºÑ†Ð¸Ñ Ð¸ меÑтоположениÑ"
+
+#~ msgid "Analytic Accounting"
+#~ msgstr "Бухг. аналитика"
+
+#~ msgid "Internal Ref."
+#~ msgstr "ВнутреннÑÑ ÑÑылка"
+
+#~ msgid "Status"
+#~ msgstr "СтатуÑ"
+
+#~ msgid "Production Orders"
+#~ msgstr "Заказы на производÑтво"
+
+#~ msgid "Procurements"
+#~ msgstr "Снабжение"
+
+#~ msgid "Production scheduled products"
+#~ msgstr "Ð—Ð°Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ Ðº производÑтву продукциÑ"
+
+#~ msgid "Details"
+#~ msgstr "ПодробноÑти"
+
+#~ msgid "Reservation"
+#~ msgstr "Резервирование"
+
+#~ msgid "max"
+#~ msgstr "макÑимум"
+
+#~ msgid "Print product price"
+#~ msgstr "РаÑпечатать цену продукции"
+
+#~ msgid "Latest error"
+#~ msgstr "ПоÑледнÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°"
+
+#~ msgid "Waiting"
+#~ msgstr "В ожидании"
+
+#~ msgid "indice type"
+#~ msgstr "тип индекÑа"
+
+#~ msgid "Min Quantity"
+#~ msgstr "Мин. кол-во"
+
+#~ msgid "Production orders"
+#~ msgstr "Заказы на производÑтво"
+
+#~ msgid "Procurement Lines"
+#~ msgstr "Позиции ÑнабжениÑ"
+
+#~ msgid "Exception"
+#~ msgstr "ИÑключение"
+
+#~ msgid "Production done"
+#~ msgstr "ПроизводÑтво завершено"
+
+#~ msgid "References"
+#~ msgstr "СÑылки"
+
+#~ msgid "Machine"
+#~ msgstr "Машина"
+
+#~ msgid "min"
+#~ msgstr "минимум"
+
+#~ msgid "on order"
+#~ msgstr "в заказе"
+
+#~ msgid "Run procurement"
+#~ msgstr "ИÑполнить Ñнабжение"
+
+#~ msgid "Scheduler Parameters"
+#~ msgstr "Параметры планировщика"
+
+#~ msgid "Procurement Method"
+#~ msgstr "Метод ÑнабжениÑ"
+
+#~ msgid "Compute Procurements"
+#~ msgstr "РаÑÑчитать Ñнабжение"
+
+#~ msgid "Location"
+#~ msgstr "МеÑтоположение"
+
+#~ msgid "New Procurement"
+#~ msgstr "Ðовое Ñнабжение"
+
+#~ msgid "Tool"
+#~ msgstr "ИнÑтрумент"
+
+#~ msgid "Max Quantity"
+#~ msgstr "МакÑ. кол-во"
+
+#~ msgid "alphabetical indices"
+#~ msgstr "алфавитные указатели"
+
+#~ msgid "Paid ?"
+#~ msgstr "Оплачено ?"
+
+#~ msgid "Date Closed"
+#~ msgstr "Дата закрытиÑ"
+
+#~ msgid "Properties composition"
+#~ msgstr "СоÑтавление ÑвойÑтв"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ðазвание объекта должно начинатьÑÑ Ñ x_ и не должно Ñодержать Ñпециальных "
+#~ "Ñимволов !"
+
+#~ msgid "Production Orders in Progress"
+#~ msgstr "ИÑполнÑемые заказы на производÑтво"
+
+#~ msgid "Product UoM"
+#~ msgstr "Ед. изм. продукции"
+
+#~ msgid "numeric indices"
+#~ msgstr "чиÑленные индекÑÑ‹"
+
+#~ msgid "Property Categories"
+#~ msgstr "Категории ÑвойÑтв"
+
+#~ msgid "Temporary Procurement Exceptions"
+#~ msgstr "Временные иÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ ÑнабжениÑ"
+
+#~ msgid "Confirmed"
+#~ msgstr "Подтверждено"
+
+#~ msgid "Parameters"
+#~ msgstr "Параметры"
+
+#~ msgid "New Bill of Materials"
+#~ msgstr "ÐÐ¾Ð²Ð°Ñ ÑпецификациÑ"
+
+#~ msgid "Property"
+#~ msgstr "СвойÑтво"
+
+#~ msgid "Canceled"
+#~ msgstr "Отменено"
+
+#~ msgid "plus"
+#~ msgstr "плюÑ"
+
+#~ msgid "New Production Order"
+#~ msgstr "Ðовый заказ на производÑтво"
+
+#~ msgid "Retry"
+#~ msgstr "Повторить"
+
+#~ msgid "Procurement Reason"
+#~ msgstr "Причина ÑнабжениÑ"
+
+#~ msgid "from stock"
+#~ msgstr "из запаÑов"
+
+#~ msgid "Warehouse"
+#~ msgstr "Склад"
+
+#~ msgid "Running"
+#~ msgstr "ВыполнÑетÑÑ"
+
+#~ msgid "Unscheduled procurements"
+#~ msgstr "Ðезапланированное Ñнабжение"
+
+#~ msgid "Bill of Material Structure"
+#~ msgstr "Структура Ñпецификации"
+
+#~ msgid "Procurement Details"
+#~ msgstr "Детали ÑнабжениÑ"
+
+#~ msgid "Bill of Materials Components"
+#~ msgstr "Компоненты Ñпецификации"
+
+#~ msgid "Compute Stock Minimum Rules Only"
+#~ msgstr "Правила вычиÑÐ»ÐµÐ½Ð¸Ñ Ð¼Ð¸Ð½Ð¸Ð¼Ð°Ð»ÑŒÐ½Ð¾Ð³Ð¾ запаÑа"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "ÐедопуÑтимое Ð¸Ð¼Ñ Ð¼Ð¾Ð´ÐµÐ»Ð¸ в определении дейÑтвиÑ"
+
+#~ msgid "Exceptions Procurements"
+#~ msgstr "ИÑÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ñтавок"
+
+#~ msgid "MRP & Logistic Scheduler"
+#~ msgstr "ПМРи ЛогиÑтичеÑкое планирование"
+
+#~ msgid "Stockable Stock"
+#~ msgstr "Склад Ð´Ð»Ñ ÑкладированиÑ"
+
+#~ msgid "Not used in computations, for information purpose only."
+#~ msgstr "Ðе иÑпользуетÑÑ Ð² раÑчётах, только Ð´Ð»Ñ Ñправки"
+
+#~ msgid "Do nothing"
+#~ msgstr "Ðичего не делать"
+
+#~ msgid "Workcenters load"
+#~ msgstr "Загрузка рабочей облаÑти"
+
+#~ msgid "Workcenter Load"
+#~ msgstr "Загрузка рабочей облаÑти"
+
+#~ msgid "MRP Management - Reporting"
+#~ msgstr "Управление MRP - Отчёт"
+
+#~ msgid "Workcenter Loads"
+#~ msgstr "Загрузка рабочих облаÑтей"
+
+#, python-format
+#~ msgid "Product name"
+#~ msgstr "Ðазвание изделиÑ"
+
+#~ msgid "Workcenters"
+#~ msgstr "УчаÑтки обработки"
+
+#~ msgid "Packing Exception"
+#~ msgstr "ИÑключение ÑнабжениÑ"
+
+#~ msgid "product"
+#~ msgstr "изделие"
+
+#~ msgid ""
+#~ "When the virtual stock goes belong the Min Quantity, Open ERP generates a "
+#~ "procurement to bring the virtual stock to the Max Quantity."
+#~ msgstr ""
+#~ "Когда запаÑÑ‹(Ñ ÑƒÑ‡Ñ‘Ñ‚Ð¾Ð¼ неподтверждённых операций) доÑтигают минимального "
+#~ "значениÑ, Open ERP автоматичеÑки планирует ÑÐ½Ð°Ð±Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾ доÑÑ‚Ð¸Ð¶ÐµÐ½Ð¸Ñ "
+#~ "макÑимального количеÑтва."
+
+#~ msgid "Procurement Process"
+#~ msgstr "ПроцеÑÑ ÑнабжениÑ"
+
+#~ msgid "Purchase Lead Time"
+#~ msgstr "Ð’Ñ€ÐµÐ¼Ñ Ð´Ð¾Ñтавки"
+
+#~ msgid "Production Orders Planning"
+#~ msgstr "Планирование заказов на производÑтво"
+
+#~ msgid "The system waits for requested products in stock."
+#~ msgstr "Ожидание требуемого материала/Ð¸Ð·Ð´ÐµÐ»Ð¸Ñ Ð½Ð° Ñкладе"
+
+#~ msgid "Number of Cycle"
+#~ msgstr "Кол-во циклов"
+
+#~ msgid "Planned Date"
+#~ msgstr "ÐŸÐ»Ð°Ð½Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ Ð´Ð°Ñ‚Ð°"
+
+#~ msgid ""
+#~ "Procurement is created if the product quantity is lower than the minimum "
+#~ "limit."
+#~ msgstr ""
+#~ "Снабжение начинаетÑ, еÑли количеÑтво продукта ниже минимального предела"
+
+#~ msgid "Define a routing to describe the manufacturing steps."
+#~ msgstr "Задайте маршрут обработки"
+
+#~ msgid "Procurement for raw materials."
+#~ msgstr "Снабжение раÑходными материалами"
+
+#~ msgid "Change Product Qty."
+#~ msgstr "Изменить кол-во"
+
+#~ msgid "Purchase Order"
+#~ msgstr "Заказ на закупку"
+
+#~ msgid "Bill of material revisions"
+#~ msgstr "Ревизии Ñпецификации"
+
+#~ msgid "Compute Procurements Only"
+#~ msgstr "РаÑÑчитать только Ñнабжение"
+
+#~ msgid "If Procure method is Make to order and supply method is buy"
+#~ msgstr "ЕÑли ÑпоÑоб ÑÐ½Ð°Ð±Ð¶ÐµÐ½Ð¸Ñ \"изготовление на заказ\" и изделие закупаетÑÑ"
+
+#~ msgid "If procurement is make to order"
+#~ msgstr "ЕÑли изделие изготовлÑетÑÑ Ð½Ð° заказ"
+
+#~ msgid ""
+#~ "Efficiency on the production. A factor of 0.9 means a loss of 10% in the "
+#~ "production."
+#~ msgstr "КоÑффициент потерь. Значение 0,9 означает потерю 10% продукции."
+
+#~ msgid "A Request for Quotation is created and sent to the supplier."
+#~ msgstr "ЗаÑвка выÑлана поÑтавщику"
+
+#~ msgid ""
+#~ "The list of operations (list of workcenters) to produce the finished "
+#~ "product. The routing is mainly used to compute workcenter costs during "
+#~ "operations and to plan futur loads on workcenters based on production "
+#~ "plannification."
+#~ msgstr ""
+#~ "СпиÑок операций и учаÑтков обработки Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ñтва готового изделиÑ. "
+#~ "Обычно иÑпользуетÑÑ Ð´Ð»Ñ Ñ€Ð°Ñчёта и Ð¿Ð»Ð°Ð½Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ учаÑтков."
+
+#~ msgid "Next production orders"
+#~ msgstr "Ближайшие заказы на производÑтво"
+
+#~ msgid "You can see its bill of material which are used to make product"
+#~ msgstr "ПоÑмотреть Ñпецификацию, по которой изготовлÑетÑÑ Ð¸Ð·Ð´ÐµÐ»Ð¸Ðµ"
+
+#~ msgid "UoS Quantity"
+#~ msgstr "Кол-во во второй единице измерениÑ"
+
+#, python-format
+#~ msgid "Warning !"
+#~ msgstr "Внимание!"
+
+#, python-format
+#~ msgid "No supplier defined for this product !"
+#~ msgstr "Ð”Ð»Ñ Ñтого изделиÑ/материала не задан поÑтавщик!"
+
+#~ msgid "Products Consummed"
+#~ msgstr "ИзраÑходованные"
+
+#~ msgid "This wizard will schedule procurements."
+#~ msgstr "Ðтот маÑтер планирует Ñнабжение"
+
+#, python-format
+#~ msgid "Workcenter name"
+#~ msgstr "Ðаименование учаÑтка обработки"
+
+#, python-format
+#~ msgid "from stock: products assigned."
+#~ msgstr "Со Ñклада: изделие доÑтавлено."
+
+#~ msgid "Exceptions Procurements to Fix"
+#~ msgstr "ИÑключительные Ñитуации ÑнабжениÑ, требующие вмешательÑтва"
+
+#~ msgid "Workcenter Operations"
+#~ msgstr "Обрабатывающие операции"
+
+#, python-format
+#~ msgid "TOTAL"
+#~ msgstr "Итого"
+
+#~ msgid ""
+#~ "This is the internal picking list take bring the raw materials to the "
+#~ "production plan."
+#~ msgstr ""
+#~ "Внутренне перемещение раÑходных материалов Ñо Ñклада на производÑтвенный "
+#~ "цчаÑток"
+
+#~ msgid "BoM Hyerarchy"
+#~ msgstr "Дерево Ñпецификаций"
+
+#~ msgid ""
+#~ "This wizard will planify the procurement for this product. This procurement "
+#~ "may generate task, production orders or purchase orders."
+#~ msgstr ""
+#~ "Ðтот маÑтер планирует Ñнабжение изделием или материалом. Он может Ñоздать "
+#~ "задачу, заказ на производÑтво или заказ на Ñнабжение."
+
+#~ msgid "Workcenter Name"
+#~ msgstr "Ðаименование учаÑтка обработки"
+
+#~ msgid ""
+#~ "Description of the workcenter. Explain here what's a cycle according to this "
+#~ "workcenter."
+#~ msgstr ""
+#~ "ОпиÑание учаÑтка обработка. Укажите здеÑÑŒ, что ÑоответÑтвует циклу учаÑтка."
+
+#~ msgid "OTK"
+#~ msgstr "ПредъÑвление продукции ОТК"
+
+#~ msgid "Create minimum stock rules"
+#~ msgstr "Создать правила мин. запаÑов"
+
+#~ msgid "Factor that multiplies all times expressed in the workcenter."
+#~ msgstr "КоÑффициент, на который умножаютÑÑ Ð²Ñе времена учаÑтка обработки."
+
+#~ msgid "Unit of Measure"
+#~ msgstr "Ед. изм."
+
+#~ msgid "Number of products to produce"
+#~ msgstr "КоличеÑтво выпуÑкаемых изделий"
+
+#~ msgid "Minimum stock rule"
+#~ msgstr "Правило минимальных запаÑов"
+
+#~ msgid "Product Efficiency"
+#~ msgstr "ÐффективноÑÑ‚ÑŒ продукта"
+
+#~ msgid ""
+#~ "Location where the system will look for products used in raw materials."
+#~ msgstr "МеÑтоположение раÑходных материалов Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð¸Ð·Ð²Ð¾Ð´Ñтва"
+
+#~ msgid "Procurement Request"
+#~ msgstr "Запланировать Ñнабжение"
+
+#~ msgid "Note"
+#~ msgstr "ПримечаниÑ"
+
+#~ msgid "Minimum Stock Rules"
+#~ msgstr "Правила минимальных запаÑов"
+
+#~ msgid ""
+#~ "Reference of the document that created this procurement.\n"
+#~ "This is automatically completed by Open ERP."
+#~ msgstr ""
+#~ "Ðомер документа, Ñ ÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼ ÑвÑзан Ñтот заказ на Ñнабжение. ÐвтоматичеÑки "
+#~ "заполнÑетÑÑ OpenERP."
+
+#~ msgid "Workcenter"
+#~ msgstr "УчаÑток обработки"
+
+#~ msgid "Production Workcenters"
+#~ msgstr "ПроизводÑтвенные учаÑтки"
+
+#~ msgid ""
+#~ "If you encode manually a procurement, you probably want to use a make to "
+#~ "order method."
+#~ msgstr ""
+#~ "ЕÑли вы планируете Ñнабжение вручную, вам, вероÑтно, нужен метод "
+#~ "\"изготовление под заказ\""
+
+#~ msgid "Internal Procurement Request"
+#~ msgstr "ВнутреннÑÑ Ð·Ð°Ñвка на Ñнабжение"
+
+#~ msgid "Error!"
+#~ msgstr "Ошибка!"
+
+#~ msgid "Minimum Stock Rule"
+#~ msgstr "Правило минимальных запаÑов"
+
+#~ msgid "Production Orders To Start"
+#~ msgstr "Заказы на производÑтво Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка"
+
+#~ msgid "Sale Name"
+#~ msgstr "Заказ на продажу"
+
+#~ msgid "Workcenter load"
+#~ msgstr "Загрузка учаÑтка обработки"
+
+#~ msgid "Routing Workcenters"
+#~ msgstr "УчаÑтки обработки в маршруте"
+
+#~ msgid ""
+#~ "Number of operation this workcenter can do in parallel. If this workcenter "
+#~ "represent a team of 5 workers, the capacity per cycle is 5."
+#~ msgstr ""
+#~ "КоличеÑтво одновременно выполнÑемых операций на учаÑтке. Ðапример, еÑли "
+#~ "учаÑтке обработки пÑÑ‚ÑŒ рабочих, то производительноÑÑ‚ÑŒ на цикл равна 5."
+
+#~ msgid "Automatic Procurements"
+#~ msgstr "ÐвтоматичеÑкое Ñнабжение"
+
+#~ msgid "A purchase order is created for a sub-contracting demand."
+#~ msgstr "Заказ на закупку ÑоздаётÑÑ Ð² целÑÑ… Ñубконтрактинга"
+
+#~ msgid "If Procure method is Make to order and supply method is produce"
+#~ msgstr ""
+#~ "ЕÑли метод ÑÐ½Ð°Ð±Ð¶Ð½Ð¸Ñ - изготовлние на заказ, и метод поÑтавки - производÑтво."
+
+#~ msgid "If Product type is service and procure method is Make to stock"
+#~ msgstr "ЕÑли Ñто уÑлуга и метод ÑÐ½Ð°Ð±Ð¶ÐµÐ½Ð¸Ñ - изготовление про запаÑ"
+
+#~ msgid "If Product type is service"
+#~ msgstr "ЕÑли уÑлуга"
+
+#~ msgid "A cycle is defined in the workcenter definition."
+#~ msgstr "Цикл задаётÑÑ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ учаÑтка обработки"
+
+#~ msgid "Time Efficiency"
+#~ msgstr "КоÑффициент ÑффективноÑти"
+
+#~ msgid "Sale Ref"
+#~ msgstr "Ðомер заказа на продажу"
+
+#~ msgid "Procurement orders"
+#~ msgstr "Заказы на производÑтво"
+
+#~ msgid "If product type is service and procure method is Make to order"
+#~ msgstr "ЕÑли уÑлуга и метод ÑÐ½Ð°Ð±Ð¶Ð½Ð¸Ñ - изготовление на заказ"
+
+#~ msgid "Production Orders Waiting Products"
+#~ msgstr "Заказы на производÑтво в ожидании материалов"
+
+#~ msgid "Define the product structure, with sub-products and/or components."
+#~ msgstr "Задайте Ñтруктуру изделиÑ, Ñ Ð²Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ‹Ð¼Ð¸ Ñборками и компонентами"
+
+#~ msgid "Product type is Stockable and procure method is make to stock"
+#~ msgstr "Изделие подлежит учёту и метод ÑÐ½Ð°Ð±Ð¶ÐµÐ½Ð¸Ñ - изготовление про запаÑ"
+
+#~ msgid "Your procurement request has been sent !"
+#~ msgstr "ЗаÑвка на Ñнабжение отправлена!"
+
+#~ msgid "MRP & Logistics Scheduler"
+#~ msgstr "ПМРи ЛогиÑтичеÑкое планирование"
+
+#~ msgid "Workcenter Usage"
+#~ msgstr "ИÑпользование Рабочего центра"
+
+#~ msgid "Human Resource"
+#~ msgstr "ЛюдÑкие реÑурÑÑ‹"
+>>>>>>> MERGE-SOURCE
=== modified file 'mrp/mrp.py'
=== modified file 'mrp_operations/__openerp__.py'
--- mrp_operations/__openerp__.py 2011-03-25 10:24:13 +0000
+++ mrp_operations/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,18 +25,31 @@
'version': '1.0',
'category': 'Manufacturing',
'description': """
-This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
-=============================================================================================================
-
-State: draft, confirm, done, cancel
-When finishing/confirming,cancelling production orders set all state lines to the according state
-
-Create menus:
- Manufacturing > Manufacturing > Work Orders
-
-Which is a view on "Work Centers" lines in production order.
-
-Add buttons in the form view of production order under workcenter tab:
+<<<<<<< TREE
+This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
+=============================================================================================================
+
+State: draft, confirm, done, cancel
+When finishing/confirming,cancelling production orders set all state lines to the according state
+
+Create menus:
+ Manufacturing > Manufacturing > Work Orders
+
+Which is a view on "Work Centers" lines in production order.
+
+Add buttons in the form view of production order under workcenter tab:
+=======
+This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
+=============================================================================================================
+
+State: draft, confirm, done, cancel
+When finishing/confirming,cancelling production orders set all state lines to the according state
+Create menus:
+ Manufacturing > Manufacturing > Work Orders
+Which is a view on "Work Centers" lines in production order.
+
+Add buttons in the form view of production order under workcenter tab:
+>>>>>>> MERGE-SOURCE
* start (set state to confirm), set date_start
* done (set state to done), set date_stop
* set to draft (set state to draft)
=== renamed file 'mrp_repair/images/repair_order.jpeg' => 'mrp_repair/images/repair_order.jpeg.OTHER'
Binary files mrp_repair/images/repair_order.jpeg 2011-03-23 08:12:25 +0000 and mrp_repair/images/repair_order.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'mrp_subproduct/__openerp__.py'
=== modified file 'mrp_subproduct/i18n/ru.po'
--- mrp_subproduct/i18n/ru.po 2011-04-07 04:37:58 +0000
+++ mrp_subproduct/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 5.0.4\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-06 06:04+0000\n"
"Last-Translator: Viktor Prokopiev <Unknown>\n"
+=======
+"PO-Revision-Date: 2009-02-04 06:32+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-07 04:37+0000\n"
"X-Generator: Launchpad (build 12735)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-06 05:28+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+>>>>>>> MERGE-SOURCE
#. module: mrp_subproduct
#: field:mrp.subproduct,product_id:0
@@ -117,6 +127,7 @@
#. module: mrp_subproduct
#: selection:mrp.subproduct,subproduct_type:0
msgid "Fixed"
+<<<<<<< TREE
msgstr "ФикÑированный"
#~ msgid "Invalid XML for View Architecture!"
@@ -127,3 +138,15 @@
#~ msgstr ""
#~ "Ðазвание объекта должно начинатьÑÑ Ñ x_ и не должно Ñодержать Ñпециальных "
#~ "Ñимволов !"
+=======
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Ðеправильный XML Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра архитектуры!"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Ðазвание объекта должно начинатьÑÑ Ñ x_ и не должно Ñодержать Ñпециальных "
+#~ "Ñимволов !"
+>>>>>>> MERGE-SOURCE
=== renamed file 'mrp_subproduct/images/bom_subproduct.jpeg' => 'mrp_subproduct/images/bom_subproduct.jpeg.OTHER'
Binary files mrp_subproduct/images/bom_subproduct.jpeg 2011-03-23 08:12:25 +0000 and mrp_subproduct/images/bom_subproduct.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'outlook/images/config_outlook.jpeg' => 'outlook/images/config_outlook.jpeg.OTHER'
Binary files outlook/images/config_outlook.jpeg 2011-03-21 13:37:47 +0000 and outlook/images/config_outlook.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'outlook/images/outlook_config_openerp.jpeg' => 'outlook/images/outlook_config_openerp.jpeg.OTHER'
Binary files outlook/images/outlook_config_openerp.jpeg 2011-03-21 13:37:47 +0000 and outlook/images/outlook_config_openerp.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'outlook/images/outlook_push.jpeg' => 'outlook/images/outlook_push.jpeg.OTHER'
Binary files outlook/images/outlook_push.jpeg 2011-03-21 13:37:47 +0000 and outlook/images/outlook_push.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'point_of_sale/__openerp__.py'
--- point_of_sale/__openerp__.py 2011-03-25 10:24:13 +0000
+++ point_of_sale/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -38,7 +38,11 @@
* Allow to refund former sales.
""",
'author': 'OpenERP SA',
+<<<<<<< TREE
'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg','images/product_pos.jpeg'],
+=======
+ 'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg'],
+>>>>>>> MERGE-SOURCE
'depends': ['sale', 'delivery'],
'init_xml': [],
=== modified file 'point_of_sale/i18n/es.po'
--- point_of_sale/i18n/es.po 2011-03-25 04:40:36 +0000
+++ point_of_sale/i18n/es.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-24 19:00+0000\n"
"Last-Translator: Borja López Soilán <borjalopezsoilan@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-01-13 12:13+0000\n"
+"Last-Translator: Carlos @ smile.fr <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-14 05:04+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: point_of_sale
#: field:pos.discount,discount_notes:0
=== renamed file 'point_of_sale/images/sale_order_pos.jpeg' => 'point_of_sale/images/sale_order_pos.jpeg.OTHER'
Binary files point_of_sale/images/sale_order_pos.jpeg 2011-03-23 09:36:22 +0000 and point_of_sale/images/sale_order_pos.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'process/i18n/ro.po'
--- process/i18n/ro.po 2011-03-25 04:40:36 +0000
+++ process/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-24 12:02+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-02-06 21:20+0000\n"
+"Last-Translator: Mihai Boiciuc <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-02-07 05:19+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: process
#: model:ir.model,name:process.model_process_node
=== modified file 'process/i18n/ru.po'
--- process/i18n/ru.po 2011-04-07 04:37:58 +0000
+++ process/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-06 06:17+0000\n"
"Last-Translator: Stanislav Hanzhin <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-08-03 08:49+0000\n"
+"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-07 04:37+0000\n"
"X-Generator: Launchpad (build 12735)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:16+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: process
#: model:ir.model,name:process.model_process_node
=== renamed file 'process/images/process_transitions.jpeg' => 'process/images/process_transitions.jpeg.OTHER'
Binary files process/images/process_transitions.jpeg 2011-03-21 13:37:47 +0000 and process/images/process_transitions.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'procurement/__openerp__.py'
--- procurement/__openerp__.py 2011-03-25 10:24:13 +0000
+++ procurement/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -28,6 +28,7 @@
"category" : "Warehouse",
"depends" : ["base","process", "product", "stock"],
"description": """
+<<<<<<< TREE
This is the module for computing Procurements.
==============================================
@@ -42,6 +43,10 @@
for the product which needs replenishment. This procurement will start a
task, either a purchase order form for the supplier, or a production order
depending on the product's configuration.
+=======
+This is the module for computing Procurements.
+==============================================
+>>>>>>> MERGE-SOURCE
""",
'init_xml': [],
'update_xml': [
=== modified file 'procurement/i18n/id.po'
--- procurement/i18n/id.po 2011-03-23 04:36:07 +0000
+++ procurement/i18n/id.po 2011-04-11 14:26:52 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Indonesian translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
@@ -921,3 +922,926 @@
#, python-format
msgid "SCHEDULER"
msgstr ""
+=======
+# Indonesian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+"PO-Revision-Date: 2011-03-21 09:53+0000\n"
+"Last-Translator: moelyana <Unknown>\n"
+"Language-Team: Indonesian <id@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-22 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: procurement
+#: view:make.procurement:0
+msgid "Ask New Products"
+msgstr "Tanyakan Produk Baru"
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_sched
+msgid "Schedulers"
+msgstr "Penjadwalan"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_make_procurement
+msgid "Make Procurements"
+msgstr "Buat Procurements"
+
+#. module: procurement
+#: help:procurement.order.compute.all,automatic:0
+msgid ""
+"Triggers an automatic procurement for all products that have a virtual stock "
+"under 0. You should probably not use this option, we suggest using a MTO "
+"configuration on products."
+msgstr ""
+"Memicu pengadaan otomatis untuk semua produk yang memiliki stok virtual "
+"dalam 0. Anda mungkin sebaiknya tidak menggunakan opsi ini, kami sarankan "
+"menggunakan konfigurasi MTO pada produk."
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Group By..."
+msgstr "Dikelompokan berdasarkan ..."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Draft procurement of the product and location of that orderpoint"
+msgstr "Draft pengadaan produk dan lokasi orderpoint yang"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:288
+#, python-format
+msgid "No supplier defined for this product !"
+msgstr "Tidak ada supplier yang ditentukan untuk produk ini!"
+
+#. module: procurement
+#: field:make.procurement,uom_id:0
+msgid "Unit of Measure"
+msgstr "Satuan Ukuran"
+
+#. module: procurement
+#: field:procurement.order,procure_method:0
+msgid "Procurement Method"
+msgstr "Metode Pengadaan"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:298
+#, python-format
+msgid "No address defined for the supplier"
+msgstr "Tidak ada alamat yang ditetapkan untuk suplier"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_procurement_compute
+msgid "Compute Stock Minimum Rules Only"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,company_id:0
+#: field:stock.warehouse.orderpoint,company_id:0
+msgid "Company"
+msgstr "Perusahaan"
+
+#. module: procurement
+#: field:procurement.order,product_uos_qty:0
+msgid "UoS Quantity"
+msgstr "Kuwantitas UoS"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,name:0
+msgid "Reason"
+msgstr "Alasan"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "Compute Procurements"
+msgstr "Hitung Procurements"
+
+#. module: procurement
+#: field:procurement.order,message:0
+msgid "Latest error"
+msgstr "Kesalahan yang terbaru"
+
+#. module: procurement
+#: help:mrp.property,composition:0
+msgid "Not used in computations, for information purpose only."
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_id:0
+msgid "Latest procurement"
+msgstr "Procurement terbaru"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Notes"
+msgstr "Catatan"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "on order"
+msgstr "pada order"
+
+#. module: procurement
+#: help:procurement.order,message:0
+msgid "Exception occurred while computing procurement orders."
+msgstr "Pengecualian terjadi ketika komputasi order procurement"
+
+#. module: procurement
+#: help:procurement.order,state:0
+msgid ""
+"When a procurement is created the state is set to 'Draft'.\n"
+" If the procurement is confirmed, the state is set to 'Confirmed'. "
+" \n"
+"After confirming the state is set to 'Running'.\n"
+" If any exception arises in the order then the state is set to 'Exception'.\n"
+" Once the exception is removed the state becomes 'Ready'.\n"
+" It is in 'Waiting'. state when the procurement is waiting for another one "
+"to finish."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules Search"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_min_qty:0
+msgid ""
+"When the virtual stock goes belong the Min Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Ketika stok virtual terjadi ada di dalam Kuantitas Min, OpenERP "
+"menghasilkan suatu procurement membawa stok virtual ke Kuantitas Max."
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid "Scheduler Parameters"
+msgstr "Parameter Penjadwalan"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_move
+msgid "Stock Move"
+msgstr "Perpindahan Stok"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Planification"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Ready"
+msgstr "Siap"
+
+#. module: procurement
+#: field:procurement.order.compute.all,automatic:0
+msgid "Automatic orderpoint"
+msgstr "Orderpoint Otomatis"
+
+#. module: procurement
+#: field:mrp.property,composition:0
+msgid "Properties composition"
+msgstr "Properties komposisi"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Confirmed"
+msgstr "Dikonfirmasi"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Retry"
+msgstr "Ulangi"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+#: view:procurement.orderpoint.compute:0
+msgid "Parameters"
+msgstr "Parameter"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Confirm"
+msgstr "Konfirmasi"
+
+#. module: procurement
+#: help:procurement.order,origin:0
+msgid ""
+"Reference of the document that created this Procurement.\n"
+"This is automatically completed by OpenERP."
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Procurement Orders to Process"
+msgstr "Orders Procurement untuk diproses"
+
+#. module: procurement
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Error! Anda tidak dapat membuat perusahaan secara berulang ulang"
+
+#. module: procurement
+#: field:procurement.order,priority:0
+msgid "Priority"
+msgstr "Prioritas"
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,state:0
+msgid "State"
+msgstr "Status"
+
+#. module: procurement
+#: field:procurement.order,location_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,location_id:0
+msgid "Location"
+msgstr "Lokasi"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_picking
+msgid "Picking List"
+msgstr "Daftar pengambilan"
+
+#. module: procurement
+#: field:make.procurement,warehouse_id:0
+#: view:stock.warehouse.orderpoint:0
+#: field:stock.warehouse.orderpoint,warehouse_id:0
+msgid "Warehouse"
+msgstr "Gudang"
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Best price (not yet active!)"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Product & Location"
+msgstr "Produk dan lokasi"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute
+msgid "Compute Procurement"
+msgstr "Hitung procurement"
+
+#. module: procurement
+#: model:ir.module.module,shortdesc:procurement.module_meta_information
+#: field:stock.move,procurements:0
+msgid "Procurements"
+msgstr ""
+
+#. module: procurement
+#: field:res.company,schedule_range:0
+msgid "Scheduler Range Days"
+msgstr "Rentang Hari Penjadwalan"
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_action
+msgid ""
+"A procurement order is used to record a need for a specific product at a "
+"specific location. A procurement order is usually created automatically from "
+"sales orders, a Pull Logistics rule or Minimum Stock Rules. When the "
+"procurement order is confirmed, it automatically creates the necessary "
+"operations to fullfil the need: purchase order proposition, manufacturing "
+"order, etc."
+msgstr ""
+"Order procurement digunakan untuk mencatat kebutuhan untuk produk tertentu "
+"di lokasi tertentu. Order procurement biasanya dibuat secara otomatis dari "
+"order penjualan, aturan Tarik Logistik atau Minimum Stock Rules. Ketika "
+"urutan procurement dikonfirmasi, secara otomatis menciptakan operasi "
+"yang diperlukan untuk memenuhi kebutuhan: proposisi order pembelian, order "
+"manufaktur, dll"
+
+#. module: procurement
+#: field:make.procurement,date_planned:0
+msgid "Planned Date"
+msgstr "Tanggal yang di rencanakan"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Group By"
+msgstr "Dikelompokan berdasarkan .."
+
+#. module: procurement
+#: field:make.procurement,qty:0
+#: field:procurement.order,product_qty:0
+msgid "Quantity"
+msgstr "Kuantitas"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:370
+#, python-format
+msgid "Not enough stock and no minimum orderpoint rule defined."
+msgstr ""
+"Tidak cukup stok dan tidak ada aturan orderpoint minimum yang didefinisikan."
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:137
+#, python-format
+msgid "Invalid action !"
+msgstr "Tindakan tidak valid !"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "References"
+msgstr "Referensi"
+
+#. module: procurement
+#: view:res.company:0
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,qty_multiple:0
+msgid "Qty Multiple"
+msgstr ""
+
+#. module: procurement
+#: help:procurement.order,procure_method:0
+msgid ""
+"If you encode manually a Procurement, you probably want to use a make to "
+"order method."
+msgstr ""
+"Jika Anda meng-encode secara manual sebuah Procurement, Anda mungkin ingin "
+"menggunakan metode make to order."
+
+#. module: procurement
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement
+msgid "Automatic Procurements"
+msgstr "Procurements otomatis"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_max_qty:0
+msgid "Max Quantity"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order
+#: model:process.process,name:procurement.process_process_procurementprocess0
+#: view:procurement.order:0
+msgid "Procurement"
+msgstr "procurement"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action
+msgid "Procurement Orders"
+msgstr "Order Procurement"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "To Fix"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Exceptions"
+msgstr "Pengecualian"
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_serviceonorder0
+msgid "Assignment from Production or Purchase Order."
+msgstr "Penugasan dari Produksi atau Purchase Order."
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property
+msgid "Property"
+msgstr "Properti"
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_make_procurement
+#: view:make.procurement:0
+msgid "Procurement Request"
+msgstr "Permintaan Procurement"
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid "Compute Stock"
+msgstr "Hitung Stok"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Late"
+msgstr "Terlambat"
+
+#. module: procurement
+#: model:process.process,name:procurement.process_process_serviceproductprocess0
+msgid "Service"
+msgstr "Layanan"
+
+#. module: procurement
+#: model:ir.module.module,description:procurement.module_meta_information
+msgid ""
+"\n"
+" This is the module for computing Procurements.\n"
+" "
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,procurement_draft_ids:0
+msgid "Related Procurement Orders"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.orderpoint.compute:0
+msgid ""
+"Wizard checks all the stock minimum rules and generate procurement order."
+msgstr ""
+"Bantuan untuk memeriksa semua aturan stok minimum dan menghasilkan order "
+"procurement."
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_min_qty:0
+msgid "Min Quantity"
+msgstr "Min Kuantitas"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Urgent"
+msgstr "Penting"
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "plus"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:319
+#, python-format
+msgid ""
+"Please check the Quantity in Procurement Order(s), it should not be less "
+"than 1!"
+msgstr ""
+"Mohon periksa Kuantitas dalam Procurement Order (s), itu tidak boleh kurang "
+"dari 1!"
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,active:0
+msgid ""
+"If the active field is set to False, it will allow you to hide the "
+"orderpoint without removing it."
+msgstr ""
+"Jika field aktif disetel ke False, itu akan memungkinkan Anda untuk "
+"menyembunyikan orderpoint tanpa menghapusnya."
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,product_max_qty:0
+msgid ""
+"When the virtual stock goes belong the Max Quantity, OpenERP generates a "
+"procurement to bring the virtual stock to the Max Quantity."
+msgstr ""
+"Ketika stok virtual terjadi ada di dalam Kuantitas Max, OpenERP "
+"menghasilkan suatu procurement ke membawa stok virtual ke Kuantitas Max."
+
+#. module: procurement
+#: help:procurement.orderpoint.compute,automatic:0
+msgid "If the stock of a product is under 0, it will act like an orderpoint"
+msgstr ""
+"Jika stok produk di bawah 0, itu akan bertindak seperti sebuah orderpoint"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Lines"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order.compute.all:0
+msgid ""
+"This wizard allows you to run all procurement, production and/or purchase "
+"orders that should be processed based on their configuration. By default, "
+"the scheduler is launched automatically every night by OpenERP. You can use "
+"this menu to force it to be launched now. Note that it runs in the "
+"background, you may have to wait for a few minutes until it has finished "
+"computing."
+msgstr ""
+"Wizard ini memungkinkan Anda untuk menjalankan semua procurement, produksi "
+"dan / atau order pembelian yang harus diproses berdasarkan konfigurasi "
+"mereka. Secara default, scheduler diluncurkan secara otomatis setiap malam "
+"oleh OpenERP. Dapat menggunakan menu ini untuk paksakan akan diluncurkan "
+"sekarang. Perhatikan bahwa berjalan di latar belakang, Anda mungkin harus "
+"menunggu beberapa menit sampai selesai komputasi."
+
+#. module: procurement
+#: view:procurement.order:0
+#: field:procurement.order,note:0
+msgid "Note"
+msgstr "Catatan"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Draft"
+msgstr "Draft"
+
+#. module: procurement
+#: view:procurement.order.compute:0
+msgid "This wizard will schedule procurements."
+msgstr "Wizard ini akan menjadwalkan procurement"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Status"
+msgstr "Status"
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Normal"
+msgstr "Normal"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You try to assign a lot which is not from the same product"
+msgstr ""
+"Anda mencoba untuk menetapkan banyak yang tidak dari produk yang sama"
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,active:0
+msgid "Active"
+msgstr "Aktif"
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_procureproducts0
+msgid "Procure Products"
+msgstr "Procure Produk"
+
+#. module: procurement
+#: field:procurement.order,date_planned:0
+msgid "Scheduled date"
+msgstr "Tanggal penjadwalan"
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Exception"
+msgstr "Pengecualian"
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:179
+#, python-format
+msgid "Automatic OP: %s"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_orderpoint_compute
+msgid "Automatic Order Point"
+msgstr "Order point otomatis"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_stock_warehouse_orderpoint
+msgid "Minimum Inventory Rule"
+msgstr "Aturan minimum inventory"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_res_company
+msgid "Companies"
+msgstr "Perusahaan"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Extra Information"
+msgstr "Informasih tambahan"
+
+#. module: procurement
+#: help:procurement.order,name:0
+msgid "Procurement name."
+msgstr "Nama Procurement"
+
+#. module: procurement
+#: constraint:stock.move:0
+msgid "You must assign a production lot for this product"
+msgstr "Anda harus menetapkan lot produksi untuk produk ini"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Reason"
+msgstr "Alasan Procurement"
+
+#. module: procurement
+#: sql_constraint:stock.warehouse.orderpoint:0
+msgid "Qty Multiple must be greater than zero."
+msgstr "Beberapa Qty harus lebih besar dari nol."
+
+#. module: procurement
+#: selection:stock.warehouse.orderpoint,logic:0
+msgid "Order to Max"
+msgstr "Order sampai Maksimum"
+
+#. module: procurement
+#: field:procurement.order,date_close:0
+msgid "Date Closed"
+msgstr "Tanggal Tutup"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:372
+#, python-format
+msgid "Procurement '%s' is in exception: not enough stock."
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:138
+#, python-format
+msgid "Cannot delete Procurement Order(s) which are in %s State!"
+msgstr ""
+"Tidak dapat menghapus Procurement Order (s) yang berada di% s Negara!"
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:318
+#, python-format
+msgid "Data Insufficient !"
+msgstr "Data tidak memadai"
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_mrp_property_group
+#: field:mrp.property,group_id:0
+#: field:mrp.property.group,name:0
+msgid "Property Group"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Misc"
+msgstr "Lain-lain"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Locations"
+msgstr "Lokasi"
+
+#. module: procurement
+#: selection:procurement.order,procure_method:0
+msgid "from stock"
+msgstr "dari stok"
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "General Information"
+msgstr "Informasi Umum"
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Run Procurement"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Done"
+msgstr ""
+
+#. module: procurement
+#: help:stock.warehouse.orderpoint,qty_multiple:0
+msgid "The procurement quantity will by rounded up to this multiple."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+#: view:procurement.order:0
+#: selection:procurement.order,state:0
+#: view:procurement.order.compute:0
+#: view:procurement.order.compute.all:0
+#: view:procurement.orderpoint.compute:0
+msgid "Cancel"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,logic:0
+msgid "Reordering Mode"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,origin:0
+msgid "Source Document"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Not urgent"
+msgstr ""
+
+#. module: procurement
+#: model:ir.model,name:procurement.model_procurement_order_compute_all
+msgid "Compute all schedulers"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Current"
+msgstr ""
+
+#. module: procurement
+#: view:board.board:0
+msgid "Procurements in Exception"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Details"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.procurement_action5
+#: model:ir.actions.act_window,name:procurement.procurement_action_board
+#: model:ir.actions.act_window,name:procurement.procurement_exceptions
+#: model:ir.ui.menu,name:procurement.menu_stock_procurement_action
+msgid "Procurement Exceptions"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.act_procurement_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_product_product_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.act_stock_warehouse_2_stock_warehouse_orderpoint
+#: model:ir.actions.act_window,name:procurement.action_orderpoint_form
+#: model:ir.ui.menu,name:procurement.menu_stock_order_points
+#: view:stock.warehouse.orderpoint:0
+msgid "Minimum Stock Rules"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,close_move:0
+msgid "Close Move at end"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Scheduled Date"
+msgstr ""
+
+#. module: procurement
+#: field:make.procurement,product_id:0
+#: view:procurement.order:0
+#: field:procurement.order,product_id:0
+#: field:stock.warehouse.orderpoint,product_id:0
+msgid "Product"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Temporary"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,description:0
+#: field:mrp.property.group,description:0
+msgid "Description"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "min"
+msgstr ""
+
+#. module: procurement
+#: view:stock.warehouse.orderpoint:0
+msgid "Quantity Rules"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Running"
+msgstr ""
+
+#. module: procurement
+#: field:stock.warehouse.orderpoint,product_uom:0
+msgid "Product UOM"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,name:procurement.process_node_serviceonorder0
+msgid "Make to Order"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "UOM"
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,state:0
+msgid "Waiting"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.action_orderpoint_form
+msgid ""
+"You can define your minimum stock rules, so that OpenERP will automatically "
+"create draft manufacturing orders or purchase quotations according to the "
+"stock level. Once the virtual stock of a product (= stock on hand minus all "
+"confirmed orders and reservations) is below the minimum quantity, OpenERP "
+"will generate a procurement request to increase the stock up to the maximum "
+"quantity."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,move_id:0
+msgid "Reservation"
+msgstr ""
+
+#. module: procurement
+#: model:process.node,note:procurement.process_node_procureproducts0
+msgid "The way to procurement depends on the product type."
+msgstr ""
+
+#. module: procurement
+#: view:make.procurement:0
+msgid ""
+"This wizard will plan the procurement for this product. This procurement may "
+"generate task, production orders or purchase orders."
+msgstr ""
+
+#. module: procurement
+#: view:res.company:0
+msgid "MRP & Logistics Scheduler"
+msgstr ""
+
+#. module: procurement
+#: field:mrp.property,name:0
+#: field:stock.warehouse.orderpoint,name:0
+msgid "Name"
+msgstr ""
+
+#. module: procurement
+#: selection:mrp.property,composition:0
+msgid "max"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uos:0
+msgid "Product UoS"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/procurement.py:347
+#, python-format
+msgid "from stock: products assigned."
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,name:procurement.action_compute_schedulers
+#: model:ir.ui.menu,name:procurement.menu_stock_proc_schedulers
+#: view:procurement.order.compute.all:0
+msgid "Compute Schedulers"
+msgstr ""
+
+#. module: procurement
+#: model:ir.actions.act_window,help:procurement.procurement_exceptions
+msgid ""
+"Procurement Orders represent the need for a certain quantity of products, at "
+"a given time, in a given location. Sales Orders are one typical source of "
+"Procurement Orders (but these are distinct documents). Depending on the "
+"procurement parameters and the product configuration, the procurement engine "
+"will attempt to satisfy the need by reserving products from stock, ordering "
+"products from a supplier, or passing a manufacturing order, etc. A "
+"Procurement Exception occurs when the system cannot find a way to fulfill a "
+"procurement. Some exceptions will resolve themselves automatically, but "
+"others require manual intervention (those are identified by a specific error "
+"message)."
+msgstr ""
+
+#. module: procurement
+#: field:procurement.order,product_uom:0
+msgid "Product UoM"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Search Procurement"
+msgstr ""
+
+#. module: procurement
+#: help:res.company,schedule_range:0
+msgid ""
+"This is the time frame analysed by the scheduler when computing "
+"procurements. All procurements that are not between today and today+range "
+"are skipped for future computation."
+msgstr ""
+
+#. module: procurement
+#: selection:procurement.order,priority:0
+msgid "Very Urgent"
+msgstr ""
+
+#. module: procurement
+#: field:procurement.orderpoint.compute,automatic:0
+msgid "Automatic Orderpoint"
+msgstr ""
+
+#. module: procurement
+#: view:procurement.order:0
+msgid "Procurement Details"
+msgstr ""
+
+#. module: procurement
+#: code:addons/procurement/schedulers.py:180
+#, python-format
+msgid "SCHEDULER"
+msgstr ""
+>>>>>>> MERGE-SOURCE
=== renamed file 'procurement/images/minimum_stock_rules.jpeg' => 'procurement/images/minimum_stock_rules.jpeg.OTHER'
Binary files procurement/images/minimum_stock_rules.jpeg 2011-03-21 13:37:47 +0000 and procurement/images/minimum_stock_rules.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'product/__openerp__.py'
--- product/__openerp__.py 2011-03-25 10:24:13 +0000
+++ product/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -43,10 +43,16 @@
* Cost price,
* List price,
* Supplier price, ...
-
-Pricelists preferences by product and/or partners.
-
-Print product labels with barcode.
+<<<<<<< TREE
+
+Pricelists preferences by product and/or partners.
+
+Print product labels with barcode.
+=======
+Pricelists preferences by product and/or partners.
+
+Print product labels with barcode.
+>>>>>>> MERGE-SOURCE
""",
'update_xml': [
'security/product_security.xml',
=== modified file 'product/i18n/nb.po'
--- product/i18n/nb.po 2011-04-07 04:37:58 +0000
+++ product/i18n/nb.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,24 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-05 22:54+0000\n"
"Last-Translator: Rolv RÃ¥en <Unknown>\n"
+=======
+"PO-Revision-Date: 2008-12-08 16:24+0000\n"
+"Last-Translator: Bjørn Olav Samdal <bjornsam@xxxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Norwegian Bokmal <nb@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-07 04:37+0000\n"
"X-Generator: Launchpad (build 12735)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:30+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
@@ -2267,6 +2277,7 @@
#. module: product
#: field:product.pricelist.item,price_discount:0
msgid "Price Discount"
+<<<<<<< TREE
msgstr "Prisrabatt"
#~ msgid ""
@@ -2347,3 +2358,36 @@
#~ msgid "KGM"
#~ msgstr "KGM"
+=======
+msgstr ""
+
+#~ msgid ""
+#~ "This is the average time between the confirmation of the customer order and "
+#~ "the delivery of the finnished products. It's the time you promise to your "
+#~ "customers."
+#~ msgstr ""
+#~ "Det er en gjennomsnittlig tid mellom bekreftelse av kundes ordre og "
+#~ "ferdigstillingen av det ferdige produktet. Dette er tiden du lover deg til "
+#~ "ovenfor kunden."
+
+#~ msgid "Childs Categories"
+#~ msgstr "Barnekategori"
+
+#~ msgid "Price Min. Margin"
+#~ msgstr "Pris Minimums Margin"
+
+#~ msgid "Customer Price"
+#~ msgstr "Kundepris"
+
+#~ msgid "List Price"
+#~ msgstr "Listepris"
+
+#~ msgid "Configuration"
+#~ msgstr "Konfigurasjon"
+
+#~ msgid "In Production"
+#~ msgstr "I Produksjon"
+
+#~ msgid "Priority"
+#~ msgstr "Prioritet"
+>>>>>>> MERGE-SOURCE
=== modified file 'product/i18n/ro.po'
--- product/i18n/ro.po 2011-04-08 04:45:28 +0000
+++ product/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev_rc3\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-07 04:14+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-03-17 19:37+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-08 04:45+0000\n"
"X-Generator: Launchpad (build 12735)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:58+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: product
#: model:product.template,name:product.product_product_ram512_product_template
=== renamed file 'product/images/products_categories.jpeg' => 'product/images/products_categories.jpeg.OTHER'
Binary files product/images/products_categories.jpeg 2011-03-21 13:37:47 +0000 and product/images/products_categories.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'product/images/products_form.jpeg' => 'product/images/products_form.jpeg.OTHER'
Binary files product/images/products_form.jpeg 2011-03-21 13:37:47 +0000 and product/images/products_form.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'product/pricelist.py'
=== modified file 'product/product.py'
=== modified file 'product_expiry/__openerp__.py'
--- product_expiry/__openerp__.py 2011-03-25 10:24:13 +0000
+++ product_expiry/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,16 +25,28 @@
"depends" : ["stock"],
"init_xml" : [],
"demo_xml" : ["product_expiry_demo.xml"],
- "description": '''
-Track different dates on products and production lots.
-======================================================
-
-Following dates can be tracked:
- - end of life
- - best before date
- - removal date
- - alert date
-
+<<<<<<< TREE
+ "description": '''
+Track different dates on products and production lots.
+======================================================
+
+Following dates can be tracked:
+ - end of life
+ - best before date
+ - removal date
+ - alert date
+
+=======
+ "description": '''
+Track different dates on products and production lots.
+======================================================
+
+Following dates can be tracked:
+ - end of life
+ - best before date
+ - removal date
+ - alert date
+>>>>>>> MERGE-SOURCE
Used, for example, in food industries.''',
"update_xml" : ["product_expiry_view.xml"],
"active": False,
=== renamed file 'product_expiry/images/production_lots_dates.jpeg' => 'product_expiry/images/production_lots_dates.jpeg.OTHER'
Binary files product_expiry/images/production_lots_dates.jpeg 2011-03-21 13:37:47 +0000 and product_expiry/images/production_lots_dates.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'product_manufacturer/__openerp__.py'
--- product_manufacturer/__openerp__.py 2011-03-25 10:24:13 +0000
+++ product_manufacturer/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,6 +25,7 @@
"depends" : ["stock"],
"init_xml" : [],
"demo_xml" : [],
+<<<<<<< TREE
"description": """
A module that adds manufacturers and attributes on the product form.
====================================================================
@@ -35,6 +36,12 @@
* Manufacturer Product Code
* Product Attributes
""",
+=======
+ "description": """
+A module that add manufacturers and attributes on the product form.
+===================================================================
+ """,
+>>>>>>> MERGE-SOURCE
"update_xml" : [
"security/ir.model.access.csv",
"product_manufacturer_view.xml"
=== renamed file 'product_manufacturer/images/products_manufacturer.jpeg' => 'product_manufacturer/images/products_manufacturer.jpeg.OTHER'
Binary files product_manufacturer/images/products_manufacturer.jpeg 2011-03-21 13:37:47 +0000 and product_manufacturer/images/products_manufacturer.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'product_margin/images/product_margins_form.jpeg' => 'product_margin/images/product_margins_form.jpeg.OTHER'
Binary files product_margin/images/product_margins_form.jpeg 2011-03-21 13:37:47 +0000 and product_margin/images/product_margins_form.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'product_visible_discount/__openerp__.py'
--- product_visible_discount/__openerp__.py 2011-03-25 10:24:13 +0000
+++ product_visible_discount/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -23,15 +23,26 @@
"author": "OpenERP SA",
"category": "Sales",
"description": """
-This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
-===============================================================================================================
-
-To this end, a new check box named "Visible Discount" is added to the pricelist form.
-
-Example:
- For the product PC1 and the partner "Asustek": if listprice=450, and the price calculated using Asustek's pricelist is 225
- If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225
- If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225
+<<<<<<< TREE
+This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
+===============================================================================================================
+
+To this end, a new check box named "Visible Discount" is added to the pricelist form.
+
+Example:
+ For the product PC1 and the partner "Asustek": if listprice=450, and the price calculated using Asustek's pricelist is 225
+ If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225
+ If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225
+=======
+This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist.
+===============================================================================================================
+
+To this end, a new check box named "Visible Discount" is added to the pricelist form.
+Example:
+ For the product PC1 and the partner "Asustek": if listprice=450, and the price calculated using Asustek's pricelist is 225
+ If the check box is checked, we will have on the sale order line: Unit price=450, Discount=50,00, Net price=225
+ If the check box is unchecked, we will have on Sale Order and Invoice lines: Unit price=225, Discount=0,00, Net price=225
+>>>>>>> MERGE-SOURCE
""",
"depends": ["sale"],
"demo_xml": [],
=== modified file 'profile_tools/__openerp__.py'
--- profile_tools/__openerp__.py 2011-03-22 13:21:41 +0000
+++ profile_tools/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -26,12 +26,18 @@
"depends" : ["base"],
"author" : "OpenERP SA",
"category" : "Tools",
+<<<<<<< TREE
"description": """
Installer for extra tools like lunch, survey, idea, share, etc.
===============================================================
Makes the Extra Tools Configuration available from where you can install
modules like share, lunch, pad, idea, survey and subscription.
+=======
+ "description": """
+Installer for extra tools like lunch, survey, idea, share, etc.
+===============================================================
+>>>>>>> MERGE-SOURCE
""",
'website': 'http://www.openerp.com',
'init_xml': [],
=== modified file 'project/__openerp__.py'
--- project/__openerp__.py 2011-03-22 13:12:14 +0000
+++ project/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,8 +25,13 @@
"version": "1.1",
"author": "OpenERP SA",
"website": "http://www.openerp.com";,
+<<<<<<< TREE
"category": "Project Management",
"images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
+=======
+ "category": "Project Management",
+ "images": ["images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
+>>>>>>> MERGE-SOURCE
"depends": ["product", "analytic", "board"],
"description": """
Project management module tracks multi-level projects, tasks, work done on tasks, eso.
=== modified file 'project/i18n/de.po'
--- project/i18n/de.po 2011-04-04 04:47:57 +0000
+++ project/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,25 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:13+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-18 12:02+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:46+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:37+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: project
#: model:ir.actions.act_window,name:project.act_res_users_2_project_task_opened
@@ -69,12 +80,21 @@
msgstr "Vorgang nicht erlaubt!"
#. module: project
+<<<<<<< TREE
#: code:addons/project/wizard/project_task_delegate.py:67
#, python-format
msgid "CHECK: %s"
msgstr "PRÃœFUNG: %s"
#. module: project
+=======
+#: code:addons/project/wizard/project_task_delegate.py:67
+#, python-format
+msgid "CHECK: %s"
+msgstr ""
+
+#. module: project
+>>>>>>> MERGE-SOURCE
#: code:addons/project/wizard/project_task_delegate.py:55
#: code:addons/project/wizard/project_task_delegate.py:56
#: code:addons/project/wizard/project_task_delegate.py:63
=== modified file 'project/project.py'
=== modified file 'project_caldav/__openerp__.py'
--- project_caldav/__openerp__.py 2011-03-25 10:24:13 +0000
+++ project_caldav/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -23,6 +23,7 @@
"name": "CalDAV for Task Management",
"version": "1.1",
"author": "OpenERP SA",
+<<<<<<< TREE
"category": "Project Management",
"description": """
Synchronization between Project Task and Caldav Vtodo.
@@ -31,6 +32,13 @@
With the Caldav functionality you can get access to scheduling information
on a remote server.
""",
+=======
+ "category": "Project Management",
+ "description": """
+Synchronization between Project Task and Caldav Vtodo.
+======================================================
+ """,
+>>>>>>> MERGE-SOURCE
"depends": ["project", "caldav", "base_calendar"],
"init_xml": ["project_caldav_data.xml", 'project_caldav_setup.xml', ],
"demo_xml": [],
@@ -39,5 +47,9 @@
"website": "http://www.openerp.com";,
"installable": True,
"certificate" : "001114200456808204637",
+<<<<<<< TREE
'images': ['images/project_tasks_caldav.jpeg','images/project_tasks_caldav_attendees.jpeg','images/project_caldav_calendars.jpeg'],
+=======
+ 'images': ['images/project_tasks_caldav.jpeg'],
+>>>>>>> MERGE-SOURCE
}
=== renamed file 'project_caldav/images/project_tasks_caldav.jpeg' => 'project_caldav/images/project_tasks_caldav.jpeg.OTHER'
Binary files project_caldav/images/project_tasks_caldav.jpeg 2011-03-23 10:12:01 +0000 and project_caldav/images/project_tasks_caldav.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'project_issue/__openerp__.py'
--- project_issue/__openerp__.py 2011-03-25 10:24:13 +0000
+++ project_issue/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,6 +25,7 @@
'version': '1.0',
'category': 'Project Management',
'description': """
+<<<<<<< TREE
This module provides Issues/Bugs Management in Project.
=======================================================
@@ -32,6 +33,10 @@
like bugs in a system, client complaints or material breakdowns. A
list view allows the manager to quickly check the issues, assign them
and decide on their status as they evolve.
+=======
+This module provide Issues/Bugs Management in Project.
+======================================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== modified file 'project_issue/project_issue_view.xml'
--- project_issue/project_issue_view.xml 2011-04-07 11:41:45 +0000
+++ project_issue/project_issue_view.xml 2011-04-11 14:26:52 +0000
@@ -188,7 +188,12 @@
<button name="prev_type" string="Previous" type="object" icon="gtk-go-back" help="Change to Previous Stage"/>
<button name="next_type" string="Next" type="object" icon="gtk-go-forward" help="Change to Next Stage"/>
<field name="version_id" widget="selection"/>
+<<<<<<< TREE
<field name="assigned_to"/>
+=======
+ <field name="user_id"/>
+ <field name="assigned_to" attrs="{'readonly':[('task_id','=',False)]}"/>
+>>>>>>> MERGE-SOURCE
<field name="progress" widget="progressbar" attrs="{'invisible':[('task_id','=',False)]}"/>
<field name="state"/>
<button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
=== modified file 'project_issue/report/project_issue_report.py'
--- project_issue/report/project_issue_report.py 2011-04-07 11:41:45 +0000
+++ project_issue/report/project_issue_report.py 2011-04-11 14:26:52 +0000
@@ -105,7 +105,10 @@
(SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email
FROM
project_issue c
+<<<<<<< TREE
WHERE c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue'))
+=======
+>>>>>>> MERGE-SOURCE
)""")
project_issue_report()
=== modified file 'project_issue_sheet/__openerp__.py'
--- project_issue_sheet/__openerp__.py 2011-03-25 10:24:13 +0000
+++ project_issue_sheet/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,10 +25,15 @@
'version': '1.0',
'category': 'Project Management',
'description': """
+<<<<<<< TREE
This module adds the Timesheet support for the Issues/Bugs Management in Project.
=================================================================================
Worklogs can be maintained to signify number of hours spent by users to handle an issue.
+=======
+This module adds the Timesheet support for the Issues/Bugs Management in Project.
+=================================================================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== modified file 'project_mrp/__openerp__.py'
=== renamed file 'project_planning/images/project_planning.jpeg' => 'project_planning/images/project_planning.jpeg.OTHER'
Binary files project_planning/images/project_planning.jpeg 2011-03-23 11:11:03 +0000 and project_planning/images/project_planning.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'project_scrum/i18n/de.po'
--- project_scrum/i18n/de.po 2011-04-04 04:47:57 +0000
+++ project_scrum/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,25 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:12+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-18 08:41+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:46+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:42+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: project_scrum
#: help:project.scrum.email,scrum_master_email:0
@@ -270,6 +281,7 @@
#. module: project_scrum
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+<<<<<<< TREE
#, python-format
msgid "Product Backlog '%s' is converted into Task %d."
msgstr "Produkt Rückstand '%s' ist in Aufgabe %d konvertiert worden."
@@ -282,6 +294,20 @@
#. module: project_scrum
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+=======
+#, python-format
+msgid "Product Backlog '%s' is converted into Task %d."
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
+#, python-format
+msgid "Product Backlog '%s' is assigned sprint:%s"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+>>>>>>> MERGE-SOURCE
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
#: view:project.scrum.product.backlog:0
@@ -981,6 +1007,7 @@
#. module: project_scrum
#: code:addons/project_scrum/project_scrum.py:324
#, python-format
+<<<<<<< TREE
msgid ""
"Hello %s,\n"
" \n"
@@ -1011,6 +1038,27 @@
"\n"
"* Stopper entdeckt:\n"
"_______________________ %s"
+=======
+msgid ""
+"Hello %s,\n"
+" \n"
+"I am sending you Daily Meeting Details of date %s for the Sprint %s\n"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/project_scrum.py:325
+#, python-format
+msgid ""
+"\n"
+"*Tasks since yesterday:\n"
+"_______________________%s\n"
+"*Task for Today:\n"
+"_______________________ %s\n"
+"\n"
+"*Blocks encountered:\n"
+"_______________________ %s"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: project_scrum
#: help:project.scrum.product.backlog,active:0
=== modified file 'project_scrum/i18n/pl.po'
--- project_scrum/i18n/pl.po 2011-04-04 04:47:57 +0000
+++ project_scrum/i18n/pl.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 11:58+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@xxxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-09-29 09:03+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:46+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:42+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: project_scrum
#: help:project.scrum.email,scrum_master_email:0
@@ -242,6 +252,18 @@
#. module: project_scrum
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
+#, python-format
+msgid "Product Backlog '%s' is converted into Task %d."
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
+#, python-format
+msgid "Product Backlog '%s' is assigned sprint:%s"
+msgstr ""
+
+#. module: project_scrum
+#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57
#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62
#: model:ir.model,name:project_scrum.model_project_scrum_product_backlog
#: view:project.scrum.product.backlog:0
@@ -272,9 +294,15 @@
#: code:addons/project_scrum/wizard/project_scrum_email.py:96
#, python-format
msgid "None"
+<<<<<<< TREE
msgstr "Brak"
#. module: project_scrum
+=======
+msgstr ""
+
+#. module: project_scrum
+>>>>>>> MERGE-SOURCE
#: view:project.scrum.product.backlog:0
msgid "Change Stage"
msgstr "Zmień etap"
@@ -403,9 +431,15 @@
#. module: project_scrum
#: field:project.scrum.sprint,meeting_ids:0
msgid "Daily Scrum"
+<<<<<<< TREE
msgstr "Dzienny młyn"
#. module: project_scrum
+=======
+msgstr ""
+
+#. module: project_scrum
+>>>>>>> MERGE-SOURCE
#: view:project.scrum.backlog.create.task:0
msgid "C_onvert"
msgstr "K_onwertuj"
@@ -440,9 +474,15 @@
#. module: project_scrum
#: model:ir.ui.menu,name:project_scrum.menu_scrum
msgid "Scrum"
+<<<<<<< TREE
msgstr "MÅ‚yn"
#. module: project_scrum
+=======
+msgstr ""
+
+#. module: project_scrum
+>>>>>>> MERGE-SOURCE
#: field:project.scrum.meeting,question_today:0
msgid "Tasks for today"
msgstr "Zadania na dzisiaj"
@@ -742,9 +782,15 @@
#. module: project_scrum
#: model:ir.actions.act_window,name:project_scrum.action_sprint_backlog_open
msgid "View sprint backlog"
+<<<<<<< TREE
msgstr "Przejrzyj zakres sprintu"
#. module: project_scrum
+=======
+msgstr ""
+
+#. module: project_scrum
+>>>>>>> MERGE-SOURCE
#: field:project.scrum.meeting,question_backlog:0
msgid "Backlog Accurate"
msgstr ""
@@ -991,11 +1037,16 @@
"This wizard merge backlogs and create one new backlog with draft state (Old "
"backlogs Will be deleted). And it also merge old tasks from backlogs"
msgstr ""
+<<<<<<< TREE
"Ten kreator Å‚Ä…czy zakresy i tworzy nowy zakres w stanie projekt (poprzednie "
"zakresy zostaną usunięte). Kreator połączy również zadania z poprzednich "
"zakresów."
#. module: project_scrum
+=======
+
+#. module: project_scrum
+>>>>>>> MERGE-SOURCE
#: code:addons/project_scrum/project_scrum.py:303
#, python-format
msgid "Please provide email address for scrum master defined on sprint."
=== modified file 'project_scrum/project_scrum_view.xml'
=== modified file 'project_scrum/report/sprint_burndown.py'
=== modified file 'purchase/__openerp__.py'
--- purchase/__openerp__.py 2011-03-25 10:24:13 +0000
+++ purchase/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,12 +25,20 @@
'version': '1.1',
'category': 'Purchases',
'description': """
-Purchase module is for generating a purchase order for purchase of goods from a supplier.
-=========================================================================================
-
-A supplier invoice is created for the particular purchase order.
-
-Dashboard for purchase management that includes:
+<<<<<<< TREE
+Purchase module is for generating a purchase order for purchase of goods from a supplier.
+=========================================================================================
+
+A supplier invoice is created for the particular purchase order.
+
+Dashboard for purchase management that includes:
+=======
+Purchase module is for generating a purchase order for purchase of goods from a supplier.
+=========================================================================================
+
+A supplier invoice is created for the particular purchase order.
+Dashboard for purchase management that includes:
+>>>>>>> MERGE-SOURCE
* Current Purchase Orders
* Draft Purchase Orders
* Graph for quantity and amount per month
=== modified file 'purchase/i18n/ro.po'
--- purchase/i18n/ro.po 2011-04-05 04:47:06 +0000
+++ purchase/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-04 15:03+0000\n"
"Last-Translator: Mihai Boiciuc <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-03-21 21:03+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-05 04:46+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-22 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
=== modified file 'purchase/i18n/ru.po'
--- purchase/i18n/ru.po 2011-03-25 04:40:36 +0000
+++ purchase/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-24 14:57+0000\n"
+=======
+"PO-Revision-Date: 2011-03-20 13:57+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: purchase
#: model:process.transition,note:purchase.process_transition_confirmingpurchaseorder0
=== modified file 'purchase_analytic_plans/__openerp__.py'
--- purchase_analytic_plans/__openerp__.py 2011-03-25 10:24:13 +0000
+++ purchase_analytic_plans/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,11 +25,16 @@
'version': '1.0',
'category': 'Purchases',
'description': """
+<<<<<<< TREE
The base module to manage analytic distribution and purchase orders.
====================================================================
Allows the user to maintain several analysis plans. These let you split
a line on a supplier purchase order into several accounts and analytic plans.
+=======
+The base module to manage analytic distribution and purchase orders.
+====================================================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== modified file 'purchase_double_validation/__openerp__.py'
--- purchase_double_validation/__openerp__.py 2011-03-25 10:24:13 +0000
+++ purchase_double_validation/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -27,11 +27,16 @@
"depends" : ["base","purchase"],
"author" : 'OpenERP SA',
"description": """
+<<<<<<< TREE
Double-validation for purchases exceeding minimum amount.
=========================================================
This module modifies the purchase workflow in order to validate purchases
that exceeds minimum amount set by configuration wizard.
+=======
+This module modifies the purchase workflow in order to validate purchases that exceeds minimum amount set by configuration wizard.
+==================================================================================================================================
+>>>>>>> MERGE-SOURCE
""",
'website': 'http://www.openerp.com',
'init_xml': [],
=== modified file 'purchase_requisition/i18n/de.po'
--- purchase_requisition/i18n/de.po 2011-04-04 04:47:57 +0000
+++ purchase_requisition/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,25 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:15+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:28+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-18 11:55+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-10 04:46+0000\n"
+"X-Generator: Launchpad (build 12351)\n"
+>>>>>>> MERGE-SOURCE
#. module: purchase_requisition
#: view:purchase.requisition:0
@@ -430,6 +441,7 @@
#: field:purchase.requisition,purchase_ids:0
msgid "Purchase Orders"
msgstr "Beschaffungsaufträge"
+<<<<<<< TREE
#. module: purchase_requisition
#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90
@@ -477,3 +489,50 @@
#~ msgid "The name of the module must be unique !"
#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+=======
+
+#. module: purchase_requisition
+#: code:addons/purchase_requisition/wizard/purchase_requisition_partner.py:90
+#, python-format
+msgid ""
+"You have already one %s purchase order for this partner, you must cancel "
+"this purchase order to create a new quotation."
+msgstr ""
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr "Das Objekt muss mit x_ beginnen und darf keine Sonderzeichen haben !"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Ungültiger Modulname in der Aktionsdefinition."
+
+#~ msgid "Error ! You can not create recursive Menu."
+#~ msgstr "Fehler! Sie können keine rekursiven Menüs erzeugen."
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Fehlerhafter xml Quellcode für diese Ansicht !"
+
+#~ msgid "Size of the field can never be less than 1 !"
+#~ msgstr "Die Größe des Feldes sollte niemals kleiner als 1 sein !"
+
+#~ msgid ""
+#~ "A purchase requisition is a step before the request for quotation. In a "
+#~ "purchase requisition (or purchase tender), you can record the products you "
+#~ "need to buy and trigger the creation of RfQs to supplier. After the "
+#~ "negotiation, once you have reviewed all the supplier's offers, you can "
+#~ "validate some and cancel others."
+#~ msgstr ""
+#~ "Eine Bedarfsmeldung ist einer Beschaffungsanfrage an Lieferanten "
+#~ "vorgeschaltet. In einer Bedarfsmeldung (oder einer Ausschreibung) können Sie "
+#~ "die Produkte vermerken, die beschafft werden sollen, bevor dann konkret "
+#~ "Angebote bei Lieferanten angefragt werden. Nach abgeschlossener Verhandlung "
+#~ "mit Lieferanten können Sie entscheiden, welches Angebot oder welche Angebote "
+#~ "zur Bedarfsdeckung ausgeführt werden sollen. Die verbleibenden nicht "
+#~ "angenommen Angebote werden dabei automatisch verworfen."
+
+#~ msgid "The certificate ID of the module must be unique !"
+#~ msgstr "Die Zertifikat ID des Moduls sollte eindeutig sein !"
+
+#~ msgid "The name of the module must be unique !"
+#~ msgstr "Die Modulbezeichnung sollte eindeutig sein !"
+>>>>>>> MERGE-SOURCE
=== modified file 'report_designer/__openerp__.py'
--- report_designer/__openerp__.py 2011-03-22 13:21:41 +0000
+++ report_designer/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -26,12 +26,18 @@
"depends" : ["base"],
"author" : "OpenERP SA",
"category": "Tools",
+<<<<<<< TREE
"description": """
Installer for reporting tools.
==============================
Makes the Reporting Tools Configuration available from where you can install
modules like base_report_designer and base_report_creator.
+=======
+ "description": """
+Installer for reporting tools.
+==============================
+>>>>>>> MERGE-SOURCE
""",
'website': 'http://www.openerp.com',
'init_xml': [],
=== modified file 'report_intrastat/i18n/pt_BR.po'
--- report_intrastat/i18n/pt_BR.po 2011-03-26 05:00:46 +0000
+++ report_intrastat/i18n/pt_BR.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-25 01:02+0000\n"
"Last-Translator: Emerson <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-09-09 07:19+0000\n"
+"Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-26 05:00+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:27+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: report_intrastat
#: report:account.invoice.intrastat:0
@@ -358,6 +368,7 @@
#: model:ir.ui.menu,name:report_intrastat.menu_report_intrastat_code
#: field:report.intrastat.code,name:0
msgid "Intrastat Code"
+<<<<<<< TREE
msgstr "Código Intrastat"
#~ msgid "All Months"
@@ -376,3 +387,23 @@
#~ msgid "Invalid model name in the action definition."
#~ msgstr "Nome de modelo inválido na definição da ação"
+=======
+msgstr ""
+
+#~ msgid "All Months"
+#~ msgstr "Todos os meses"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "Invalido XML para Arquitetura da View"
+
+#~ msgid "Intrastat (this month)"
+#~ msgstr "Intrastat (Este Mês)"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "O nome do objeto deve começar com x_ e não deve conter caracteres especiais!"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nome de modelo inválido na definição da ação"
+>>>>>>> MERGE-SOURCE
=== modified file 'report_webkit/__openerp__.py'
=== renamed file 'report_webkit/images/companies_webkit.jpeg' => 'report_webkit/images/companies_webkit.jpeg.OTHER'
Binary files report_webkit/images/companies_webkit.jpeg 2011-03-21 13:37:47 +0000 and report_webkit/images/companies_webkit.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'report_webkit/images/header_html.jpeg' => 'report_webkit/images/header_html.jpeg.OTHER'
Binary files report_webkit/images/header_html.jpeg 2011-03-21 13:37:47 +0000 and report_webkit/images/header_html.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'report_webkit/webkit_report.py'
--- report_webkit/webkit_report.py 2011-04-05 10:54:31 +0000
+++ report_webkit/webkit_report.py 2011-04-11 14:26:52 +0000
@@ -123,17 +123,41 @@
command.extend(['--footer-html', foot_file.name])
if webkit_header.margin_top :
+<<<<<<< TREE
command.extend(['--margin-top', str(webkit_header.margin_top).replace(',', '.')])
+=======
+ command.append('--margin-top %s'%(str(webkit_header.margin_top).replace(',', '.')))
+>>>>>>> MERGE-SOURCE
if webkit_header.margin_bottom :
+<<<<<<< TREE
command.extend(['--margin-bottom', str(webkit_header.margin_bottom).replace(',', '.')])
+=======
+ command.append('--margin-bottom %s'%(str(webkit_header.margin_bottom).replace(',', '.')))
+>>>>>>> MERGE-SOURCE
if webkit_header.margin_left :
+<<<<<<< TREE
command.extend(['--margin-left', str(webkit_header.margin_left).replace(',', '.')])
+=======
+ command.append('--margin-left %s'%(str(webkit_header.margin_left).replace(',', '.')))
+>>>>>>> MERGE-SOURCE
if webkit_header.margin_right :
+<<<<<<< TREE
command.extend(['--margin-right', str(webkit_header.margin_right).replace(',', '.')])
+=======
+ command.append('--margin-right %s'%(str(webkit_header.margin_right).replace(',', '.')))
+>>>>>>> MERGE-SOURCE
if webkit_header.orientation :
+<<<<<<< TREE
command.extend(['--orientation', str(webkit_header.orientation).replace(',', '.')])
+=======
+ command.append("--orientation '%s'"%(str(webkit_header.orientation).replace(',', '.')))
+>>>>>>> MERGE-SOURCE
if webkit_header.format :
+<<<<<<< TREE
command.extend(['--page-size', str(webkit_header.format).replace(',', '.')])
+=======
+ command.append(" --page-size '%s'"%(str(webkit_header.format).replace(',', '.')))
+>>>>>>> MERGE-SOURCE
count = 0
for html in html_list :
html_file = file(os.path.join(tmp_dir, str(time.time()) + str(count) +'.body.html'), 'w')
=== renamed file 'resource/images/resource_leaves_calendar.jpeg' => 'resource/images/resource_leaves_calendar.jpeg.OTHER'
Binary files resource/images/resource_leaves_calendar.jpeg 2011-03-21 13:37:47 +0000 and resource/images/resource_leaves_calendar.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'sale/i18n/el.po'
--- sale/i18n/el.po 2011-04-02 04:55:47 +0000
+++ sale/i18n/el.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,23 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-01 18:34+0000\n"
+=======
+"PO-Revision-Date: 2011-01-28 19:46+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dimitris Andavoglou <dimitrisand@xxxxxxxxx>\n"
"Language-Team: Greek <el@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-02 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-29 04:55+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: sale
#: view:board.board:0
=== modified file 'sale/i18n/ru.po'
--- sale/i18n/ru.po 2011-03-24 04:50:30 +0000
+++ sale/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-23 14:07+0000\n"
+=======
+"PO-Revision-Date: 2011-03-20 10:02+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: sale
#: view:board.board:0
=== modified file 'sale/sale_view.xml'
=== modified file 'sale_analytic_plans/__openerp__.py'
--- sale_analytic_plans/__openerp__.py 2011-03-25 10:24:13 +0000
+++ sale_analytic_plans/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -24,10 +24,15 @@
'version': '1.0',
'category': 'Sales',
'description': """
+<<<<<<< TREE
The base module to manage analytic distribution and sales orders.
=================================================================
Using this module you will be able to link analytic accounts to sales orders.
+=======
+The base module to manage analytic distribution and sales orders.
+=================================================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== modified file 'sale_crm/i18n/de.po'
--- sale_crm/i18n/de.po 2011-04-04 04:47:57 +0000
+++ sale_crm/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:13+0000\n"
+=======
+"PO-Revision-Date: 2011-01-13 16:58+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
"Language-Team: German <kde-i18n-doc@xxxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:46+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: sale_crm
#: field:crm.make.sale,partner_id:0
@@ -30,8 +39,13 @@
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:108
#, python-format
+<<<<<<< TREE
msgid "Opportunity '%s' is converted to Quotation."
msgstr "Chance '%s' ist in Angebot umgewandelt."
+=======
+msgid "Opportunity '%s' is converted to Quotation."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:89
=== modified file 'sale_crm/i18n/ru.po'
--- sale_crm/i18n/ru.po 2011-03-24 04:50:30 +0000
+++ sale_crm/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-23 13:50+0000\n"
+=======
+"PO-Revision-Date: 2011-03-20 14:00+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-21 04:46+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: sale_crm
#: field:crm.make.sale,partner_id:0
@@ -29,8 +38,13 @@
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:108
#, python-format
+<<<<<<< TREE
msgid "Opportunity '%s' is converted to Quotation."
msgstr "Gредложение '%s' преобразовано в заказ на продажу."
+=======
+msgid "Opportunity '%s' is converted to Quotation."
+msgstr "Сделка '%s' преобразована в Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ†ÐµÐ½."
+>>>>>>> MERGE-SOURCE
#. module: sale_crm
#: code:addons/sale_crm/wizard/crm_make_sale.py:89
=== modified file 'sale_journal/__openerp__.py'
--- sale_journal/__openerp__.py 2011-03-25 10:24:13 +0000
+++ sale_journal/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -40,7 +40,12 @@
Batch operations can be processed on the different journals to
confirm all sales at once, to validate or invoice packing, ...
+<<<<<<< TREE
It also supports batch invoicing methods that can be configured by partners and sales orders, examples:
+=======
+It also supports batch invoicing methods that can be configured by
+partners and sales orders, examples:
+>>>>>>> MERGE-SOURCE
* daily invoicing,
* monthly invoicing, ...
=== modified file 'sale_order_dates/__openerp__.py'
--- sale_order_dates/__openerp__.py 2011-03-25 10:24:13 +0000
+++ sale_order_dates/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,6 +25,7 @@
'version': '1.0',
'category': 'Sales',
'description': """
+<<<<<<< TREE
Add additional date information to the sales order.
===================================================
@@ -32,6 +33,10 @@
* Requested Date
* Commitment Date
* Effective Date
+=======
+Add commitment, requested and effective dates on the sales order.
+=================================================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://www.openerp.com',
=== modified file 'sale_order_dates/i18n/el.po'
--- sale_order_dates/i18n/el.po 2011-04-02 04:55:47 +0000
+++ sale_order_dates/i18n/el.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,23 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-01 18:32+0000\n"
+=======
+"PO-Revision-Date: 2010-12-21 14:22+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dimitris Andavoglou <dimitrisand@xxxxxxxxx>\n"
"Language-Team: Greek <el@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-02 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:56+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: sale_order_dates
#: sql_constraint:sale.order:0
@@ -67,6 +76,7 @@
#. module: sale_order_dates
#: help:sale.order,commitment_date:0
msgid "Date on which delivery of products is to be made."
+<<<<<<< TREE
msgstr "ΗμεÏομηνία που θα γίνει η παÏάδοση των Ï€Ïοϊόντων."
#~ msgid "Date on which picking is created"
@@ -77,3 +87,15 @@
#~ msgid "Sale Order Dates"
#~ msgstr "ΗμεÏομηνίες ΠαÏαγγελιών Πώλησης"
+=======
+msgstr ""
+
+#~ msgid "Date on which picking is created"
+#~ msgstr "ΗμεÏομηνία που δημιουÏγήθηκε η παÏαλαβή"
+
+#~ msgid "Sale Order"
+#~ msgstr "ΠαÏαγγελία Πώλησης"
+
+#~ msgid "Sale Order Dates"
+#~ msgstr "ΗμεÏομηνίες ΠαÏαγγελιών Πώλησης"
+>>>>>>> MERGE-SOURCE
=== modified file 'sale_order_dates/i18n/ru.po'
--- sale_order_dates/i18n/ru.po 2011-03-24 04:50:30 +0000
+++ sale_order_dates/i18n/ru.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,23 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-23 13:53+0000\n"
+=======
+"PO-Revision-Date: 2011-01-20 08:51+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Chertykov Denis <chertykov@xxxxxxxxx>\n"
"Language-Team: Russian <ru@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-24 04:50+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-21 04:41+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: sale_order_dates
#: sql_constraint:sale.order:0
=== modified file 'share/i18n/ca.po'
--- share/i18n/ca.po 2011-03-27 04:53:32 +0000
+++ share/i18n/ca.po 2011-04-11 14:26:52 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
# Catalan translation for openobject-addons
# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
# This file is distributed under the same license as the openobject-addons package.
@@ -529,3 +530,534 @@
#~ msgstr ""
#~ "Podeu utilitzar el següent usuari i contrasenya per accedir en aquesta à rea "
#~ "protegida:"
+=======
+# Catalan translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+"PO-Revision-Date: 2011-03-06 19:04+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@xxxxxx>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2011-03-18 04:58+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+
+#. module: share
+#: code:addons/share/web/editors.py:15
+#, python-format
+msgid "Sharing"
+msgstr "Compartits"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:434
+#, python-format
+msgid ""
+"This additional data has been automatically added to your current access.\n"
+msgstr ""
+"Aquesta informació addicional ha estat automà ticament afegida al seu accés "
+"actual.\n"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Existing External Users"
+msgstr "Usuaris externs existents"
+
+#. module: share
+#: help:res.groups,share:0
+msgid "Group created to set access rights for sharing data with some users."
+msgstr ""
+"Grup creat per establir drets d'accés per compartir informació amb alguns "
+"usuaris."
+
+#. module: share
+#: model:ir.module.module,shortdesc:share.module_meta_information
+msgid "Share Management"
+msgstr "Gestió de comparticions"
+
+#. module: share
+#: sql_constraint:res.users:0
+msgid "You can not have two users with the same login !"
+msgstr "No podeu tenir dos usuaris amb el mateix identificador d'usuari!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:76
+#, python-format
+msgid "Sharing Wizard - Step 1"
+msgstr "Assistent compartició - Pas 1"
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard
+#: model:ir.ui.menu,name:share.menu_action_share_wizard
+msgid "Share Access Rules"
+msgstr "Regles d'accés a comparticions"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:453
+#, python-format
+msgid ""
+"Dear,\n"
+"\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#. module: share
+#: constraint:res.users:0
+msgid "The chosen company is not in the allowed companies for this user"
+msgstr ""
+"L'empresa seleccionada no està en les empreses permeses per aquest usuari"
+
+#. module: share
+#: model:ir.model,name:share.model_res_users
+msgid "res.users"
+msgstr "res.usuaris"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Next"
+msgstr "Següent"
+
+#. module: share
+#: help:share.wizard,action_id:0
+msgid ""
+"The action that opens the screen containing the data you wish to share."
+msgstr ""
+"L'acció que obre la pantalla que conté la informació que voleu compartir."
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:68
+#, python-format
+msgid "Please specify \"share_root_url\" in context"
+msgstr ""
+"Especifiqueu \"share_root_url\" (URL arrel de la compartició) en el context"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Congratulations, you have successfully setup a new shared access!"
+msgstr "Acabeu de configurar correctament un nou accés compartit!"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:247
+#, python-format
+msgid "(Copy for sharing)"
+msgstr "(Còpia per compartir)"
+
+#. module: share
+#: field:share.wizard.result.line,newly_created:0
+msgid "Newly created"
+msgstr "Recentment creat"
+
+#. module: share
+#: field:share.wizard,share_root_url:0
+msgid "Generic Share Access URL"
+msgstr "URL genèrica d'accés compartit"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:457
+#, python-format
+msgid ""
+"You may use the following login and password to get access to this protected "
+"area:\n"
+msgstr ""
+
+#. module: share
+#: view:res.groups:0
+msgid "Regular groups only (no share groups"
+msgstr "Només grups regulars (no grups de compartició)"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read & Write"
+msgstr "Lectura i escriptura"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 2"
+msgstr "Assistent compartició: pas 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 0"
+msgstr "Assistent compartició: pas 0"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Share wizard: step 1"
+msgstr "Assistent compartició: pas 1"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:430
+#: field:share.wizard.result.line,login:0
+#, python-format
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#. module: share
+#: field:res.users,share:0
+msgid "Share User"
+msgstr "Comparteix usuari"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:424
+#, python-format
+msgid "%s has shared OpenERP %s information with you"
+msgstr "%s a compartit la informació %s d'OpenERP amb tu"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Finish"
+msgstr "Finalitza"
+
+#. module: share
+#: field:share.wizard,user_ids:0
+#: field:share.wizard.user,user_id:0
+msgid "Users"
+msgstr "Usuaris/es"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:103
+#, python-format
+msgid ""
+"This username (%s) already exists, perhaps data has already been shared with "
+"this person.\n"
+"You may want to try selecting existing shared users instead."
+msgstr ""
+"El nom d'usuari (%s) ja existeix, pot ser que la informació ja hagi estat "
+"compartida amb aquesta persona.\n"
+"Podeu provar de seleccionar en el seu lloc a usuaris compartits existents."
+
+#. module: share
+#: field:share.wizard,new_users:0
+msgid "New users"
+msgstr "Usuaris nous"
+
+#. module: share
+#: model:ir.model,name:share.model_res_groups
+msgid "res.groups"
+msgstr "res.grups"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:121
+#, python-format
+msgid "%s (Shared)"
+msgstr "%s (Compartit)"
+
+#. module: share
+#: sql_constraint:res.groups:0
+msgid "The name of the group must be unique !"
+msgstr "El nom del grup ha de ser únic!"
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "New users (emails required)"
+msgstr "Nous usuaris (adreces de correu electrònic requerides)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:390
+#, python-format
+msgid "Sharing filter created by user %s (%s) for group %s"
+msgstr "Filtre de compartició creat per l'usuari %s (%s) per al grup %s"
+
+#. module: share
+#: view:res.groups:0
+msgid "Groups"
+msgstr "Grups"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Select the desired shared access mode:"
+msgstr "Seleccioneu la manera d'accés compartit desitjat:"
+
+#. module: share
+#: field:res.groups,share:0
+msgid "Share Group"
+msgstr "Grup compartit"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:431
+#: field:share.wizard.result.line,password:0
+#, python-format
+msgid "Password"
+msgstr "Contrasenya"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Who would you want to share this data with?"
+msgstr "Amb qui voldrÃeu compartir aquestes dades?"
+
+#. module: share
+#: model:ir.module.module,description:share.module_meta_information
+msgid ""
+"The goal is to implement a generic sharing mechanism, where user of OpenERP\n"
+"can share data from OpenERP to their colleagues, customers, or friends.\n"
+"The system will work by creating new users and groups on the fly, and by\n"
+"combining the appropriate access rights and ir.rules to ensure that the "
+"/shared\n"
+"users/ will only have access to the correct data.\n"
+" "
+msgstr ""
+"L'objectiu és implementar un mecanisme genèric de col·laboració, on un "
+"usuari d'OpenERP\n"
+"pot compartir informació d'OpenERP amb els seus companys, clients, o amics.\n"
+"El sistema funcionarà creant nous usuaris i grups sobre la marxa, i "
+"combinant\n"
+"les regles d'accés apropiades i ir.rules per assegurar que els /usuaris "
+"compartits/ tinguin\n"
+"únicament accés a la informació adequada.\n"
+" "
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:102
+#, python-format
+msgid "User already exists"
+msgstr "L'usuari ja existeix"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Send Email Notification(s)"
+msgstr "Envia notificacions per correu electrònic"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:435
+#, python-format
+msgid ""
+"You may use your existing login and password to view it. As a reminder, your "
+"login is %s.\n"
+msgstr ""
+"Podeu utilitzar el vostre login i contrasenya per veure-ho. Com a "
+"recordatori, el vostre login és %s.\n"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:432
+#, python-format
+msgid "Database"
+msgstr "Base de dades"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_user
+msgid "share.wizard.user"
+msgstr "comparteix.assistent.usuari"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Please select the action that opens the screen containing the data you want "
+"to share."
+msgstr ""
+"Seleccioneu l'acció que obre la pantalla que conté la informació que voleu "
+"compartir."
+
+#. module: share
+#: selection:share.wizard,user_type:0
+msgid "Existing external users"
+msgstr "Usuaris externs existents"
+
+#. module: share
+#: view:share.wizard:0
+#: field:share.wizard,result_line_ids:0
+msgid "Summary"
+msgstr "Resum"
+
+#. module: share
+#: field:share.wizard,user_type:0
+msgid "Users to share with"
+msgstr "Usuaris amb els quals compartir"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:276
+#, python-format
+msgid "Indirect sharing filter created by user %s (%s) for group %s"
+msgstr ""
+"Filtre de compartició indirecta creat per l'usuari %s (%s) per al grup %s"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:420
+#, python-format
+msgid "Email required"
+msgstr "Correu electrònic requerit"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:212
+#, python-format
+msgid "Copied access for sharing"
+msgstr "Accés copiat per a compartició"
+
+#. module: share
+#: view:share.wizard:0
+msgid ""
+"Optionally, you may specify an additional domain restriction that will be "
+"applied to the shared data."
+msgstr ""
+"Opcionalment, podeu indicar una restricció de domini addicional que serà "
+"aplicada sobre la informació compartida."
+
+#. module: share
+#: view:share.wizard:0
+msgid "New Users (please provide one e-mail address per line below)"
+msgstr ""
+"Nous usuaris (prohibiu a continuació una adreça de correu electrònic per "
+"lÃnia)"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:420
+#, python-format
+msgid ""
+"The current user must have an email address configured in User Preferences "
+"to be able to send outgoing emails."
+msgstr ""
+"L'usuari actual ha de tenir una adreça d'email configurada en preferències "
+"usuari per poder enviar emails sortints."
+
+#. module: share
+#: view:res.users:0
+msgid "Regular users only (no share user)"
+msgstr "Només usuaris regulars (no usuaris de compartició)"
+
+#. module: share
+#: field:share.wizard.result.line,share_url:0
+msgid "Share URL"
+msgstr "Comparteix URL"
+
+#. module: share
+#: field:share.wizard,domain:0
+msgid "Domain"
+msgstr "Domini"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:286
+#, python-format
+msgid ""
+"Sorry, the current screen and filter you are trying to share are not "
+"supported at the moment.\n"
+"You may want to try a simpler filter."
+msgstr ""
+"La pantalla i el filtre actual que esteu tractant de compartir no són "
+"suportats en aquest moment.\n"
+"Podeu provar un filtre simple."
+
+#. module: share
+#: field:share.wizard,access_mode:0
+msgid "Access Mode"
+msgstr "Manera d'accés"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Access info"
+msgstr "Informació d'accés"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:426
+#, python-format
+msgid ""
+"To access it, you can go to the following URL:\n"
+" %s"
+msgstr ""
+"Per accedir, podeu utilitzar la URL següent:\n"
+"%s"
+
+#. module: share
+#: field:share.wizard,action_id:0
+msgid "Action to share"
+msgstr "Acció a compartir"
+
+#. module: share
+#: code:addons/share/web/editors.py:18
+#, python-format
+msgid "Share"
+msgstr "Comparteix"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:406
+#, python-format
+msgid "Sharing Wizard - Step 2"
+msgstr "Assistent de compartició - Pas 2"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Here is a summary of the access points you have just created:"
+msgstr "Aquà es mostra un resum dels punts d'accés que acaba de crear:"
+
+#. module: share
+#: model:ir.model,name:share.model_share_wizard_result_line
+msgid "share.wizard.result.line"
+msgstr "comparteix.assistent.resultat.lÃnia"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:285
+#, python-format
+msgid "Sharing access could not be setup"
+msgstr ""
+
+#. module: share
+#: model:ir.actions.act_window,name:share.action_share_wizard_step1
+#: model:ir.model,name:share.model_share_wizard
+#: field:share.wizard.result.line,share_wizard_id:0
+#: field:share.wizard.user,share_wizard_id:0
+msgid "Share Wizard"
+msgstr "Assistent de compartició"
+
+#. module: share
+#: help:share.wizard,user_type:0
+msgid "Select the type of user(s) you would like to share data with."
+msgstr ""
+"Seleccioneu el tipus d'usuaris amb els quals li agradaria compartir dades."
+
+#. module: share
+#: view:share.wizard:0
+msgid "Cancel"
+msgstr "Canceŀla"
+
+#. module: share
+#: view:share.wizard:0
+msgid "Close"
+msgstr "Tanca"
+
+#. module: share
+#: help:res.users,share:0
+msgid ""
+"External user with limited access, created only for the purpose of sharing "
+"data."
+msgstr ""
+"Usuari extern amb accés limitat, creat només amb el propòsit de compartir "
+"dades."
+
+#. module: share
+#: help:share.wizard,domain:0
+msgid "Optional domain for further data filtering"
+msgstr "Domini opcional pel filtrat avançat de dades"
+
+#. module: share
+#: selection:share.wizard,access_mode:0
+msgid "Read-only"
+msgstr "Només lectura"
+
+#. module: share
+#: code:addons/share/wizard/share_wizard.py:295
+#, python-format
+msgid "*usual password*"
+msgstr "*contrasenya habitual*"
+
+#, python-format
+#~ msgid ""
+#~ "Dear,\n"
+#~ "\n"
+#~ msgstr ""
+#~ "Benvolgut,\n"
+#~ "\n"
+
+#, python-format
+#~ msgid ""
+#~ "You may use the following login and password to get access to this protected "
+#~ "area:"
+#~ msgstr ""
+#~ "Podeu utilitzar el següent usuari i contrasenya per accedir en aquesta à rea "
+#~ "protegida:"
+>>>>>>> MERGE-SOURCE
=== modified file 'share/i18n/de.po'
--- share/i18n/de.po 2011-04-04 04:47:57 +0000
+++ share/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:09+0000\n"
+=======
+"PO-Revision-Date: 2011-01-13 17:49+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
"Language-Team: German <de@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:58+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: share
#: code:addons/share/web/editors.py:15
@@ -74,10 +83,13 @@
"%s\n"
"\n"
msgstr ""
+<<<<<<< TREE
"Geehrte(r),\n"
"\n"
"%s\n"
"\n"
+=======
+>>>>>>> MERGE-SOURCE
#. module: share
#: constraint:res.users:0
@@ -138,8 +150,11 @@
"You may use the following login and password to get access to this protected "
"area:\n"
msgstr ""
+<<<<<<< TREE
"Sie können folgendes Login und Passwort verwenden, um den geschützten "
"Bereich zu erreichen.\n"
+=======
+>>>>>>> MERGE-SOURCE
#. module: share
#: view:res.groups:0
=== modified file 'share/i18n/pl.po'
--- share/i18n/pl.po 2011-04-04 04:47:57 +0000
+++ share/i18n/pl.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,24 @@
"Project-Id-Version: openobject-addons\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 11:52+0000\n"
"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@xxxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2010-11-27 04:01+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: Polish <pl@xxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:47+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:58+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: share
#: code:addons/share/web/editors.py:15
=== modified file 'share/i18n/pt_BR.po'
--- share/i18n/pt_BR.po 2011-03-23 04:36:07 +0000
+++ share/i18n/pt_BR.po 2011-04-11 14:26:52 +0000
@@ -14,8 +14,13 @@
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-23 04:35+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-22 04:35+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: share
#: code:addons/share/web/editors.py:15
=== modified file 'stock/__openerp__.py'
--- stock/__openerp__.py 2011-03-22 13:12:14 +0000
+++ stock/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -44,7 +44,11 @@
* Graph : Products to send in delay (date < = today)
""",
"website" : "http://www.openerp.com";,
+<<<<<<< TREE
"images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
+=======
+ "images" : ["images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
+>>>>>>> MERGE-SOURCE
"depends" : ["product", "account"],
"category" : "Warehouse",
"init_xml" : [],
=== modified file 'stock/i18n/ca.po'
--- stock/i18n/ca.po 2011-03-27 04:53:32 +0000
+++ stock/i18n/ca.po 2011-04-11 14:26:52 +0000
@@ -7,15 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-26 18:33+0000\n"
+=======
+"PO-Revision-Date: 2010-10-30 09:49+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Jordi Esteve (www.zikzakmedia.com) "
"<jesteve@xxxxxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-27 04:52+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:39+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: stock
#: field:product.product,track_outgoing:0
@@ -898,6 +907,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:1315
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+
+#. module: stock
#: help:stock.picking,location_id:0
msgid ""
"Keep empty if you produce at the location where the finished products are "
@@ -4107,6 +4122,7 @@
#: help:stock.location,posz:0
msgid "Optional localization details, for information purpose only"
msgstr ""
+<<<<<<< TREE
#, python-format
#~ msgid "Futur Stock"
@@ -4975,3 +4991,865 @@
#, python-format
#~ msgid "Product "
#~ msgstr "Producte "
+=======
+
+#, python-format
+#~ msgid "Futur Stock"
+#~ msgstr "Estoc futur"
+
+#~ msgid "LIFO"
+#~ msgstr "LIFO"
+
+#~ msgid "STOCK_SAVE"
+#~ msgstr "STOCK_SAVE"
+
+#~ msgid "Sub Products"
+#~ msgstr "Sub productes"
+
+#~ msgid "terp-account"
+#~ msgstr "terp-account"
+
+#~ msgid "STOCK_SORT_ASCENDING"
+#~ msgstr "STOCK_SORT_ASCENDING"
+
+#~ msgid "Revision"
+#~ msgstr "Revisió"
+
+#~ msgid "STOCK_MEDIA_FORWARD"
+#~ msgstr "STOCK_MEDIA_FORWARD"
+
+#~ msgid "STOCK_ZOOM_100"
+#~ msgstr "STOCK_ZOOM_100"
+
+#~ msgid "Fill Inventory for specific location"
+#~ msgstr "Omple inventari per una determinada ubicació"
+
+#~ msgid "Amount"
+#~ msgstr "Import"
+
+#~ msgid "Products Received"
+#~ msgstr "Productes rebuts"
+
+#, python-format
+#~ msgid "Futur Productions"
+#~ msgstr "Produccions futures"
+
+#, python-format
+#~ msgid "Futur Receptions"
+#~ msgstr "Recepcions futures"
+
+#~ msgid "Force to use a Production Lot during receptions"
+#~ msgstr "Obligueu a utilitzar un lot de producció durant la recepció"
+
+#~ msgid "STOCK_NEW"
+#~ msgstr "STOCK_NEW"
+
+#~ msgid "STOCK_CANCEL"
+#~ msgstr "STOCK_CANCEL"
+
+#~ msgid "Make Parcel"
+#~ msgstr "Realitza enviaments parcials"
+
+#~ msgid "STOCK_QUIT"
+#~ msgstr "STOCK_QUIT"
+
+#~ msgid "STOCK_GOTO_TOP"
+#~ msgstr "STOCK_GOTO_TOP"
+
+#~ msgid "STOCK_ABOUT"
+#~ msgstr "STOCK_ABOUT"
+
+#~ msgid "terp-hr"
+#~ msgstr "terp-hr"
+
+#~ msgid "terp-purchase"
+#~ msgstr "terp-purchase"
+
+#~ msgid "STOCK_DND"
+#~ msgstr "STOCK_DND"
+
+#~ msgid "Products Sent"
+#~ msgstr "Productes enviats"
+
+#~ msgid "STOCK_GOTO_FIRST"
+#~ msgstr "STOCK_GOTO_FIRST"
+
+#~ msgid "Serial"
+#~ msgstr "Sèrie"
+
+#~ msgid "STOCK_FLOPPY"
+#~ msgstr "STOCK_FLOPPY"
+
+#~ msgid "Stock location"
+#~ msgstr "Ubicació de l'estoc"
+
+#~ msgid "Unreceived Products"
+#~ msgstr "Productes no rebuts"
+
+#~ msgid "Status"
+#~ msgstr "Estat"
+
+#~ msgid "STOCK_UNDERLINE"
+#~ msgstr "STOCK_UNDERLINE"
+
+#~ msgid "Include all childs for the location"
+#~ msgstr "Inclou tots els descendents de la ubicació"
+
+#~ msgid "Track line"
+#~ msgstr "LÃnia de track"
+
+#~ msgid "STOCK_BOLD"
+#~ msgstr "STOCK_BOLD"
+
+#~ msgid "terp-graph"
+#~ msgstr "terp-graph"
+
+#~ msgid "STOCK_PREFERENCES"
+#~ msgstr "STOCK_PREFERENCES"
+
+#~ msgid "Stock Level 1"
+#~ msgstr "Nivell d'estoc 1"
+
+#~ msgid "STOCK_MEDIA_REWIND"
+#~ msgstr "STOCK_MEDIA_REWIND"
+
+#~ msgid "Stock Properties"
+#~ msgstr "Propietats d'estoc"
+
+#~ msgid "Make Picking"
+#~ msgstr "Crea albarà "
+
+#~ msgid "Draft Moves"
+#~ msgstr "Moviments esborrany"
+
+#~ msgid "Product Id"
+#~ msgstr "Id producte"
+
+#~ msgid "Customer Invoice"
+#~ msgstr "Factura de client"
+
+#~ msgid "Force to use a Production Lot during production order"
+#~ msgstr "Obligueu a utilitzar un lot de producció durant l'ordre de producció"
+
+#~ msgid "STOCK_CUT"
+#~ msgstr "STOCK_CUT"
+
+#~ msgid ""
+#~ "For the current product (template), this stock location will be used, "
+#~ "instead of the default one, as the source location for stock moves generated "
+#~ "when you do an inventory"
+#~ msgstr ""
+#~ "Per l'actual producte (plantilla), aquesta ubicació d'estoc s'utilitzarà , en "
+#~ "lloc de la per defecte, com la ubicació origen per moviments d'estoc "
+#~ "generats quan realitzeu un inventari"
+
+#~ msgid "This account will be used to value the output stock"
+#~ msgstr "Aquest compte serà utilitzat per calcular l'estoc de sortida"
+
+#~ msgid "STOCK_ZOOM_FIT"
+#~ msgstr "STOCK_ZOOM_FIT"
+
+#~ msgid ""
+#~ "This journal will be used for the accounting move generated by stock move"
+#~ msgstr ""
+#~ "Aquest diari serà utilitzat per comptabilitzar un moviment generat per un "
+#~ "moviment d'estoc"
+
+#~ msgid "Calendar of Deliveries"
+#~ msgstr "Calendari d'enviaments"
+
+#~ msgid "Track Incomming Lots"
+#~ msgstr "Lots seguiment d'entrada"
+
+#~ msgid "STOCK_SAVE_AS"
+#~ msgstr "STOCK_SAVE_AS"
+
+#~ msgid "STOCK_DIALOG_ERROR"
+#~ msgstr "STOCK_DIALOG_ERROR"
+
+#~ msgid "Latest Date of Inventory"
+#~ msgstr "Última data d'inventari"
+
+#~ msgid "STOCK_INDEX"
+#~ msgstr "STOCK_INDEX"
+
+#~ msgid "STOCK_GOTO_BOTTOM"
+#~ msgstr "STOCK_GOTO_BOTTOM"
+
+#~ msgid "Tracking Lot"
+#~ msgstr "Lot de seguiment"
+
+#~ msgid "STOCK_GO_FORWARD"
+#~ msgstr "STOCK_GO_FORWARD"
+
+#~ msgid "STOCK_UNDELETE"
+#~ msgstr "STOCK_UNDELETE"
+
+#~ msgid "STOCK_EXECUTE"
+#~ msgstr "STOCK_EXECUTE"
+
+#~ msgid "STOCK_DIALOG_QUESTION"
+#~ msgstr "STOCK_DIALOG_QUESTION"
+
+#~ msgid "Tracking/Serial"
+#~ msgstr "Seguiment/Sèrie"
+
+#~ msgid "STOCK_SELECT_FONT"
+#~ msgstr "STOCK_SELECT_FONT"
+
+#~ msgid "STOCK_PASTE"
+#~ msgstr "STOCK_PASTE"
+
+#~ msgid ""
+#~ "Tracking lot is the code that will be put on the logistical unit/pallet"
+#~ msgstr ""
+#~ "Lot de seguiment és el codi que es col·locarà en la unitat/palet logÃstic."
+
+#, python-format
+#~ msgid "Futur Deliveries"
+#~ msgstr "Enviaments futurs"
+
+#~ msgid "Tracking Number"
+#~ msgstr "Número seguiment"
+
+#~ msgid "terp-stock"
+#~ msgstr "terp-stock"
+
+#~ msgid "Packing List:"
+#~ msgstr "Albarà :"
+
+#~ msgid "STOCK_MEDIA_RECORD"
+#~ msgstr "STOCK_MEDIA_RECORD"
+
+#~ msgid "Non Assigned Products:"
+#~ msgstr "Productes no assignats:"
+
+#~ msgid "terp-report"
+#~ msgstr "terp-report"
+
+#~ msgid "Location Content (With children)"
+#~ msgstr "Contingut ubicació (amb fills)"
+
+#~ msgid "STOCK_FILE"
+#~ msgstr "STOCK_FILE"
+
+#~ msgid "STOCK_EDIT"
+#~ msgstr "STOCK_EDIT"
+
+#~ msgid "STOCK_CONNECT"
+#~ msgstr "STOCK_CONNECT"
+
+#~ msgid "STOCK_GO_DOWN"
+#~ msgstr "STOCK_GO_DOWN"
+
+#~ msgid "STOCK_OK"
+#~ msgstr "STOCK_OK"
+
+#~ msgid "New Internal Packing"
+#~ msgstr "Nou albarà intern"
+
+#~ msgid "Finished products"
+#~ msgstr "Productes finalitzats"
+
+#~ msgid "Date create"
+#~ msgstr "Data creació"
+
+#~ msgid "Set to Zero"
+#~ msgstr "Fixa a zero"
+
+#~ msgid "All Stock Moves"
+#~ msgstr "Tots els moviments d'estoc"
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invà lid per a la definició de la vista!"
+
+#~ msgid "STOCK_HELP"
+#~ msgstr "STOCK_HELP"
+
+#~ msgid "This account will be used to value the input stock"
+#~ msgstr "Aquest compte serà utilitzat per calcular l'estoc d'entrada"
+
+#, python-format
+#~ msgid "Invoice state"
+#~ msgstr "Estat de la factura"
+
+#~ msgid "STOCK_UNDO"
+#~ msgstr "STOCK_UNDO"
+
+#~ msgid "Date Created"
+#~ msgstr "Data creació"
+
+#~ msgid "STOCK_GO_BACK"
+#~ msgstr "STOCK_GO_BACK"
+
+#~ msgid "STOCK_JUSTIFY_FILL"
+#~ msgstr "STOCK_JUSTIFY_FILL"
+
+#~ msgid "Allocation Method"
+#~ msgstr "Mètode assignació"
+
+#~ msgid "STOCK_APPLY"
+#~ msgstr "STOCK_APPLY"
+
+#, python-format
+#~ msgid "Please select at least two inventories."
+#~ msgstr "Seleccioneu al menys dos inventaris."
+
+#~ msgid "Dest. Address"
+#~ msgstr "Adreça destinatari"
+
+#~ msgid "Periodical Inventory"
+#~ msgstr "Inventari periòdic"
+
+#~ msgid "terp-crm"
+#~ msgstr "terp-crm"
+
+#~ msgid "STOCK_STRIKETHROUGH"
+#~ msgstr "STOCK_STRIKETHROUGH"
+
+#~ msgid "terp-partner"
+#~ msgstr "terp-partner"
+
+#~ msgid "Draft Periodical Inventories"
+#~ msgstr "Inventaris periòdics esborrany"
+
+#~ msgid "STOCK_MISSING_IMAGE"
+#~ msgstr "STOCK_MISSING_IMAGE"
+
+#~ msgid "STOCK_SPELL_CHECK"
+#~ msgstr "STOCK_SPELL_CHECK"
+
+#~ msgid "Stock Tracking Lots"
+#~ msgstr "Estoc dels lots de seguiment"
+
+#~ msgid "Origin Reference"
+#~ msgstr "Referència origen"
+
+#~ msgid "Available Moves"
+#~ msgstr "Moviments disponibles"
+
+#~ msgid "STOCK_HARDDISK"
+#~ msgstr "STOCK_HARDDISK"
+
+#~ msgid "Open Products"
+#~ msgstr "Obre productes"
+
+#~ msgid "Input Packing List"
+#~ msgstr "Albarans d'entrada"
+
+#~ msgid "Packing List"
+#~ msgstr "Albarà "
+
+#~ msgid "STOCK_COPY"
+#~ msgstr "STOCK_COPY"
+
+#, python-format
+#~ msgid "Futur Qty"
+#~ msgstr "Qtat futura"
+
+#~ msgid "STOCK_CDROM"
+#~ msgstr "STOCK_CDROM"
+
+#~ msgid "Not from Packing"
+#~ msgstr "No a partir d'albarà "
+
+#~ msgid "Internal Ref"
+#~ msgstr "Ref. interna"
+
+#~ msgid "STOCK_REFRESH"
+#~ msgstr "STOCK_REFRESH"
+
+#~ msgid "STOCK_STOP"
+#~ msgstr "STOCK_STOP"
+
+#~ msgid "STOCK_FIND_AND_REPLACE"
+#~ msgstr "STOCK_FIND_AND_REPLACE"
+
+#~ msgid "Validate"
+#~ msgstr "Valida"
+
+#~ msgid "STOCK_DIALOG_WARNING"
+#~ msgstr "STOCK_DIALOG_WARNING"
+
+#~ msgid "STOCK_ZOOM_IN"
+#~ msgstr "STOCK_ZOOM_IN"
+
+#~ msgid "STOCK_CONVERT"
+#~ msgstr "STOCK_CONVERT"
+
+#~ msgid "Move lines"
+#~ msgstr "LÃnies de moviments"
+
+#~ msgid "terp-calendar"
+#~ msgstr "terp-calendar"
+
+#~ msgid "STOCK_ITALIC"
+#~ msgstr "STOCK_ITALIC"
+
+#~ msgid "STOCK_YES"
+#~ msgstr "STOCK_YES"
+
+#~ msgid "Fill From Unreceived Products"
+#~ msgstr "Omple a partir de productes no rebuts"
+
+#~ msgid "Dest. Move"
+#~ msgstr "Mov. destÃ"
+
+#~ msgid "New Periodical Inventory"
+#~ msgstr "Nou inventari periòdic"
+
+#~ msgid "FIFO"
+#~ msgstr "FIFO"
+
+#~ msgid "Delivery Orders to Process"
+#~ msgstr "Ordres de lliurament a processar"
+
+#~ msgid "Invoice Status"
+#~ msgstr "Estat de facturació"
+
+#~ msgid "STOCK_JUSTIFY_LEFT"
+#~ msgstr "STOCK_JUSTIFY_LEFT"
+
+#~ msgid "Future Stock Forecast"
+#~ msgstr "Previsió de futur estoc"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "El nom de l'objecte ha de començar amb x_ i no contenir cap carà cter "
+#~ "especial!"
+
+#~ msgid "Planned Date"
+#~ msgstr "Data prevista"
+
+#, python-format
+#~ msgid "No production sequence defined"
+#~ msgstr "No s'ha definit una seqüència de producció"
+
+#~ msgid "STOCK_COLOR_PICKER"
+#~ msgstr "STOCK_COLOR_PICKER"
+
+#~ msgid "Lots by location"
+#~ msgstr "Lots per ubicació"
+
+#~ msgid "STOCK_DELETE"
+#~ msgstr "STOCK_DELETE"
+
+#~ msgid "STOCK_CLEAR"
+#~ msgstr "STOCK_CLEAR"
+
+#~ msgid "Created Date"
+#~ msgstr "Data creació"
+
+#~ msgid "terp-mrp"
+#~ msgstr "terp-mrp"
+
+#~ msgid "STOCK_GO_UP"
+#~ msgstr "STOCK_GO_UP"
+
+#~ msgid "STOCK_SORT_DESCENDING"
+#~ msgstr "STOCK_SORT_DESCENDING"
+
+#~ msgid "Tracking Lots"
+#~ msgstr "Lots de seguiment"
+
+#~ msgid "STOCK_HOME"
+#~ msgstr "STOCK_HOME"
+
+#~ msgid "STOCK_PROPERTIES"
+#~ msgstr "STOCK_PROPERTIES"
+
+#~ msgid "Create invoices"
+#~ msgstr "Crea factures"
+
+#~ msgid "Set Stock to Zero"
+#~ msgstr "Fixa estoc a zero"
+
+#~ msgid "STOCK_MEDIA_STOP"
+#~ msgstr "STOCK_MEDIA_STOP"
+
+#~ msgid "Make packing"
+#~ msgstr "Crea albarà "
+
+#~ msgid "STOCK_DND_MULTIPLE"
+#~ msgstr "STOCK_DND_MULTIPLE"
+
+#~ msgid "STOCK_REMOVE"
+#~ msgstr "STOCK_REMOVE"
+
+#~ msgid "STOCK_DIALOG_AUTHENTICATION"
+#~ msgstr "STOCK_DIALOG_AUTHENTICATION"
+
+#~ msgid "STOCK_ZOOM_OUT"
+#~ msgstr "STOCK_ZOOM_OUT"
+
+#~ msgid "Nearest"
+#~ msgstr "El més proper"
+
+#~ msgid "STOCK_SELECT_COLOR"
+#~ msgstr "STOCK_SELECT_COLOR"
+
+#~ msgid "STOCK_PRINT"
+#~ msgstr "STOCK_PRINT"
+
+#~ msgid "STOCK_NO"
+#~ msgstr "STOCK_NO"
+
+#~ msgid "Workshop"
+#~ msgstr "Botiga"
+
+#~ msgid "STOCK_REDO"
+#~ msgstr "STOCK_REDO"
+
+#~ msgid "Tiny sprl"
+#~ msgstr "Tiny sprl"
+
+#~ msgid "STOCK_CLOSE"
+#~ msgstr "STOCK_CLOSE"
+
+#~ msgid "Force to use a Production Lot during deliveries"
+#~ msgstr "Obligueu a utilitzar un lot de producció durant els enviaments"
+
+#~ msgid "Split move lines in two"
+#~ msgstr "Divideix lÃnies de moviment en dos"
+
+#~ msgid "Return"
+#~ msgstr "Retorna"
+
+#~ msgid "Auto-Packing"
+#~ msgstr "Auto-Empaquetament"
+
+#~ msgid "STOCK_JUMP_TO"
+#~ msgstr "STOCK_JUMP_TO"
+
+#~ msgid "terp-tools"
+#~ msgstr "terp-tools"
+
+#~ msgid "Location Overview"
+#~ msgstr "Vista general ubicacions"
+
+#~ msgid "STOCK_DIALOG_INFO"
+#~ msgstr "STOCK_DIALOG_INFO"
+
+#~ msgid "Split move line"
+#~ msgstr "Divideix lÃnia de moviment"
+
+#~ msgid "terp-sale"
+#~ msgstr "terp-sale"
+
+#~ msgid "STOCK_ADD"
+#~ msgstr "STOCK_ADD"
+
+#~ msgid "Chained Delay (days)"
+#~ msgstr "Retard encadenat (dies)"
+
+#~ msgid "STOCK_MEDIA_PAUSE"
+#~ msgstr "STOCK_MEDIA_PAUSE"
+
+#~ msgid "Track Outging Lots"
+#~ msgstr "Lots seguiment de sortida"
+
+#~ msgid "STOCK_PRINT_PREVIEW"
+#~ msgstr "STOCK_PRINT_PREVIEW"
+
+#~ msgid "STOCK_FIND"
+#~ msgstr "STOCK_FIND"
+
+#~ msgid "Tracking"
+#~ msgstr "Seguiment"
+
+#~ msgid ""
+#~ "This account will be used, instead of the default one, to value input stock"
+#~ msgstr ""
+#~ "Aquest compte serà utilitzat, en lloc del compte per defecte, per a calcular "
+#~ "l'estoc d'entrada"
+
+#~ msgid "Components"
+#~ msgstr "Components"
+
+#~ msgid "Max. Planned Date"
+#~ msgstr "Data prevista mà x."
+
+#~ msgid "STOCK_MEDIA_PLAY"
+#~ msgstr "STOCK_MEDIA_PLAY"
+
+#~ msgid "STOCK_OPEN"
+#~ msgstr "STOCK_OPEN"
+
+#~ msgid "STOCK_MEDIA_PREVIOUS"
+#~ msgstr "STOCK_MEDIA_PREVIOUS"
+
+#~ msgid "Stock Locations Structure"
+#~ msgstr "Estructura ubicacions estoc"
+
+#~ msgid "STOCK_DISCONNECT"
+#~ msgstr "STOCK_DISCONNECT"
+
+#~ msgid ""
+#~ "This account will be used, instead of the default one, to value output stock"
+#~ msgstr ""
+#~ "Aquest compte serà utilitzat, en lloc del compte per defecte, per a calcular "
+#~ "l'estoc de sortida"
+
+#~ msgid "Confirm (Do Not Process Now)"
+#~ msgstr "Confirma (no processa ara)"
+
+#~ msgid "Moves Tracked"
+#~ msgstr "Seguiment moviments"
+
+#~ msgid "STOCK_NETWORK"
+#~ msgstr "STOCK_NETWORK"
+
+#~ msgid "terp-project"
+#~ msgstr "terp-project"
+
+#~ msgid "Stock by Lots"
+#~ msgstr "Estoc per lots"
+
+#~ msgid "STOCK_UNINDENT"
+#~ msgstr "STOCK_UNINDENT"
+
+#~ msgid "Canceled"
+#~ msgstr "Cancel·lat"
+
+#~ msgid "STOCK_GOTO_LAST"
+#~ msgstr "STOCK_GOTO_LAST"
+
+#~ msgid "STOCK_DIRECTORY"
+#~ msgstr "STOCK_DIRECTORY"
+
+#~ msgid ""
+#~ "For the current product (template), this stock location will be used, "
+#~ "instead of the default one, as the source location for stock moves generated "
+#~ "by production orders"
+#~ msgstr ""
+#~ "Per l'actual producte (plantilla), aquesta ubicació d'estoc s'utilitzarà , en "
+#~ "lloc de la per defecte, com la ubicació origen pels moviments d'estoc "
+#~ "generats per ordres de producció"
+
+#~ msgid "Add"
+#~ msgstr "Afegeix"
+
+#~ msgid "STOCK_JUSTIFY_CENTER"
+#~ msgstr "STOCK_JUSTIFY_CENTER"
+
+#~ msgid "Set Stock to 0"
+#~ msgstr "Fixa estoc a 0"
+
+#~ msgid "Localisation"
+#~ msgstr "Ubicació"
+
+#~ msgid "Do you want to set stocks to zero ?"
+#~ msgstr "Voleu fixar estocs a zero?"
+
+#~ msgid "Direct Delivery"
+#~ msgstr "Enviament directe"
+
+#~ msgid "STOCK_REVERT_TO_SAVED"
+#~ msgstr "STOCK_REVERT_TO_SAVED"
+
+#~ msgid "Track Production Lots"
+#~ msgstr "Lots seguiment de producció"
+
+#~ msgid "Split in Two"
+#~ msgstr "Divideix en dos"
+
+#, python-format
+#~ msgid "Futur P&L"
+#~ msgstr "P&L futur"
+
+#~ msgid ""
+#~ "For the current product (template), this stock location will be used, "
+#~ "instead of the default one, as the source location for stock moves generated "
+#~ "by procurements"
+#~ msgstr ""
+#~ "Per l'actual producte (plantilla), aquesta ubicació d'estoc s'utilitzarà , en "
+#~ "lloc de la per defecte, com la ubicació origen per moviments d'estoc "
+#~ "generats per proveïments"
+
+#~ msgid "stock.picking.move.wizard"
+#~ msgstr "stock.picking.move.wizard"
+
+#~ msgid "Date Order"
+#~ msgstr "Data ordre"
+
+#~ msgid "Supplier Invoice"
+#~ msgstr "Factura de proveïdor"
+
+#, python-format
+#~ msgid "to be invoiced"
+#~ msgstr "Per facturar"
+
+#~ msgid "terp-product"
+#~ msgstr "terp-product"
+
+#~ msgid "Close"
+#~ msgstr "Tanca"
+
+#~ msgid "Inventory Account"
+#~ msgstr "Compte inventari"
+
+#~ msgid "Set Stocks to Zero"
+#~ msgstr "Fixa estocs a zero"
+
+#~ msgid "Low Level"
+#~ msgstr "Nivell baix"
+
+#~ msgid "STOCK_INDENT"
+#~ msgstr "STOCK_INDENT"
+
+#~ msgid "Delivery"
+#~ msgstr "Lliurament"
+
+#~ msgid "Locations' Values"
+#~ msgstr "Valors ubicacions"
+
+#~ msgid "STOCK_JUSTIFY_RIGHT"
+#~ msgstr "STOCK_JUSTIFY_RIGHT"
+
+#~ msgid "Inventory line"
+#~ msgstr "LÃnia d'inventari"
+
+#~ msgid "Others info"
+#~ msgstr "Altres info."
+
+#~ msgid "STOCK_MEDIA_NEXT"
+#~ msgstr "STOCK_MEDIA_NEXT"
+
+#~ msgid "Move State"
+#~ msgstr "Estat de moviments"
+
+#~ msgid ""
+#~ "This is used only if you selected a chained location type.\n"
+#~ "The 'Automatic Move' value will create a stock move after the current one "
+#~ "that will be validated automatically. With 'Manual Operation', the stock "
+#~ "move has to be validated by a worker. With 'Automatic No Step Added', the "
+#~ "location is replaced in the original move."
+#~ msgstr ""
+#~ "S'utilitza només si seleccioneu un tipus d'ubicació encadenada.\n"
+#~ "L'opció 'Moviment automà tic' crearà un moviment d'estoc després de l'actual "
+#~ "que es validarà automà ticament. Amb 'Operació manual', el moviment d'estoc "
+#~ "ha de ser validat per un treballador. Amb 'Mov. automà tic, pas no afegit', "
+#~ "la ubicació es reemplaça en el moviment original."
+
+#, python-format
+#~ msgid "Invoice cannot be created from Packing."
+#~ msgstr "No es pot crear factura des d'albarans."
+
+#, python-format
+#~ msgid "Invoice is not created"
+#~ msgstr "No s'ha creat factura"
+
+#, python-format
+#~ msgid "Please select one and only one inventory !"
+#~ msgstr "Seleccioneu només un inventari!"
+
+#~ msgid "Future Delivery Orders"
+#~ msgstr "Ordres de lliurament futures"
+
+#, python-format
+#~ msgid "Invoice is already created."
+#~ msgstr "Ja existeix una factura creada"
+
+#~ msgid "Packing result"
+#~ msgstr "Resultat albarà "
+
+#~ msgid "Available Packing"
+#~ msgstr "Albarà disponible"
+
+#~ msgid "Packing Done"
+#~ msgstr "Albarà realitzat"
+
+#~ msgid "The packing has been successfully made !"
+#~ msgstr "L'albarà ha estat realitzat correctament!"
+
+#~ msgid "Packing to Process"
+#~ msgstr "Albarans a processar"
+
+#~ msgid "Confirmed Packing Waiting Availability"
+#~ msgstr "Albarà confirmat esperant disponibilitat"
+
+#~ msgid "Partial packing"
+#~ msgstr "Albarà parcial"
+
+#~ msgid "Incoming Products"
+#~ msgstr "Albarans d'entrada"
+
+#~ msgid "Outgoing Products"
+#~ msgstr "Albarans de sortida"
+
+#~ msgid "Return packing"
+#~ msgstr "Albarà de devolució"
+
+#~ msgid "Print Item Labels"
+#~ msgstr "Imprimeix etiquetes"
+
+#~ msgid "New Reception Packing"
+#~ msgstr "Nou albarà d'entrada"
+
+#~ msgid "Invalid model name in the action definition."
+#~ msgstr "Nom de model no và lid a la definició de l'acció."
+
+#~ msgid "Move History"
+#~ msgstr "Històric moviments"
+
+#~ msgid "Customer Refund"
+#~ msgstr "Factura rectificativa (abonament) de client"
+
+#~ msgid "Move Lines"
+#~ msgstr "LÃnies moviment"
+
+#~ msgid "Qty"
+#~ msgstr "Qtat."
+
+#~ msgid "Supplier Refund"
+#~ msgstr "Factura rectificativa (abonament) de proveïdor"
+
+#~ msgid "terp-administration"
+#~ msgstr "terp-administration"
+
+#~ msgid ""
+#~ "OpenERP Stock Management module can manage multi-warehouses, multi and "
+#~ "structured stock locations.\n"
+#~ "Thanks to the double entry management, the inventory controlling is powerful "
+#~ "and flexible:\n"
+#~ "* Moves history and planning,\n"
+#~ "* Different inventory methods (FIFO, LIFO, ...)\n"
+#~ "* Stock valuation (standard or average price, ...)\n"
+#~ "* Robustness faced with Inventory differences\n"
+#~ "* Automatic reordering rules (stock level, JIT, ...)\n"
+#~ "* Bar code supported\n"
+#~ "* Rapid detection of mistakes through double entry system\n"
+#~ "* Traceability (upstream/downstream, production lots, serial number, ...)\n"
+#~ " "
+#~ msgstr ""
+#~ "El mòdul d'inventari i logÃstica d'OpenERP pot gestionar multi-magatzems i "
+#~ "multi-ubicacions jerà rquiques d'estoc.\n"
+#~ "Grà cies a la gestió de partida doble, el control d'inventari és potent i "
+#~ "flexible:\n"
+#~ "* Historial de moviments i planificació,\n"
+#~ "* Mètodes d'inventari diferents (FIFO, LIFO ...)\n"
+#~ "* Valoració d'existències (està ndard o preu mig ...)\n"
+#~ "* Robustesa davant les diferències d'inventari\n"
+#~ "* Regles automà tiques de proveïment (nivell d'estoc mÃnim, JIT ...)\n"
+#~ "* Suport a codi de barres\n"
+#~ "* Detecció rà pida d'errors a través de sistema de partida doble\n"
+#~ "* Traçabilitat (cap amunt/avall, lots de producció, número de sèrie ...)\n"
+#~ " "
+
+#~ msgid "Stock Management"
+#~ msgstr "Inventari i logÃstica"
+
+#~ msgid "Units"
+#~ msgstr "Unitats"
+
+#~ msgid "Total :"
+#~ msgstr "Total :"
+
+#~ msgid ""
+#~ "Scheduled date for the movement of the products or real date if the move is "
+#~ "done."
+#~ msgstr ""
+#~ "Data programada per al moviment de productes o data real si el moviment ha "
+#~ "estat realizat."
+>>>>>>> MERGE-SOURCE
=== modified file 'stock/i18n/de.po'
--- stock/i18n/de.po 2011-04-04 04:47:57 +0000
+++ stock/i18n/de.po 2011-04-11 14:26:52 +0000
@@ -8,14 +8,25 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-03 09:07+0000\n"
"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
+=======
+"PO-Revision-Date: 2011-01-18 09:21+0000\n"
+"Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
+"consulting.net>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: German <kde-i18n-doc@xxxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-04 04:46+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:39+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: stock
#: field:product.product,track_outgoing:0
@@ -886,12 +897,21 @@
msgstr "Journal"
#. module: stock
+<<<<<<< TREE
#: code:addons/stock/stock.py:1315
#, python-format
msgid "is scheduled %s."
msgstr "ist geplant %s."
#. module: stock
+=======
+#: code:addons/stock/stock.py:1315
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+
+#. module: stock
+>>>>>>> MERGE-SOURCE
#: help:stock.picking,location_id:0
msgid ""
"Keep empty if you produce at the location where the finished products are "
@@ -3526,8 +3546,13 @@
#. module: stock
#: code:addons/stock/wizard/stock_change_product_qty.py:88
#, python-format
+<<<<<<< TREE
msgid "INV: %s"
msgstr "INV: %s"
+=======
+msgid "INV: %s"
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: stock
#: model:ir.ui.menu,name:stock.next_id_61
@@ -4007,6 +4032,7 @@
"Spezifizierung von Attributen der Verpackung, wie Typ, max. Inhalt. etc."
#. module: stock
+<<<<<<< TREE
#: code:addons/stock/stock.py:2386
#, python-format
msgid "Product '%s' is consumed with '%s' quantity."
@@ -4017,6 +4043,18 @@
#, python-format
msgid "Inventory '%s' is done."
msgstr "Inventur '%s' is erledigt."
+=======
+#: code:addons/stock/stock.py:2386
+#, python-format
+msgid "Product '%s' is consumed with '%s' quantity."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2595
+#, python-format
+msgid "Inventory '%s' is done."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: stock
#: constraint:stock.move:0
=== modified file 'stock/i18n/el.po'
--- stock/i18n/el.po 2011-04-02 04:55:47 +0000
+++ stock/i18n/el.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-01 18:43+0000\n"
+=======
+"PO-Revision-Date: 2010-11-12 09:34+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: Dimitris Andavoglou <dimitrisand@xxxxxxxxx>\n"
"Language-Team: nls@xxxxxxxxx <nls@xxxxxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-02 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:39+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -860,6 +869,12 @@
msgstr ""
#. module: stock
+#: code:addons/stock/stock.py:1315
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+
+#. module: stock
#: help:stock.picking,location_id:0
msgid ""
"Keep empty if you produce at the location where the finished products are "
=== modified file 'stock/i18n/hu.po'
--- stock/i18n/hu.po 2011-04-07 04:37:58 +0000
+++ stock/i18n/hu.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,23 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-06 14:33+0000\n"
+=======
+"PO-Revision-Date: 2011-02-09 19:14+0000\n"
+>>>>>>> MERGE-SOURCE
"Last-Translator: NOVOTRADE RENDSZERHÃZ <openerp@xxxxxxxxxxxx>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-07 04:37+0000\n"
"X-Generator: Launchpad (build 12735)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:39+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: stock
#: field:product.product,track_outgoing:0
=== modified file 'stock/i18n/it.po'
--- stock/i18n/it.po 2011-03-31 04:36:40 +0000
+++ stock/i18n/it.po 2011-04-11 14:26:52 +0000
@@ -7,15 +7,25 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-30 15:03+0000\n"
"Last-Translator: Lorenzo Battistini - agilebg.com "
"<lorenzo.battistini@xxxxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-01-22 10:11+0000\n"
+"Last-Translator: Nicola Riolini - Micronaet <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-31 04:36+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:40+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: stock
#: field:product.product,track_outgoing:0
=== modified file 'stock/i18n/ro.po'
--- stock/i18n/ro.po 2011-03-25 04:40:36 +0000
+++ stock/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-24 20:19+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2011-03-17 08:11+0000\n"
+"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-03-18 04:40+0000\n"
+"X-Generator: Launchpad (build 12559)\n"
+>>>>>>> MERGE-SOURCE
#. module: stock
#: field:product.product,track_outgoing:0
@@ -862,6 +872,7 @@
#: view:stock.picking:0
#: report:stock.picking.list:0
msgid "Journal"
+<<<<<<< TREE
msgstr "Jurnal"
#. module: stock
@@ -869,6 +880,15 @@
#, python-format
msgid "is scheduled %s."
msgstr "este programat %s."
+=======
+msgstr "Jurnal"
+
+#. module: stock
+#: code:addons/stock/stock.py:1315
+#, python-format
+msgid "is scheduled %s."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: stock
#: help:stock.picking,location_id:0
@@ -3737,6 +3757,7 @@
msgstr ""
#. module: stock
+<<<<<<< TREE
#: code:addons/stock/stock.py:2386
#, python-format
msgid "Product '%s' is consumed with '%s' quantity."
@@ -3747,6 +3768,18 @@
#, python-format
msgid "Inventory '%s' is done."
msgstr "Inventarul '%s' este efectuat."
+=======
+#: code:addons/stock/stock.py:2386
+#, python-format
+msgid "Product '%s' is consumed with '%s' quantity."
+msgstr ""
+
+#. module: stock
+#: code:addons/stock/stock.py:2595
+#, python-format
+msgid "Inventory '%s' is done."
+msgstr ""
+>>>>>>> MERGE-SOURCE
#. module: stock
#: constraint:stock.move:0
=== modified file 'stock/stock.py'
--- stock/stock.py 2011-04-07 11:40:14 +0000
+++ stock/stock.py 2011-04-11 14:26:52 +0000
@@ -2141,6 +2141,7 @@
prodlot_id = partial_datas and partial_datas.get('move%s_prodlot_id' % (move.id), False)
if prodlot_id:
self.write(cr, uid, [move.id], {'prodlot_id': prodlot_id}, context=context)
+<<<<<<< TREE
if move.state not in ('confirmed','done', 'assigned'):
todo.append(move.id)
@@ -2148,6 +2149,15 @@
self.action_confirm(cr, uid, todo, context=context)
self.write(cr, uid, move_ids, {'state': 'done', 'date': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+=======
+ if move.state not in ('confirmed','done', 'assigned'):
+ todo.append(move.id)
+
+ if todo:
+ self.action_confirm(cr, uid, todo, context=context)
+
+ self.write(cr, uid, move_ids, {'state': 'done', 'date_planned': time.strftime('%Y-%m-%d %H:%M:%S')}, context=context)
+>>>>>>> MERGE-SOURCE
for id in move_ids:
wf_service.trg_trigger(uid, 'stock.move', id, cr)
=== modified file 'stock/stock_view.xml'
=== modified file 'stock/wizard/stock_move.py'
=== modified file 'stock/wizard/stock_return_picking.py'
--- stock/wizard/stock_return_picking.py 2011-03-18 09:16:07 +0000
+++ stock/wizard/stock_return_picking.py 2011-04-11 14:26:52 +0000
@@ -149,6 +149,7 @@
date_cur = time.strftime('%Y-%m-%d %H:%M:%S')
set_invoice_state_to_none = True
returned_lines = 0
+<<<<<<< TREE
# Create new picking for returned products
if pick.type=='out':
@@ -184,6 +185,43 @@
'location_id':new_location, 'location_dest_id':move.location_id.id,
'date':date_cur,})
move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
+=======
+
+# Create new picking for returned products
+ if pick.type=='out':
+ new_type = 'in'
+ elif pick.type=='in':
+ new_type = 'out'
+ else:
+ new_type = 'internal'
+ new_picking = pick_obj.copy(cr, uid, pick.id, {'name':'%s-return' % pick.name,
+ 'move_lines':[], 'state':'draft', 'type':new_type,
+ 'date':date_cur, 'invoice_state':data['invoice_state'],})
+
+ val_id = data['product_return_moves']
+ for v in val_id:
+ data_get = data_obj.read(cr, uid, v)
+ mov_id = data_get['move_id']
+ new_qty = data_get['quantity']
+ move = move_obj.browse(cr, uid, mov_id, context=context)
+ new_location=move.location_dest_id.id
+ returned_qty = move.product_qty
+ for rec in move.move_history_ids2:
+ returned_qty -= rec.product_qty
+
+ if returned_qty != new_qty:
+ set_invoice_state_to_none = False
+ if new_qty:
+ returned_lines += 1
+ new_move=move_obj.copy(cr, uid, move.id, {
+ 'product_qty': new_qty,
+ 'product_uos_qty': uom_obj._compute_qty(cr, uid, move.product_uom.id,
+ new_qty, move.product_uos.id),
+ 'picking_id':new_picking, 'state':'draft',
+ 'location_id':new_location, 'location_dest_id':move.location_id.id,
+ 'date':date_cur,})
+ move_obj.write(cr, uid, [move.id], {'move_history_ids2':[(4,new_move)]})
+>>>>>>> MERGE-SOURCE
if not returned_lines:
raise osv.except_osv(_('Warning !'), _("Please specify at least one non-zero quantity!"))
=== modified file 'stock_invoice_directly/i18n/ro.po'
--- stock_invoice_directly/i18n/ro.po 2011-03-25 04:40:36 +0000
+++ stock_invoice_directly/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-03 16:58+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-03-24 12:00+0000\n"
"Last-Translator: Dorin <dhongu@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2009-09-08 16:48+0000\n"
+"Last-Translator: filsys <office@xxxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-03-25 04:40+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-06 05:29+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+>>>>>>> MERGE-SOURCE
#. module: stock_invoice_directly
#: model:ir.model,name:stock_invoice_directly.model_stock_partial_picking
=== renamed file 'stock_invoice_directly/images/create_invoice.jpeg' => 'stock_invoice_directly/images/create_invoice.jpeg.OTHER'
Binary files stock_invoice_directly/images/create_invoice.jpeg 2011-03-23 08:12:25 +0000 and stock_invoice_directly/images/create_invoice.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'stock_location/__openerp__.py'
--- stock_location/__openerp__.py 2011-03-25 10:24:13 +0000
+++ stock_location/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -25,8 +25,13 @@
'version': '1.0',
'category': 'Warehouse',
'description': """
+<<<<<<< TREE
This module supplements the Warehouse application by effectively implementing Push and Pull inventory flows.
============================================================================================================
+=======
+This module supplements the Warehouse application by adding support for per-product location paths, effectively implementing Push and Pull inventory flows.
+===========================================================================================================================================================
+>>>>>>> MERGE-SOURCE
Typically this could be used to:
* Manage product manufacturing chains
=== modified file 'stock_location/i18n/el.po'
--- stock_location/i18n/el.po 2011-04-02 04:55:47 +0000
+++ stock_location/i18n/el.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-01 17:50+0000\n"
"Last-Translator: Dimitris Andavoglou <dimitrisand@xxxxxxxxx>\n"
+=======
+"PO-Revision-Date: 2009-06-15 07:23+0000\n"
+"Last-Translator: Panagiotis Kranidiotis <kranidiotis@xxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: nls@xxxxxxxxx <nls@xxxxxxxxx>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-02 04:55+0000\n"
"X-Generator: Launchpad (build 12559)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:46+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
"X-Poedit-Country: GREECE\n"
"X-Poedit-Language: Greek\n"
"X-Poedit-SourceCharset: utf-8\n"
@@ -496,6 +506,7 @@
#: selection:product.pulled.flow,invoice_state:0
#: selection:stock.location.path,invoice_state:0
msgid "Invoiced"
+<<<<<<< TREE
msgstr "ΤιμολογημÎνο"
#~ msgid "Invalid XML for View Architecture!"
@@ -515,3 +526,24 @@
#~ msgid "Procurement & Locations"
#~ msgstr "Î Ïομήθειες και Τοποθεσίες"
+=======
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "ΆκυÏο XML για ΑÏχιτεκτονική Όψης!"
+
+#~ msgid "Stock Location Paths"
+#~ msgstr "ΔιαδÏομÎÏ‚ Τοποθεσιών Αποθήκευσης"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Το όνομα του αντικειμÎνου Ï€ÏÎπει να ξεκινάει από x_ και να μην πεÏιÎχει "
+#~ "ειδικοÏÏ‚ χαÏακτήÏες!"
+
+#~ msgid "stock.location.path"
+#~ msgstr "stock.location.path"
+
+#~ msgid "Procurement & Locations"
+#~ msgstr "Î Ïομήθειες και Τοποθεσίες"
+>>>>>>> MERGE-SOURCE
=== modified file 'stock_location/i18n/ro.po'
--- stock_location/i18n/ro.po 2011-04-07 04:37:58 +0000
+++ stock_location/i18n/ro.po 2011-04-11 14:26:52 +0000
@@ -7,14 +7,24 @@
"Project-Id-Version: OpenERP Server 6.0dev\n"
"Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
"POT-Creation-Date: 2011-01-11 11:16+0000\n"
+<<<<<<< TREE
"PO-Revision-Date: 2011-04-06 08:02+0000\n"
"Last-Translator: Mihai Boiciuc <Unknown>\n"
+=======
+"PO-Revision-Date: 2010-08-03 01:06+0000\n"
+"Last-Translator: Mantavya Gajjar (Open ERP) <Unknown>\n"
+>>>>>>> MERGE-SOURCE
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
"X-Launchpad-Export-Date: 2011-04-07 04:37+0000\n"
"X-Generator: Launchpad (build 12735)\n"
+=======
+"X-Launchpad-Export-Date: 2011-01-15 05:46+0000\n"
+"X-Generator: Launchpad (build 12177)\n"
+>>>>>>> MERGE-SOURCE
#. module: stock_location
#: selection:product.pulled.flow,picking_type:0
@@ -497,6 +507,7 @@
#: selection:product.pulled.flow,invoice_state:0
#: selection:stock.location.path,invoice_state:0
msgid "Invoiced"
+<<<<<<< TREE
msgstr "Facturat"
#~ msgid "Invalid XML for View Architecture!"
@@ -516,3 +527,24 @@
#~ msgid "Procurement & Locations"
#~ msgstr "Aprovizionare & Locaţii"
+=======
+msgstr ""
+
+#~ msgid "Invalid XML for View Architecture!"
+#~ msgstr "XML invalid pentru arhitectura machetei de afișare !"
+
+#~ msgid "Stock Location Paths"
+#~ msgstr "Trasee locaţii de stocare"
+
+#~ msgid ""
+#~ "The Object name must start with x_ and not contain any special character !"
+#~ msgstr ""
+#~ "Numele obiectului trebuie să înceapă cu x_ şi să nu conţină nici un caracter "
+#~ "special !"
+
+#~ msgid "stock.location.path"
+#~ msgstr "stock.location.path"
+
+#~ msgid "Procurement & Locations"
+#~ msgstr "Aprovizionare & Locaţii"
+>>>>>>> MERGE-SOURCE
=== modified file 'stock_planning/__openerp__.py'
--- stock_planning/__openerp__.py 2011-03-25 10:24:13 +0000
+++ stock_planning/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -27,9 +27,15 @@
"images":["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"],
"depends":["hr","stock","sale"],
"description": """
+<<<<<<< TREE
Purpose of MPS is to allow create a manual procurement apart of MRP scheduler (which works automatically on minimum stock rules).
=================================================================================================================================
+=======
+Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules).
+===============================================================================================================================================
+
+>>>>>>> MERGE-SOURCE
This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule.
Terms used in the module:
- Stock and Sales Period - is the time (between Start Date and End Date) for which you plan Stock and Sales Forecast and make Procurement Planning.
@@ -109,15 +115,23 @@
How Stock Simulation field is calculated:
Generally Stock Simulation shows the stock for end of the calculated period according to some planned or confirmed stock moves. Calculation always starts with quantity of real stock of beginning of current period. Then calculation adds or subtracts quantities of calculated period or periods before calculated.
When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows:
+<<<<<<< TREE
Stock Simulation =
+=======
+Stock Simulation =
+>>>>>>> MERGE-SOURCE
Stock of beginning of current Period
- Planned Out
+ Planned In
When you calculate period next to current:
+<<<<<<< TREE
Stock Simulation =
+=======
+Stock Simulation =
+>>>>>>> MERGE-SOURCE
Stock of beginning of current Period
- Planned Out of current Period
+ Confirmed In of current Period (incl. Already In)
@@ -127,12 +141,20 @@
As you see calculated Period is taken the same way like in case above. But calculation of current Period are made a little bit different. First you should note that system takes for current Period only Confirmed In moves. It means that you have to make planning and procurement for current Period before this calculation (for Period next to current).
When you calculate Period ahead:
+<<<<<<< TREE
Stock Simulation =
Stock of beginning of current Period
- Sum of Planned Out of Periods before calculated
+ Sum of Confirmed In of Periods before calculated (incl. Already In)
- Planned Out of calculated Period
+=======
+Stock Simulation =
+ Stock of beginning of current Period
+ - Sum of Planned Out of Periods before calculated
+ + Sum of Confirmed In of Periods before calculated (incl. Already In)
+ - Planned Out of calculated Period
+>>>>>>> MERGE-SOURCE
+ Planned In of calculated Period.
Periods before calculated means periods starting from current till period before calculated.
=== renamed file 'stock_planning/images/master_procurement_schedule.jpeg' => 'stock_planning/images/master_procurement_schedule.jpeg.OTHER'
Binary files stock_planning/images/master_procurement_schedule.jpeg 2011-03-23 08:12:25 +0000 and stock_planning/images/master_procurement_schedule.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'stock_planning/images/sales_forecast.jpeg' => 'stock_planning/images/sales_forecast.jpeg.OTHER'
Binary files stock_planning/images/sales_forecast.jpeg 2011-03-23 08:12:25 +0000 and stock_planning/images/sales_forecast.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'stock_planning/images/stock_planning_line.jpeg' => 'stock_planning/images/stock_planning_line.jpeg.OTHER'
Binary files stock_planning/images/stock_planning_line.jpeg 2011-03-23 08:12:25 +0000 and stock_planning/images/stock_planning_line.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'stock_planning/images/stock_sales_period.jpeg' => 'stock_planning/images/stock_sales_period.jpeg.OTHER'
Binary files stock_planning/images/stock_sales_period.jpeg 2011-03-23 08:12:25 +0000 and stock_planning/images/stock_sales_period.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'subscription/__openerp__.py'
--- subscription/__openerp__.py 2011-03-22 13:21:41 +0000
+++ subscription/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -24,6 +24,7 @@
'name': 'Subscription and recurring operations',
'version': '1.0',
'category': 'Tools',
+<<<<<<< TREE
'description': """
Create recurring documents.
===========================
@@ -34,6 +35,12 @@
* Define a document type based on Invoice object
* Define a subscription whose source document is the document defined as above. Specify the interval information and partner to be invoice.
""",
+=======
+ 'description': """
+This module allows to create new documents and add subscription on that document.
+=================================================================================
+ """,
+>>>>>>> MERGE-SOURCE
'author': 'OpenERP SA',
'depends': ['base_tools'],
'init_xml': [],
=== renamed file 'subscription/images/subscriptions.jpeg' => 'subscription/images/subscriptions.jpeg.OTHER'
Binary files subscription/images/subscriptions.jpeg 2011-03-21 13:37:47 +0000 and subscription/images/subscriptions.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'survey/images/surveys.jpeg' => 'survey/images/surveys.jpeg.OTHER'
Binary files survey/images/surveys.jpeg 2011-03-21 13:37:47 +0000 and survey/images/surveys.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'survey/survey_demo.xml'
--- survey/survey_demo.xml 2011-03-30 06:14:47 +0000
+++ survey/survey_demo.xml 2011-04-11 14:26:52 +0000
@@ -3,7 +3,11 @@
<data noupdate="1">
<record id="base.user_demo" model="res.users">
+<<<<<<< TREE
<field eval="[(4, ref('base.group_tool_user')),(4, ref('base.group_survey_user'))]" name="groups_id"/>
+=======
+ <field eval="[(4, ref('base.group_tool_user')),(4, ref('group_survey_user'))]" name="groups_id"/>
+>>>>>>> MERGE-SOURCE
</record>
<record model="survey.type" id="survey_type1">
=== modified file 'survey/survey_view.xml'
=== renamed file 'thunderbird/images/config_thunderbird.jpeg' => 'thunderbird/images/config_thunderbird.jpeg.OTHER'
Binary files thunderbird/images/config_thunderbird.jpeg 2011-03-21 13:37:47 +0000 and thunderbird/images/config_thunderbird.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'warning/images/customers_warnings.jpeg' => 'warning/images/customers_warnings.jpeg.OTHER'
Binary files warning/images/customers_warnings.jpeg 2011-03-21 13:37:47 +0000 and warning/images/customers_warnings.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'warning/images/sale_order_warning.jpeg' => 'warning/images/sale_order_warning.jpeg.OTHER'
Binary files warning/images/sale_order_warning.jpeg 2011-03-21 13:37:47 +0000 and warning/images/sale_order_warning.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'web_livechat/__openerp__.py'
--- web_livechat/__openerp__.py 2011-03-25 10:24:13 +0000
+++ web_livechat/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -20,6 +20,7 @@
##############################################################################
{
'name': 'Live Chat Support',
+<<<<<<< TREE
'version': '1.1',
'category': 'Tools',
'description': """
@@ -29,6 +30,15 @@
Add "Support" button in header from where you can access OpenERP Support.
""",
'author': 'OpenERP SA',
+=======
+ 'version': '1.1',
+ 'category': 'Tools',
+ 'description': """
+Enable live chat support for those who have a maintenance contract.
+===================================================================
+ """,
+ 'author': 'OpenERP SA',
+>>>>>>> MERGE-SOURCE
'website': 'http://openerp.com',
'depends': ['base'],
'update_xml': [],
=== renamed file 'web_livechat/images/web_livechat_support.jpeg' => 'web_livechat/images/web_livechat_support.jpeg.OTHER'
Binary files web_livechat/images/web_livechat_support.jpeg 2011-03-21 13:37:47 +0000 and web_livechat/images/web_livechat_support.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'web_uservoice/__openerp__.py'
--- web_uservoice/__openerp__.py 2011-03-25 10:24:13 +0000
+++ web_uservoice/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -36,5 +36,9 @@
'active': False,
'web': True,
'certificate': '0040452504963885',
+<<<<<<< TREE
'images': ['images/submit_an_idea.jpeg','images/web_uservoice_feedback.jpeg'],
+=======
+ 'images': ['images/resource_leaves_calendar.jpeg','images/resource_leaves_form.jpeg'],
+>>>>>>> MERGE-SOURCE
}
=== renamed file 'web_uservoice/images/web_uservoice_feedback.jpeg' => 'web_uservoice/images/web_uservoice_feedback.jpeg.OTHER'
Binary files web_uservoice/images/web_uservoice_feedback.jpeg 2011-03-21 13:37:47 +0000 and web_uservoice/images/web_uservoice_feedback.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'wiki/images/page_history.jpeg' => 'wiki/images/page_history.jpeg.OTHER'
Binary files wiki/images/page_history.jpeg 2011-03-21 13:37:47 +0000 and wiki/images/page_history.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== renamed file 'wiki/images/wiki_pages.jpeg' => 'wiki/images/wiki_pages.jpeg.OTHER'
Binary files wiki/images/wiki_pages.jpeg 2011-03-21 13:37:47 +0000 and wiki/images/wiki_pages.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'wiki_faq/__openerp__.py'
--- wiki_faq/__openerp__.py 2011-03-25 10:24:13 +0000
+++ wiki_faq/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -22,6 +22,7 @@
{
'name': 'Document Management - Wiki - FAQ',
'version': '1.0',
+<<<<<<< TREE
'category': 'Tools',
'description': """
This module provides a Wiki FAQ Template.
@@ -29,6 +30,12 @@
It provides demo data, thereby creating a Wiki Group and a Wiki Page
for Wiki FAQ.
+=======
+ 'category': 'Tools',
+ 'description': """
+This module provides a Wiki FAQ Template.
+=========================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://openerp.com',
=== renamed file 'wiki_faq/images/wiki_pages_internal_faq.jpeg' => 'wiki_faq/images/wiki_pages_internal_faq.jpeg.OTHER'
Binary files wiki_faq/images/wiki_pages_internal_faq.jpeg 2011-03-21 13:37:47 +0000 and wiki_faq/images/wiki_pages_internal_faq.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'wiki_quality_manual/__openerp__.py'
--- wiki_quality_manual/__openerp__.py 2011-03-25 10:24:13 +0000
+++ wiki_quality_manual/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -22,6 +22,7 @@
{
'name': 'Document Management - Wiki - Quality Manual',
'version': '1.0',
+<<<<<<< TREE
'category': 'Tools',
'description': """
Quality Manual Template.
@@ -29,6 +30,12 @@
It provides demo data, thereby creating a Wiki Group and a Wiki Page
for Wiki Quality Manual.
+=======
+ 'category': 'Tools',
+ 'description': """
+Quality Manual Template.
+========================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://openerp.com',
=== renamed file 'wiki_quality_manual/images/wiki_pages_quality_manual.jpeg' => 'wiki_quality_manual/images/wiki_pages_quality_manual.jpeg.OTHER'
Binary files wiki_quality_manual/images/wiki_pages_quality_manual.jpeg 2011-03-21 13:37:47 +0000 and wiki_quality_manual/images/wiki_pages_quality_manual.jpeg.OTHER 2011-04-11 14:26:52 +0000 differ
=== modified file 'wiki_sale_faq/__openerp__.py'
--- wiki_sale_faq/__openerp__.py 2011-03-25 10:24:13 +0000
+++ wiki_sale_faq/__openerp__.py 2011-04-11 14:26:52 +0000
@@ -22,6 +22,7 @@
{
'name': 'Wiki - Sale-FAQ',
'version': '1.0',
+<<<<<<< TREE
'category': 'Tools',
'description': """
This module provides a Wiki Sales FAQ Template.
@@ -29,6 +30,12 @@
It provides demo data, thereby creating a Wiki Group and a Wiki Page
for Wiki Sale FAQ.
+=======
+ 'category': 'Tools',
+ 'description': """
+This module provides a Wiki Sales FAQ Template.
+===============================================
+>>>>>>> MERGE-SOURCE
""",
'author': 'OpenERP SA',
'website': 'http://openerp.com',
