[MERGE]:merged abo's changes
authorAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 3 Aug 2012 05:13:24 +0000 (10:43 +0530)
committerAmit Patel (OpenERP) <apa@tinyerp.com>
Fri, 3 Aug 2012 05:13:24 +0000 (10:43 +0530)
bzr revid: apa@tinyerp.com-20120803051324-qakzv0d3t2gbzhs2

37 files changed:
addons/account/res_config.py
addons/account/res_config_view.xml
addons/account_anglo_saxon/__openerp__.py
addons/account_check_writing/i18n/sv.po [new file with mode: 0644]
addons/account_voucher/__openerp__.py
addons/anonymization/i18n/sv.po [new file with mode: 0644]
addons/base_setup/res_config.py
addons/base_setup/res_config_view.xml
addons/base_setup/static/src/css/base_setup.css
addons/crm/res_config.py
addons/crm/res_config_view.xml
addons/document_ftp/ftpserver/ftpserver.py
addons/fetchmail/__init__.py
addons/fetchmail/__openerp__.py
addons/hr/res_config_view.xml
addons/hr_payroll/hr_payroll_view.xml
addons/hr_recruitment/res_config_view.xml
addons/import_base/i18n/pt_BR.po
addons/knowledge/res_config.py
addons/l10n_ch/__openerp__.py
addons/mail/static/src/js/mail.js
addons/marketing_campaign/marketing_campaign_demo.xml
addons/marketing_campaign_crm_demo/marketing_campaign_demo.xml
addons/mrp/res_config.py
addons/point_of_sale/security/point_of_sale_security.xml
addons/product/product_view.xml
addons/project/res_config.py
addons/purchase/res_config.py
addons/purchase/res_config_view.xml
addons/purchase_double_validation/purchase_double_validation_installer.py
addons/purchase_double_validation/purchase_double_validation_installer.xml
addons/sale/res_config.py
addons/sale/res_config_view.xml
addons/signup/res_config.py
addons/stock/res_config.py
addons/stock/wizard/stock_location_product.py
addons/stock/wizard/stock_location_product_view.xml

index 16f37f0..dfe1050 100644 (file)
@@ -37,82 +37,82 @@ class account_config_settings(osv.osv_memory):
         'company_id': fields.many2one('res.company', 'Company', required=True),
         'has_default_company': fields.boolean('Has default company', readonly=True),
         'expects_chart_of_accounts': fields.related('company_id', 'expects_chart_of_accounts', type='boolean',
-            string='This Company Has its Own Chart of Accounts',
+            string='This company has its own chart of accounts',
             help="""Check this box if this company is a legal entity."""),
         'currency_id': fields.related('company_id', 'currency_id', type='many2one', relation='res.currency', required=True,
-            string='Default Company Currency', help="Main currency of the company."),
+            string='Default company currency', help="Main currency of the company."),
         'paypal_account': fields.related('company_id', 'paypal_account', type='char', size=128,
-            string='Paypal Account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
+            string='Paypal account', help="Paypal account (email) for receiving online payments (credit card, etc.) If you set a paypal account, the customer  will be able to pay your invoices or quotations with a button \"Pay with  Paypal\" in automated emails or through the OpenERP portal."),
         'company_footer': fields.related('company_id', 'rml_footer2', type='char', size=250, readonly=True,
-            string='Bank Accounts on Reports', help="Bank accounts as printed in the footer of each customer  document. This is for information purpose only, you should configure  these bank accounts through the above button \"Configure Bank Accounts\"."),
+            string='Bank accounts on reports', help="Bank accounts as printed in the footer of each customer  document. This is for information purpose only, you should configure these bank accounts through the above button \"Configure Bank Accounts\"."),
 
         'has_chart_of_accounts': fields.boolean('Company has a chart of accounts'),
-        'chart_template_id': fields.many2one('account.chart.template', 'Chart Template', domain="[('visible','=', True)]"),
-        'code_digits': fields.integer('# of Digits', help="No. of Digits to use for account code"),
+        'chart_template_id': fields.many2one('account.chart.template', 'Template', domain="[('visible','=', True)]"),
+        'code_digits': fields.integer('# of Digits', help="No. of digits to use for account code"),
         'tax_calculation_rounding_method': fields.related('company_id',
             'tax_calculation_rounding_method', type='selection', selection=[
             ('round_per_line', 'Round per Line'),
             ('round_globally', 'Round Globally'),
-            ], string='Tax Calculation Rounding Method',
+            ], string='Tax calculation rounding method',
             help="If you select 'Round per Line' : for each tax, the tax amount will first be computed and rounded for each PO/SO/invoice line and then these rounded amounts will be summed, leading to the total amount for that tax. If you select 'Round Globally': for each tax, the tax amount will be computed for each PO/SO/invoice line, then these amounts will be summed and eventually this total tax amount will be rounded. If you sell with tax included, you should choose 'Round per line' because you certainly want the sum of your tax-included line subtotals to be equal to the total amount with taxes."),
-        'sale_tax': fields.many2one("account.tax.template", "Default Sale Tax"),
-        'purchase_tax': fields.many2one("account.tax.template", "Default Purchase Tax"),
-        'sale_tax_rate': fields.float('Sales Tax (%)'),
-        'purchase_tax_rate': fields.float('Purchase Tax (%)'),
-        'complete_tax_set': fields.boolean('Complete Set of Taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
+        'sale_tax': fields.many2one("account.tax.template", "Default sale tax"),
+        'purchase_tax': fields.many2one("account.tax.template", "Default purchase tax"),
+        'sale_tax_rate': fields.float('Sales tax (%)'),
+        'purchase_tax_rate': fields.float('Purchase tax (%)'),
+        'complete_tax_set': fields.boolean('Complete set of taxes', help='This boolean helps you to choose if you want to propose to the user to encode the sales and purchase rates or use the usual m2o fields. This last choice assumes that the set of tax defined for the chosen template is complete'),
 
         'has_fiscal_year': fields.boolean('Company has a fiscal year'),
-        'date_start': fields.date('Start Date', required=True),
-        'date_stop': fields.date('End Date', required=True),
+        'date_start': fields.date('Start date', required=True),
+        'date_stop': fields.date('End date', required=True),
         'period': fields.selection([('month', 'Monthly'), ('3months','3 Monthly')], 'Periods', required=True),
 
-        'sale_journal_id': fields.many2one('account.journal', 'Sale Journal'),
-        'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice Sequence'),
-        'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Invoice Number'),
-        'sale_refund_journal_id': fields.many2one('account.journal', 'Sale Refund Journal'),
-        'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit Note Sequence'),
-        'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Credit Note Number'),
+        'sale_journal_id': fields.many2one('account.journal', 'Sale journal'),
+        'sale_sequence_prefix': fields.related('sale_journal_id', 'sequence_id', 'prefix', type='char', string='Invoice sequence'),
+        'sale_sequence_next': fields.related('sale_journal_id', 'sequence_id', 'number_next', type='integer', string='Next invoice number'),
+        'sale_refund_journal_id': fields.many2one('account.journal', 'Sale refund journal'),
+        'sale_refund_sequence_prefix': fields.related('sale_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Credit note sequence'),
+        'sale_refund_sequence_next': fields.related('sale_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next credit note number'),
         'purchase_journal_id': fields.many2one('account.journal', 'Purchase Journal'),
-        'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Invoice Sequence'),
-        'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Invoice Number'),
-        'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase Refund Journal'),
-        'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier Credit Note Sequence'),
-        'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next Supplier Credit Note Number'),
+        'purchase_sequence_prefix': fields.related('purchase_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier invoice sequence'),
+        'purchase_sequence_next': fields.related('purchase_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier invoice number'),
+        'purchase_refund_journal_id': fields.many2one('account.journal', 'Purchase refund journal'),
+        'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
+        'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
 
-        'module_account_check_writing': fields.boolean('Check Writing',
+        'module_account_check_writing': fields.boolean('check writing',
             help="""This allows you to check writing and printing.
                 This installs the module account_check_writing."""),
-        'module_account_accountant': fields.boolean('Accountant Features',
+        'module_account_accountant': fields.boolean('accountant features',
             help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of  Accounts, ...)"""),
-        'module_account_asset': fields.boolean('Assets Management',
+        'module_account_asset': fields.boolean('assets management',
             help="""This allows you to manage the assets owned by a company or a person.
                 It keeps track of the depreciation occurred on those assets, and creates account move for those depreciation lines.
                 This installs the module account_asset. If you do not check this box, you will be able to do invoicing & payments,
                 but not accounting (Journal Items, Chart of Accounts, ...)"""),
-        'module_account_budget': fields.boolean('Budget Management',
+        'module_account_budget': fields.boolean('budget management',
             help="""This allows accountants to manage analytic and crossovered budgets.
                 Once the master budgets and the budgets are defined,
                 the project managers can set the planned amount on each analytic account.
                 This installs the module account_budget."""),
-        'module_account_payment': fields.boolean('Manage Payment Orders',
+        'module_account_payment': fields.boolean('manage payment orders',
             help="""This allows you to create and manage your payment orders, with purposes to
                     * serve as base for an easy plug-in of various automated payment mechanisms, and
                     * provide a more efficient way to manage invoice payments.
                 This installs the module account_payment."""),
-        'module_account_voucher': fields.boolean('Manage Customer Payments',
+        'module_account_voucher': fields.boolean('anage customer payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),
-        'module_account_followup': fields.boolean('Manage Customer Payment Follow-ups',
+        'module_account_followup': fields.boolean('manage customer payment follow-ups',
             help="""This allows to automate letters for unpaid invoices, with multi-level recalls.
                 This installs the module account_followup."""),
-        'group_proforma_invoices': fields.boolean('Allow Pro-forma Invoices',
+        'group_proforma_invoices': fields.boolean('allow pro-forma invoices',
             implied_group='account.group_proforma_invoices',
             help="Allows you to put invoices in pro-forma state."),
-        'default_sale_tax': fields.many2one('account.tax', 'Default Sale Tax',
+        'default_sale_tax': fields.many2one('account.tax', 'Default sale tax',
             help="This sale tax will be assigned by default on new products."),
-        'default_purchase_tax': fields.many2one('account.tax', 'Default Purchase Tax',
+        'default_purchase_tax': fields.many2one('account.tax', 'Default purchase tax',
             help="This purchase tax will be assigned by default on new products."),
-        'decimal_precision': fields.integer('Decimal Precision on Journal Entries',
+        'decimal_precision': fields.integer('Decimal precision on journal entries',
             help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
     }
 
index 3711e1e..d511ccc 100644 (file)
@@ -21,6 +21,7 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+
                     <field name="has_default_company" invisible="1" />
                     <field name="has_chart_of_accounts" invisible="1"/>
                     <field name="complete_tax_set" invisible="1"/>
                             </div>
                         </div>
                     </group>
+                    <separator string="Chart of Account and Fiscal Year"/>
                     <group attrs="{'invisible': ['|', ('expects_chart_of_accounts','=',False), ('has_chart_of_accounts','=',True)]}">
-                        <label for="id" string="Select Chart"/>
+                        <label for="id" string="Chart of Account"/>
                         <div>
                             <div>
+                                <label for="chart_template_id"/>
                                 <field name="chart_template_id"
                                     widget="selection"
                                     domain="[('visible','=', True)]"
                                     on_change="onchange_chart_template_id(chart_template_id)"
                                     class="oe_inline"/>
-                                <button string="Install More Chart Templates"
+                                <button string="Install more chart templates"
                                     icon="gtk-go-forward"
                                     name="%(open_account_charts_modules)d"
                                     type="action"
                             </div>
                         </div>
                     </group>
-                    <separator string="Accounting Configuration"/>
+                    <separator string="eInvoicing &amp; Payments"/>
                     <group>
-                        <label for="id" string="Configuration"/>
-                        <div name="account_config">
+                        <label for="id" string="Customer"/>
+                        <div>
                             <div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
                                 <label for="default_sale_tax"/>
                                 <field name="default_sale_tax"
                                     class="oe_inline"/>
                             </div>
                             <div>
-                                <field name="module_account_accountant" class="oe_inline"/>
-                                <label for="module_account_accountant"/>
-                            </div>
-                            <div>
-                                <label for="currency_id"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                            <div>
-                                <label for="decimal_precision"/>
-                                <field name="decimal_precision" class="oe_inline"/>
-                            </div>
-                            <div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
-                                <label for="default_purchase_tax"/>
-                                <field name="default_purchase_tax"
-                                    domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
-                                    class="oe_inline"/>
-                            </div>
-                            <div>
-                                <label for="tax_calculation_rounding_method"/>
-                                <field name="tax_calculation_rounding_method" class="oe_inline"/>
-                            </div>
-                            <div>
-                                <field name="module_account_asset" class="oe_inline"/>
-                                <label for="module_account_asset"/>
-                            </div>
-                            <div>
-                                <field name="module_account_budget" class="oe_inline"/>
-                                <label for="module_account_budget"/>
-                            </div>
-                        </div>
-                    </group>
-                    <separator string="Invoices"/>
-                    <group>
-                        <label for="id" string="Customer Settings"/>
-                        <div>
-                            <div>
                                 <label for="sale_sequence_next"/>
                                 <field name="sale_sequence_prefix"
                                     class="oe_inline"
                                     attrs="{'readonly': [('sale_refund_journal_id','=',False)]}"/>
                             </div>
                             <div>
+                                <field name="group_proforma_invoices" class="oe_inline"/>
+                                <label for="group_proforma_invoices"/>
+                            </div>
+                            <div>
                                 <field name="module_account_voucher" class="oe_inline"/>
                                 <label for="module_account_voucher"/>
                             </div>
                                 <field name="module_account_followup" class="oe_inline"/>
                                 <label for="module_account_followup"/>
                             </div>
-                            <div>
-                                <field name="group_proforma_invoices" class="oe_inline"/>
-                                <label for="group_proforma_invoices"/>
-                            </div>
                         </div>
-                        <label for="id" string="Supplier Settings"/>
+                    </group>
+                    <group>
+                        <label for="id" string="Supplier"/>
                         <div name="other_cofing">
+                            <div attrs="{'invisible': [('has_chart_of_accounts','=',False)]}">
+                                <label for="default_purchase_tax"/>
+                                <field name="default_purchase_tax"
+                                    domain="[('type_tax_use','=','purchase'), ('company_id','=',company_id)]"
+                                    class="oe_inline"/>
+                            </div>
                             <div>
                                 <label for="purchase_sequence_next"/>
                                 <field name="purchase_sequence_prefix"
                             </div>
                         </div>
                     </group>
-                    <separator string="Electronic Payments"/>
+                    <separator string="Bank &amp; Cash"/>
+                    <div style="color:grey">
+                        Bank accounts displays on reports: IBAN: XX12 3456 7890 1234 5678 - SWIFT: SWIFTCODE - VAT: Company vat number
+                    </div>
                     <group>
-                        <label for="id" string="Payment Settings"/>
+                        <label for="id" string="Configuration"/>
                         <div>
                             <div>
+                                <label string="Configure your bank accounts"/>
+                                <button name="%(action_bank_tree)d"
+                                    string="Configure"
+                                    icon="gtk-go-forward"
+                                    type="action"
+                                    class="oe_inline oe_link"/>
+                            </div>
+                            <div>
                                 <label for="paypal_account"/>
                                 <field name="paypal_account" placeholder="sales@openerp.com" class="oe_inline"/>
                             </div>
                         </div>
                     </group>
-                    <separator string="Bank &amp; Cash"/>
+                    <separator string="Accounting &amp; Finance"/>
                     <group>
-                        <label for="id" string="Configuration"/>
+                        <label for="id" string="Options"/>
+                        <div name="account_config">
+                            <div>
+                                <label for="currency_id"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
+                            <div>
+                                <label for="decimal_precision"/>
+                                <field name="decimal_precision" class="oe_inline"/>
+                            </div>
+                            <div>
+                                <label for="tax_calculation_rounding_method"/>
+                                <field name="tax_calculation_rounding_method" class="oe_inline"/>
+                            </div>
+                        </div>
+                        <label for="id" string="Features"/>
                         <div>
                             <div>
-                                <label string="Configure Bank Accounts"/>
-                                <button name="%(action_bank_tree)d"
-                                    string="Configure"
-                                    icon="gtk-go-forward"
-                                    type="action"
-                                    class="oe_inline oe_link"/>
+                                <field name="module_account_accountant" class="oe_inline"/>
+                                <label for="module_account_accountant"/>
                             </div>
                             <div>
-                                <label for="company_footer"/>
-                                <field name="company_footer" class="oe_inline"/>
+                                <field name="module_account_asset" class="oe_inline"/>
+                                <label for="module_account_asset"/>
                             </div>
                             <div>
-                                <field name="module_account_check_writing" class="oe_inline"/>
-                                <label for="module_account_check_writing"/>
+                                <field name="module_account_budget" class="oe_inline"/>
+                                <label for="module_account_budget"/>
                             </div>
                         </div>
                     </group>
                     <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
                     <group name="analytic_account" invisible="1">
-                        <label for="id" string="Settings"/>
-                        <div name="analytic_account"/>
+                        <label for="id" string="Sale"/>
+                        <div name="analytic_account_sale"></div>
+                        <label for="id" string="Purchase"/>
+                        <div name="analytic_account_purchase"></div>
                     </group>
+
                     <field name="sale_journal_id" invisible="1"/>
                     <field name="sale_refund_journal_id" invisible="1"/>
                     <field name="purchase_journal_id" invisible="1"/>
                     <field name="purchase_refund_journal_id" invisible="1"/>
+
+                    <!-- Move those fields to the right place or delete them (from xml AND py if they are not necessary) -->
+                    <separator string="No idea where these should go"/>
+                    <group>
+                        <field name="company_footer"/>
+                        <field name="module_account_check_writing"/>
+                    </group>
                 </form>
             </field>
         </record>
index 6d0d29e..5073d65 100644 (file)
@@ -22,7 +22,7 @@
     "name": "Anglo-Saxon Accounting",
     "version": "1.2",
     "author": "OpenERP SA, Veritos",
-    "website": "http://tinyerp.com - http://veritos.nl",
+    "website": "http://openerp.com - http://veritos.nl",
     "description": """
 This module supports the Anglo-Saxon accounting methodology by changing the accounting logic with stock transactions.
 =====================================================================================================================
diff --git a/addons/account_check_writing/i18n/sv.po b/addons/account_check_writing/i18n/sv.po
new file mode 100644 (file)
index 0000000..daff699
--- /dev/null
@@ -0,0 +1,199 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-01 23:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-02 04:46+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on Top"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,help:account_check_writing.action_write_check
+msgid ""
+"The check payment form allows you to track the payment you do to your "
+"suppliers specially by check. When you select a supplier, the payment method "
+"and an amount for the payment, OpenERP will propose to reconcile your "
+"payment with the open supplier invoices or bills.You can print the check"
+msgstr ""
+
+#. module: account_check_writing
+#: view:account.voucher:0
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_bottom
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_middle
+#: model:ir.actions.report.xml,name:account_check_writing.account_print_check_top
+msgid "Print Check"
+msgstr "Skriv ut check"
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check in middle"
+msgstr ""
+
+#. module: account_check_writing
+#: help:res.company,check_layout:0
+msgid ""
+"Check on top is compatible with Quicken, QuickBooks and Microsoft Money. "
+"Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on "
+"bottom is compatible with Peachtree, ACCPAC and DacEasy only"
+msgstr ""
+
+#. module: account_check_writing
+#: selection:res.company,check_layout:0
+msgid "Check on bottom"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:res.company:0
+msgid "Error! You can not create recursive companies."
+msgstr "Fel! Du kan inte skapa rekursiva företag."
+
+#. module: account_check_writing
+#: help:account.journal,allow_check_writing:0
+msgid "Check this if the journal is to be used for writing checks."
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.journal,allow_check_writing:0
+msgid "Allow Check writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Description"
+msgstr "Beskrivning"
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_journal
+msgid "Journal"
+msgstr "Journal"
+
+#. module: account_check_writing
+#: model:ir.actions.act_window,name:account_check_writing.action_write_check
+#: model:ir.ui.menu,name:account_check_writing.menu_action_write_check
+msgid "Write Checks"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Discount"
+msgstr "Rabatt"
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Original Amount"
+msgstr "Ursprungligt belopp"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Configuration"
+msgstr ""
+
+#. module: account_check_writing
+#: field:account.voucher,allow_check:0
+msgid "Allow Check Writing"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Payment"
+msgstr "Betalning"
+
+#. module: account_check_writing
+#: field:account.journal,use_preprint_check:0
+msgid "Use Preprinted Check"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:res.company:0
+msgid "The company name must be unique !"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Due Date"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_res_company
+msgid "Companies"
+msgstr "Företag"
+
+#. module: account_check_writing
+#: view:res.company:0
+msgid "Default Check Layout"
+msgstr ""
+
+#. module: account_check_writing
+#: constraint:account.journal:0
+msgid ""
+"Configuration error! The currency chosen should be shared by the default "
+"accounts too."
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+msgid "Balance Due"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.bottom:0
+#: report:account.print.check.middle:0
+#: report:account.print.check.top:0
+msgid "Check Amount"
+msgstr ""
+
+#. module: account_check_writing
+#: model:ir.model,name:account_check_writing.model_account_voucher
+msgid "Accounting Voucher"
+msgstr ""
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The name of the journal must be unique per company !"
+msgstr "Journalnamnet måste vara unikt per företag!"
+
+#. module: account_check_writing
+#: sql_constraint:account.journal:0
+msgid "The code of the journal must be unique per company !"
+msgstr "Journalkoden måste vara unik per företag!"
+
+#. module: account_check_writing
+#: field:account.voucher,amount_in_word:0
+msgid "Amount in Word"
+msgstr ""
+
+#. module: account_check_writing
+#: report:account.print.check.top:0
+msgid "Open Balance"
+msgstr ""
+
+#. module: account_check_writing
+#: field:res.company,check_layout:0
+msgid "Choose Check layout"
+msgstr ""
index 135c2bc..a7be61d 100644 (file)
@@ -35,7 +35,7 @@ eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation
     """,
     "category": 'Accounting & Finance',
     "sequence": 4,
-    "website" : "http://tinyerp.com",
+    "website" : "http://openerp.com",
     "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
     "depends" : ["account"],
     "init_xml" : [
diff --git a/addons/anonymization/i18n/sv.po b/addons/anonymization/i18n/sv.po
new file mode 100644 (file)
index 0000000..cf31537
--- /dev/null
@@ -0,0 +1,213 @@
+# Swedish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 00:35+0000\n"
+"PO-Revision-Date: 2012-08-02 00:12+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Swedish <sv@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-02 04:46+0000\n"
+"X-Generator: Launchpad (build 15719)\n"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymize_wizard
+msgid "ir.model.fields.anonymize.wizard"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_name:0
+msgid "Field Name"
+msgstr "Fältnamn"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,field_id:0
+msgid "Field"
+msgstr "Fält"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,state:0
+#: field:ir.model.fields.anonymize.wizard,state:0
+msgid "State"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_import:0
+msgid "Import"
+msgstr "Import"
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization
+msgid "ir.model.fields.anonymization"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,direction:0
+msgid "Direction"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_tree
+#: view:ir.model.fields.anonymization:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_fields
+msgid "Anonymized Fields"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization
+msgid "Database anonymization"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "clear -> anonymized"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Anonymized"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,state:0
+msgid "unknown"
+msgstr "okänd"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_id:0
+msgid "Object"
+msgstr "Object"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,filepath:0
+msgid "File path"
+msgstr "Sökväg"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization.history,date:0
+msgid "Date"
+msgstr "Datum"
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,file_export:0
+msgid "Export"
+msgstr "Export"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Reverse the Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Database Anonymization"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_wizard
+msgid "Anonymize database"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,field_ids:0
+msgid "Fields"
+msgstr "Fält"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Clear"
+msgstr "Rensa"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymize.wizard:0
+#: field:ir.model.fields.anonymize.wizard,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization:0
+msgid "Anonymized Field"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Unstable"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Exception occured"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization,state:0
+#: selection:ir.model.fields.anonymize.wizard,state:0
+msgid "Not Existing"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymization,model_name:0
+msgid "Object Name"
+msgstr "Objektnamn"
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymization_history_tree
+#: view:ir.model.fields.anonymization.history:0
+#: model:ir.ui.menu,name:anonymization.menu_administration_anonymization_history
+msgid "Anonymization History"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.model,name:anonymization.model_ir_model_fields_anonymization_history
+msgid "ir.model.fields.anonymization.history"
+msgstr ""
+
+#. module: anonymization
+#: model:ir.actions.act_window,name:anonymization.action_ir_model_fields_anonymize_wizard
+#: view:ir.model.fields.anonymize.wizard:0
+msgid "Anonymize Database"
+msgstr ""
+
+#. module: anonymization
+#: field:ir.model.fields.anonymize.wizard,name:0
+msgid "File Name"
+msgstr "Filnamn"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,direction:0
+msgid "anonymized -> clear"
+msgstr ""
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Started"
+msgstr "Påbörjad"
+
+#. module: anonymization
+#: selection:ir.model.fields.anonymization.history,state:0
+msgid "Done"
+msgstr "Färdig"
+
+#. module: anonymization
+#: view:ir.model.fields.anonymization.history:0
+#: field:ir.model.fields.anonymization.history,msg:0
+#: field:ir.model.fields.anonymize.wizard,msg:0
+msgid "Message"
+msgstr "Meddelande"
+
+#. module: anonymization
+#: code:addons/anonymization/anonymization.py:55
+#: sql_constraint:ir.model.fields.anonymization:0
+#, python-format
+msgid "You cannot have two fields with the same name on the same object!"
+msgstr ""
index f2466cb..7e85925 100644 (file)
@@ -30,7 +30,7 @@ class base_config_settings(osv.osv_memory):
                 This installs the module multi_company."""),
         'module_portal': fields.boolean('activate customer portal',
             help="""The portal will give access to a series of documents for your  customers; his quotations, his invoices, his projects, etc."""),
-        'module_share': fields.boolean('allow sharing documents to',
+        'module_share': fields.boolean('allow documents sharing',
             help="""As an example, you will be able to share a project or some tasks to  your customers, or quotes/sales to several persons at your customer  company, or your agenda availabilities to your contacts."""),
     }
 
@@ -54,14 +54,14 @@ class sale_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
     _columns = {
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('Thunderbird plugin.',
+        'module_plugin_thunderbird': fields.boolean('enable Thunderbird plugin',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and
                 attach the selected mail as a .eml file in
                 the attachment of a selected record. You can create documents for CRM Lead,
                 Partner from the selected emails.
                 This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('Outlook plugin',
+        'module_plugin_outlook': fields.boolean('enable Outlook plugin',
             help="""The Outlook plugin allows you to select an object that you would like to add
                 to your email and its attachments from MS Outlook. You can select a partner,
                 or a lead object and archive a selected
index 95b7406..b8f5abd 100644 (file)
@@ -87,7 +87,7 @@
                         <field name="module_crm" invisible="1"/>
                         <separator string="Emails Integration" attrs="{'invisible': [('module_crm','=',False)]}"/>
                         <div style="color:grey" attrs="{'invisible': [('module_crm','=',False)]}">
-                            The email integration allows you to autometically create leads or others documents from an incoming emails account.
+                            The email integration allows you to automatically create leads or others documents from an incoming emails account.
                             Users can do it from the mail client by pressing a button or it can be configured to automatically synchronize from your mail server.
                         </div>
                         <group name="On Mail Client" attrs="{'invisible': [('module_crm','=',False)]}">
index b15f226..4e4b8a3 100644 (file)
@@ -1,4 +1,24 @@
+/* Remove bold from labels in config wizards */
 .oe_form_configuration .oe_form_group td:last-child .oe_form_label_help,
 .oe_form_configuration .oe_form_group td:last-child .oe_form_label {
     font-weight: normal;
 }
+
+/* Separate .eo_link elements from the rest of the label's text */
+.oe_form_configuration .oe_form_group td:last-child .oe_link,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text {
+    position: relative;
+    left: 2em;
+}
+.oe_form_configuration .oe_form_group td:last-child .oe_link:before,
+.oe_form_configuration .oe_form_group td:last-child .oe_separate-from-text:before {
+    content:"—";
+    padding-right: 1em;
+    color: grey;
+
+    /* Prevent the pseudo element's content to behave like its parent element */
+    position: absolute;
+    right: 100%;
+    bottom: 0; /* Parent element's height can vary */
+    pointer-events: none;
+}
index dd58547..834a4dc 100644 (file)
@@ -26,10 +26,10 @@ class crm_configuration(osv.osv_memory):
     _inherit = ['sale.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_lead': fields.boolean("create leades from incoming mails",
+        'fetchmail_lead': fields.boolean("create leads from incoming mails",
             fetchmail_model='crm.lead', fetchmail_name='Incoming Leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
-        'module_crm_caldav': fields.boolean("Applications with Caldev protocol",
+        'module_crm_caldav': fields.boolean("applications with Caldav protocol",
             help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
                 This installs the module crm_caldav."""),
         'module_import_sugarcrm': fields.boolean("SugarCRM",
index c077d71..c4e8b75 100644 (file)
@@ -60,7 +60,7 @@
                 </div>
             </field>
         </record>
-        
+
         <menuitem id="base.menu_sale_config" name="Sales" parent="base.menu_config"
             sequence="1" action="base_setup.action_sale_config"/>
 
index bd72742..48ec4ad 100755 (executable)
@@ -5,7 +5,7 @@
 #  pyftpdlib is released under the MIT license, reproduced below:
 #  ======================================================================
 #  Copyright (C) 2007 Giampaolo Rodola' <g.rodola@gmail.com>
-#  Hacked by Fabien Pinckaers (C) 2008 <fp@tinyerp.com>
+#  Hacked by Fabien Pinckaers (C) 2008 <fp@openerp.com>
 #
 #                         All Rights Reserved
 #
index 7703c4d..7d66647 100644 (file)
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    mga@tinyerp.com
+#    mga@openerp.com
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
index 35b6929..1e8c57a 100644 (file)
@@ -3,7 +3,7 @@
 #
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
-#    mga@tinyerp.com
+#    mga@openerp.com
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as published by
index cf9e565..89df1db 100644 (file)
@@ -44,7 +44,7 @@
                                 <field name="module_hr_payroll" class="oe_inline"/>
                                 <label for="module_hr_payroll"/>
                                 <button name="%(open_payroll_modules)d" type="action"
-                                    string="install your country's payroll" icon="gtk-go-forward"
+                                    string="Install your country's payroll" icon="gtk-go-forward"
                                     attrs="{'invisible': [('module_hr_payroll','=',False)]}" class="oe_link"/>
                             </div>
                         </div>
index b08ce69..c4f42fd 100644 (file)
 
 
         <act_window name="All Children Rules"
-            domain="[('id', 'in', [active_id])]"
+            domain="[('parent_rule_id', '=', active_id)]"
             res_model="hr.salary.rule"
             src_model="hr.salary.rule"
-            view_id="hr_salary_rule_tree"
-            view_type="tree"
+            view_id="hr_salary_rule_list"
             id="act_children_salary_rules"/>
 
         <!-- payslip runs -->
index 1d9424e..aaee81f 100644 (file)
@@ -11,7 +11,7 @@
                     <div>
                         <field name="fetchmail_applicants" class="oe_inline"/>
                         <label for="fetchmail_applicants"/>
-                        <button name="configure_fetchmail_applicants" type="object" string="configure" icon="gtk-go-forward"
+                        <button name="configure_fetchmail_applicants" type="object" string="Configure" icon="gtk-go-forward"
                             attrs="{'invisible': [('fetchmail_applicants','=',False)]}" class="oe_link"/>
                     </div>
                     <div>
index 9587acd..f301b88 100644 (file)
@@ -14,7 +14,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n"
+"X-Launchpad-Export-Date: 2012-08-02 04:46+0000\n"
 "X-Generator: Launchpad (build 15719)\n"
 
 #. module: import_base
index d3355f1..39ead94 100644 (file)
@@ -26,17 +26,17 @@ class knowledge_config_settings(osv.osv_memory):
     _inherit = 'res.config.settings'
     _columns = {
         'module_wiki_faq': fields.boolean('manage internal FAQ as a wiki',
-            help="""This installs the module wiki_faq."""), 
+            help="""This installs the module wiki_faq."""),
         'module_wiki_quality_manual': fields.boolean('use quality manual as a wiki',
             help="""This installs the module wiki_quality_manual."""),
         'module_document': fields.boolean('manage documents',
             help="""This is a complete document management system, with: user authentication,
                 full document search (but pptx and docx are not supported), and a document dashboard.
                 This installs the module document."""),
-        'module_document_ftp': fields.boolean('share repositories(FTP)',
+        'module_document_ftp': fields.boolean('share repositories (FTP)',
             help="""Access your documents in OpenERP through an FTP interface.
                 This installs the module document_ftp."""),
-        'module_document_webdav': fields.boolean('share repositories(WebDAV)',
+        'module_document_webdav': fields.boolean('share repositories (WebDAV)',
             help="""Access your documents in OpenERP through WebDAV.
                 This installs the module document_webdav."""),
     }
index d3b7e79..6de20ac 100644 (file)
@@ -36,7 +36,7 @@ You can also add ZIP and bank completion with:
 
 ------------------------------------------------------------------------
 
-Module incluant la localisation Suisse de TinyERP revu et corrigé par Camptocamp.
+Module incluant la localisation Suisse de OpenERP revu et corrigé par Camptocamp.
 Cette nouvelle version comprend la gestion et l'émissionde BVR, le paiement
 électronique via DTA (pour les banques, le système postal est en développement)
 et l'import du relevé de compte depuis la banque de manière automatisée. De plus,
index 0f50cbb..b3dfc16 100644 (file)
@@ -373,7 +373,8 @@ openerp.mail = function(session) {
                 action_buttons: false,
                 pager: false,
                 initial_mode: 'edit',
-                });
+                disable_autofocus: true,
+            });
             // add the form, bind events, activate the form
             var msg_node = this.$element.find('div.oe_mail_msg_content');
             return $.when(this.form_view.appendTo(msg_node)).pipe(function() {
index aaf5a98..54897cd 100644 (file)
@@ -4,7 +4,7 @@
         <!-- Email tempalte -->
         <record id="email_template_1" model="email.template">
             <field name="name">Template for New Partner</field>
-            <field name="email_from">info@tinyerp.com</field>
+            <field name="email_from">info@openerp.com</field>
             <field name="subject">Welcome in OpenERP Partner Channel!</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
@@ -12,7 +12,7 @@
         </record>
         <record id="email_template_2" model="email.template">
             <field name="name">Template for Silver Partner</field>
-            <field name="email_from">info@tinyerp.com</field>
+            <field name="email_from">info@openerp.com</field>
             <field name="subject">Congratulation! You become now our Silver Partner.</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
@@ -21,7 +21,7 @@
 
         <record id="email_template_3" model="email.template">
             <field name="name">Template for Gold Partner</field>
-            <field name="email_from">info@tinyerp.com</field>
+            <field name="email_from">info@openerp.com</field>
             <field name="subject">Congratulation! You become our Gold Partner.</field>
             <field name="email_to">${object.email or ''}</field>
             <field name="model_id" ref="base.model_res_partner"/>
index 989d11e..0946ff6 100644 (file)
@@ -35,7 +35,7 @@
         <!-- Email tempalte -->
         <record id="email_template_1" model="email.template">
             <field name="subject">Thanks for showing interest in OpenERP</field>
-            <field name="email_to">info@tinyerp.com</field>
+            <field name="email_to">info@openerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
@@ -45,7 +45,7 @@
         </record>
         <record id="email_template_2" model="email.template">
             <field name="subject">Propose to subscribe to the OpenERP Discovery Day on May 2010</field>
-            <field name="email_to">info@tinyerp.com</field>
+            <field name="email_to">info@openerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
@@ -60,7 +60,7 @@
 
         <record id="email_template_3" model="email.template">
             <field name="subject">Thanks for subscribing to the OpenERP Discovery Day</field>
-            <field name="email_to">info@tinyerp.com</field>
+            <field name="email_to">info@openerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
@@ -74,7 +74,7 @@
 
         <record id="email_template_4" model="email.template">
             <field name="subject">Thanks for buying the OpenERP book</field>
-            <field name="email_to">info@tinyerp.com</field>
+            <field name="email_to">info@openerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
            <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
              <field name="model_id" ref="crm.model_crm_lead"/>
@@ -88,7 +88,7 @@
 
          <record id="email_template_5" model="email.template">
             <field name="subject">Propose a free technical training to Gold partners</field>
-            <field name="email_to">info@tinyerp.com</field>
+            <field name="email_to">info@openerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field eval="0" name="user_signature"/>
 
           <record id="email_template_6" model="email.template">
             <field name="subject">Propose paid training to Silver partners</field>
-            <field name="email_to">info@tinyerp.com</field>
+            <field name="email_to">info@openerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
 
         <record id="email_template_7" model="email.template">
             <field name="subject">Propose gold partnership to silver partners</field>
-            <field name="email_to">info@tinyerp.com</field>
+            <field name="email_to">info@openerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
 
         <record id="email_template_8" model="email.template">
             <field name="subject">Thanks for subscribing to technical training</field>
-            <field name="email_to">info@tinyerp.com</field>
+            <field name="email_to">info@openerp.com</field>
             <field model="ir.actions.act_window" name="ref_ir_act_window" search="[('name', '=', u'For OpenERP OnDemand Free Trial 2010 Mail Form')]"/>
             <field model="ir.values" name="ref_ir_value" search="[('name', '=', u'Send Mail (For OpenERP OnDemand Free Trial 2010)')]"/>
             <field name="model_id" ref="crm.model_crm_lead"/>
index c0ea2e8..555010c 100644 (file)
@@ -44,7 +44,7 @@ class mrp_config_settings(osv.osv_memory):
         'module_mrp_operations': fields.boolean("allow detailed planning of work order",
             help="""This allows to add state, date_start,date_stop in production order operation lines (in the "Work Centers" tab).
                 This installs the module mrp_operations."""),
-        'module_mrp_subproduct': fields.boolean("produce several prouducts from one manufacturing order",
+        'module_mrp_subproduct': fields.boolean("produce several products from one manufacturing order",
             help="""You can configure sub-products in the bill of material.
                 Without this module: A + B + C -> D.
                 With this module: A + B + C -> D + E.
@@ -59,7 +59,7 @@ class mrp_config_settings(osv.osv_memory):
                 For example to manage production made by your suppliers (sub-contracting).
                 To achieve this, set the assembled product which is sub-contracted to "No Auto-Picking"
                 and put the location of the supplier in the routing of the assembly operation.
-                This installs the module stock_no_autopicking."""),                
+                This installs the module stock_no_autopicking."""),
         'group_mrp_routings': fields.boolean("manage routings and work orders ",
             implied_group='mrp.group_mrp_routings',
             help="""Routings allow you to create and manage the manufacturing operations that should be followed
@@ -74,7 +74,7 @@ class mrp_config_settings(osv.osv_memory):
                     * Manufacturer Product Name
                     * Manufacturer Product Code
                     * Product Attributes.
-                This installs the module product_manufacturer."""),        
+                This installs the module product_manufacturer."""),
     }
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
index 7f2e91f..6e38321 100644 (file)
         <field name="users" eval="[(4, ref('base.user_root'))]"/>
     </record>
 
+    <record id="rule_pos_multi_company" model="ir.rule">
+        <field name="name">Point Of Sale Order</field>
+        <field name="model_id" ref="model_pos_order" />
+        <field name="global" eval="True" />
+        <field name="domain_force">[('company_id', '=', user.company_id.id)]</field>
+    </record>
 </data>
 </openerp>
index e182cb0..2aea995 100644 (file)
@@ -45,7 +45,6 @@
                     <field name="categ_id" invisible="1"/>
                     <field name="variants" groups="product.group_product_variant"/>
                     <field name="uom_id" string="Unit of Measure" groups="product.group_uom"/>
-                    <field name="type"/>
                     <field name="qty_available"/>
                     <field name="virtual_available"/>
                     <field name="lst_price"/>
index e5205fe..fcb3ecc 100644 (file)
@@ -41,13 +41,13 @@ class project_configuration(osv.osv_memory):
                 the timesheet line entries for particular date and user, with the effect of creating,
                 editing and deleting either ways.
                 This installs the module project_timesheet."""),
-        'module_project_long_term': fields.boolean("manage resources palnning on gantt view",
+        'module_project_long_term': fields.boolean("manage resources planning on gantt view",
             help="""A long term project management module that tracks planning, scheduling, and resource allocation.
                 This installs the module project_long_term."""),
-        'module_project_issue': fields.boolean("track issues and bug",
+        'module_project_issue': fields.boolean("track issues and bugs",
             help="""Provides management of issues/bugs in projects.
                 This installs the module project_issue."""),
-        'time_unit': fields.many2one('product.uom', 'working time unit', required=True,
+        'time_unit': fields.many2one('product.uom', 'Working time unit', required=True,
             help="""This will set the unit of measure used in projects and tasks."""),
         'module_project_issue_sheet': fields.boolean("invoice working time on issues",
             help="""Provides timesheet support for the issues/bugs management in project.
index 3cfdd82..668b887 100644 (file)
@@ -37,10 +37,10 @@ class purchase_config_settings(osv.osv_memory):
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
-        'group_uom':fields.boolean("manage different units of measures for products",
+        'group_uom':fields.boolean("manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicing",
+        'group_purchase_delivery_address': fields.boolean("allow a different address for incoming products and invoicings",
             implied_group='purchase.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a purchase order."),
         'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
@@ -82,7 +82,7 @@ class account_config_settings(osv.osv_memory):
     _columns = {
         'module_purchase_analytic_plans': fields.boolean('use multiple analytic accounts on orders',
             help="""This allows install module purchase_analytic_plans."""),
-        'group_analytic_account_for_purchases': fields.boolean('Analytic Accounting for Purchases',
+        'group_analytic_account_for_purchases': fields.boolean('analytic accounting for purchases',
             implied_group='purchase.group_analytic_accounting',
             help="Allows you to specify an analytic account on purchase orders."),
     }
index 607a6b2..4668853 100644 (file)
@@ -13,7 +13,7 @@
                     </header>
                     <separator string="Invoicing Process"/>
                     <group>
-                        <label for="id" string="Invoicing Settings"/>   
+                        <label for="id" string="Invoicing Settings"/>
                         <div>
                             <div>
                                 <label for="default_invoice_method"/>
                                  <label for="decimal_precision"/>
                                  <field name="decimal_precision" class="oe_inline"/>
                             </div>
-                        </div>            
+                        </div>
                     </group>
                     <separator string="Purchase Order"/>
                     <group>
-                        <label for="id" string="Supplier Features"/>   
+                        <label for="id" string="Supplier Features"/>
                         <div>
                             <div>
                                 <field name="group_purchase_pricelist" class="oe_inline"/>
                                 <label for="group_purchase_pricelist"/>
                             </div>
-                            <div>    
+                            <div>
                                 <field name="module_warning" class="oe_inline"/>
                                 <label for="module_warning"/>
                             </div>
                         </div>
                     </group>
                     <group>
-                        <label for="id" string="Purchase Order"/> 
-                        <div>            
+                        <label for="id" string="Purchase Order"/>
+                        <div>
                             <div>
                                 <field name="group_uom" class="oe_inline"/>
                                 <label for="group_uom"/>
-                            </div>                   
+                            </div>
                             <div>
                                 <field name="group_purchase_delivery_address" class="oe_inline"/>
                                 <label for="group_purchase_delivery_address"/>
-                            </div>    
+                            </div>
                             <div name="module_purchase_double_validation">
                                 <field name="module_purchase_double_validation" class="oe_inline"/>
                                 <label for="module_purchase_double_validation"/>
-                            </div>     
+                            </div>
                             <div>
                                 <field name="module_purchase_requisition" class="oe_inline"/>
                                 <label for="module_purchase_requisition"/>
@@ -62,7 +62,7 @@
                                 <field name="module_purchase_analytic_plans" class="oe_inline"/>
                                 <label for="module_purchase_analytic_plans"/>
                             </div>
-                        </div>    
+                        </div>
                     </group>
                 </form>
             </field>
@@ -92,7 +92,7 @@
                 <group name="analytic_account" position="attributes">
                     <attribute name="invisible">0</attribute>
                 </group>
-                <div name="analytic_account" position="inside">
+                <div name="analytic_account_purchase" position="inside">
                     <div>
                         <field name="group_analytic_account_for_purchases" class="oe_inline"/>
                         <label for="group_analytic_account_for_purchases"/>
index 0fb9290..1e2181f 100644 (file)
@@ -24,7 +24,7 @@ from osv import fields, osv
 class purchase_config_settings(osv.osv_memory):
     _inherit = 'purchase.config.settings'
     _columns = {
-        'limit_amount': fields.integer('Limit to require a second approval',required=True,
+        'limit_amount': fields.integer('limit to require a second approval',required=True,
             help="Amount after which validation of purchase is required."),
     }
 
index 7a8260b..efba6bf 100644 (file)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <openerp>
     <data>
 
@@ -8,12 +9,13 @@
             <field name="inherit_id" ref="purchase.view_purchase_configuration"/>
             <field name="arch" type="xml">
                 <div name="module_purchase_double_validation" position="inside">
-                     <label string="("/>
-                     <label for="limit_amount" />
-                     <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
-                     <label string=")"/>
+                    <span attrs="{'invisible': [('module_purchase_double_validation','=',False)]}" class="oe_separate-from-text">
+                        <label for="limit_amount"/>
+                        <field name="limit_amount" attrs="{'required': [('module_purchase_double_validation','=',True)]}" class="oe_inline"/>
+                    </span>
                 </div>
             </field>
         </record>
+
     </data>
 </openerp>
index 3e05714..7d9b8d7 100644 (file)
@@ -38,11 +38,11 @@ class sale_configuration(osv.osv_memory):
                 the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways
                 and to automatically creates project tasks from procurement lines.
                 This installs the modules project_timesheet and project_mrp."""),
-        'timesheet': fields.boolean('prapare invoices based on timesheets',
+        'timesheet': fields.boolean('prepare invoices based on timesheets',
             help = """For modifying account analytic view to show important data to project manager of services companies.
                 You can also view the report of account analytic summary user-wise as well as month wise.
                 This installs the module account_analytic_analysis."""),
-        'module_account_analytic_analysis': fields.boolean('Use Contract Management',
+        'module_account_analytic_analysis': fields.boolean('use contracts management',
             help = """Allows to define your customer contracts conditions: invoicing
             method (fixed price, on timesheet, advance invoice), the exact pricing
             (650€/day for a developer), the duration (one year support contract).
@@ -59,14 +59,14 @@ class sale_configuration(osv.osv_memory):
         'time_unit': fields.many2one('product.uom', 'The default working time unit for services is'),
         'default_picking_policy' : fields.boolean("configure per order if deliver in one pack or each product when available",
             help = "You will be able to configure, per sale order, if you deliver all  products at once or if you deliver each product when it is available.  This may have an impact on the shipping price."),
-        'group_sale_pricelist':fields.boolean("use pricelists to adopt your price per customers",
+        'group_sale_pricelist':fields.boolean("use pricelists to adapt your price per customers",
             implied_group='product.group_sale_pricelist',
             help="""Allows to manage different prices based on rules per category of customers.
                 Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
         'group_uom':fields.boolean("allow using different units of measures",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_sale_delivery_address': fields.boolean("allow a different address for delivary and invoicing ",
+        'group_sale_delivery_address': fields.boolean("allow a different address for delivery and invoicing ",
             implied_group='sale.group_delivery_invoice_address',
             help="Allows you to specify different delivery and invoice addresses on a sale order."),
         'group_mrp_properties': fields.boolean('properties on lines',
@@ -82,7 +82,7 @@ class sale_configuration(osv.osv_memory):
             help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer.
             Example: Product: this product is deprecated, do not purchase more than 5.
             Supplier: don't forget to ask for an express delivery."""),
-        'module_sale_margin': fields.boolean("display margins on sale order",
+        'module_sale_margin': fields.boolean("display margins on sales orders",
             help="""This adds the 'Margin' on sales order.
                 This gives the profitability by calculating the difference between the Unit Price and Cost Price.
                 This installs the module sale_margin."""),
@@ -90,7 +90,7 @@ class sale_configuration(osv.osv_memory):
             help="""Allows you to categorize your sales and deliveries (picking lists) between different journals,
                 and perform batch operations on journals.
                 This installs the module sale_journal."""),
-        'module_analytic_user_function': fields.boolean("Assign User Roles per Contract",
+        'module_analytic_user_function': fields.boolean("assign user roles per contract",
             help="""Allows you to define what is the default function of a specific user on a given account.
                 This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
                 But the possibility to change these values is still available.
@@ -98,7 +98,7 @@ class sale_configuration(osv.osv_memory):
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
         'module_project': fields.boolean("Project"),
-        'decimal_precision': fields.integer("What's the decimal precision on prices:",help="As an example, a decimal precision of 2 will allow prices  like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like:  0.0231 EUR per unit."),
+        'decimal_precision': fields.integer("Decimal precision on prices:",help="As an example, a decimal precision of 2 will allow prices  like: 9.99 EUR, whereas a decimal precision of 4 will allow prices like:  0.0231 EUR per unit."),
     }
     def _check_decimal(self, cr, uid, ids, context=None):
         for decimal in self.browse(cr, uid, ids, context=context):
@@ -190,9 +190,9 @@ class sale_configuration(osv.osv_memory):
 class account_config_settings(osv.osv_memory):
     _inherit = 'account.config.settings'
     _columns = {
-        'module_sale_analytic_plans': fields.boolean('Several Analytic Accounts on Sales',
+        'module_sale_analytic_plans': fields.boolean('several analytic accounts on sales',
             help="""This allows install module sale_analytic_plans."""),
-        'group_analytic_account_for_sales': fields.boolean('Analytic Accounting for Sales',
+        'group_analytic_account_for_sales': fields.boolean('analytic accounting for sales',
             implied_group='sale.group_analytic_accounting',
             help="Allows you to specify an analytic account on sale orders."),
     }
index 9389a54..e33c6de 100644 (file)
@@ -29,8 +29,8 @@
                                 <field name="timesheet" class="oe_inline" on_change="onchange_timesheet(timesheet)"/>
                                 <label for="timesheet"/>
                             </div>
-                        </div>    
-                    </group> 
+                        </div>
+                    </group>
                     <group>
                         <label for="id" string="Default Options" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False),('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False),('task_work','=',False), ('module_account_analytic_analysis','=',False)]}"/>
                         <div>
                 <group name="analytic_account" position="attributes">
                     <attribute name="invisible">0</attribute>
                 </group>
-                <div name="analytic_account" position="inside">
+                <div name="analytic_account_sale" position="inside">
                     <div>
                         <field name="group_analytic_account_for_sales" class="oe_inline"/>
                         <label for="group_analytic_account_for_sales"/>
index 4679db3..3dfc7fa 100644 (file)
@@ -4,7 +4,7 @@ class base_config_settings(osv.TransientModel):
     _inherit = 'base.config.settings'
 
     _columns = {
-        'signup_template_user_id': fields.many2one('res.users', 'template user for signup')
+        'signup_template_user_id': fields.many2one('res.users', 'Template user for new users created through signup')
     }
 
     def get_default_signup(self, cr, uid, fields, context=None):
index b6d6ab1..ab45c6b 100644 (file)
@@ -29,7 +29,7 @@ class stock_config_settings(osv.osv_memory):
         'module_claim_from_delivery': fields.boolean("allow claim on deliveries",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
-        'module_stock_invoice_directly': fields.boolean("generate directly invoice from the picking",
+        'module_stock_invoice_directly': fields.boolean("generate invoice directly from the picking",
             help="""This allows to automatically launch the invoicing wizard if the delivery is
                 to be invoiced when you send or deliver goods.
                 This installs the module stock_invoice_directly."""),
@@ -49,7 +49,7 @@ class stock_config_settings(osv.osv_memory):
         'group_uom': fields.boolean("manage units of measure on products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
-        'group_uos': fields.boolean("invoice products in a different units of measure then the",
+        'group_uos': fields.boolean("invoice products in a different unit of measure than the sale order",
             implied_group='product.group_uos',
             help="""Allows you to sell units of a product, but invoice based on a different unit of measure.
                 For instance, you can sell pieces of meat that you invoice based on their weight."""),
@@ -60,7 +60,7 @@ class stock_config_settings(osv.osv_memory):
             implied_group='stock.group_production_lot',
             help="""This allows you to manage products by using serial numbers.
                 When you select a lot, you can get the upstream or downstream traceability of the products contained in lot."""),
-        'group_stock_tracking_lot': fields.boolean("track serial number on logistic units(pallets)",
+        'group_stock_tracking_lot': fields.boolean("track serial number on logistic units (pallets)",
             implied_group='stock.group_tracking_lot',
             help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
         'group_stock_inventory_valuation': fields.boolean("generate accounting entries per stock movement",
@@ -72,8 +72,8 @@ class stock_config_settings(osv.osv_memory):
                 instead of having a single default one."""),
         'group_product_variant': fields.boolean("support multiple variants per products  ",
             implied_group='product.group_product_variant',
-            help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),                
-        'decimal_precision': fields.integer('decimal precision on weight', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
+            help="""Allow to manage several variants per product. As an example, if you  sell T-Shirts, for the same "Linux T-Shirt", you may have variants on  sizes or colors; S, M, L, XL, XXL."""),
+        'decimal_precision': fields.integer('Decimal precision on weight', help="As an example, a decimal precision of 2 will allow weights like: 9.99 kg, whereas a decimal precision of 4 will allow weights like:  0.0231 kg."),
     }
 
     def get_default_dp(self, cr, uid, fields, context=None):
index 49dc048..4832788 100644 (file)
 ##############################################################################
 
 from osv import fields, osv
+from tools.translate import _
 
 class stock_location_product(osv.osv_memory):
     _name = "stock.location.product"
     _description = "Products by Location"
     _columns = {
         'from_date': fields.datetime('From'), 
-        'to_date': fields.datetime('To'), 
+        'to_date': fields.datetime('To'),
+        'type': fields.selection([('inventory','Analyse Current Inventory'),
+            ('period','Analyse a Period')], 'Analyse Type', required=True), 
     }
 
     def action_open_window(self, cr, uid, ids, context=None):
@@ -43,7 +46,7 @@ class stock_location_product(osv.osv_memory):
         location_products = self.read(cr, uid, ids, ['from_date', 'to_date'], context=context)
         if location_products:
             return {
-                'name': False,
+                'name': _('Current Inventory'),
                 'view_type': 'form',
                 'view_mode': 'tree,form',
                 'res_model': 'product.product',
index f0a5293..756c378 100644 (file)
@@ -7,14 +7,15 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                <form string="View Stock of Products" version="7.0">
-                    <separator string="Stock Location Analysis"/>
                     <group>
+                        <field name="type"/>
+                    </group>
+                    <group attrs="{'invisible':[('type', '!=', 'period')], 'required':[('type', '=', 'period')]}">
                         <field name="from_date"/>
                         <field name="to_date"/>
                     </group>
-                    <label string="(Keep empty to open the current situation. Adjust HH:MM:SS to 00:00:00 to filter all resources of the day for the 'From' date and 23:59:59 for the 'To' date)"/>
                     <footer>
-                        <button name="action_open_window" string="Open Product" type="object" class="oe_highlight"/>
+                        <button name="action_open_window" string="View Products Inventory" type="object" class="oe_highlight"/>
                         or
                         <button string="Cancel" class="oe_link" special="cancel" />
                     </footer>