diff --git a/addons/account/account_cash_statement.py b/addons/account/account_cash_statement.py index 927ce94db31..ae225cc60de 100644 --- a/addons/account/account_cash_statement.py +++ b/addons/account/account_cash_statement.py @@ -32,7 +32,7 @@ class account_cashbox_line(osv.osv): _name = 'account.cashbox.line' _description = 'CashBox Line' - _rec_name = 'number' + _rec_name = 'pieces' def _sub_total(self, cr, uid, ids, name, arg, context=None): @@ -325,7 +325,7 @@ account_journal() class account_journal_cashbox_line(osv.osv): _name = 'account.journal.cashbox.line' - _rec_name = 'value' + _rec_name = 'pieces' _columns = { 'pieces': fields.float('Values', digits_compute=dp.get_precision('Account')), 'journal_id' : fields.many2one('account.journal', 'Journal', required=True, select=1), diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 393c468c952..f1a8c82b382 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -442,32 +442,22 @@ search - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index d342dc5d3b9..26e66c66281 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -63,15 +63,10 @@ search - - - - - - - - - + + + + @@ -146,11 +141,8 @@ search - - - - - + + @@ -217,18 +209,12 @@ search - - - - - - - - - + + + + - @@ -440,21 +426,15 @@ search - - - - - - - - + + @@ -542,22 +522,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -587,22 +560,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -833,7 +799,7 @@ - + @@ -916,10 +882,8 @@ search - - - - + + @@ -1195,38 +1159,26 @@ search - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - @@ -1444,27 +1396,19 @@ search - - - - - - - - - - - - - - - + + + + + + + + + - - @@ -1673,16 +1617,11 @@ search - - - - - - - - - - + + + + + @@ -1852,17 +1791,11 @@ search - - - - - - - - - - - + + + + + @@ -2119,17 +2052,12 @@ search - - - - - - - - - - - + + + + + + @@ -2188,20 +2116,14 @@ search - - - - - - - + + + - - @@ -2310,14 +2232,10 @@ search - - - - - - - - + + + + @@ -2353,11 +2271,8 @@ search - - - - - + + @@ -2789,16 +2704,11 @@ action = pool.get('res.config').next(cr, uid, [], context) search - - - - - - - + + + - diff --git a/addons/account/i18n/es_EC.po b/addons/account/i18n/es_EC.po index 5b6bbffea1f..14beb1f5d65 100644 --- a/addons/account/i18n/es_EC.po +++ b/addons/account/i18n/es_EC.po @@ -16,8 +16,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n" -"X-Generator: Launchpad (build 15702)\n" +"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. module: account #: view:account.invoice.report:0 diff --git a/addons/account/project/project_view.xml b/addons/account/project/project_view.xml index 76aaaf7df6a..de1a087d9c5 100644 --- a/addons/account/project/project_view.xml +++ b/addons/account/project/project_view.xml @@ -30,22 +30,15 @@ search - - - - - - - - - - - - + + + + + + - @@ -183,27 +176,20 @@ search - - - - - - - - - - - - - - + + + + + + + + + - - @@ -304,11 +290,8 @@ search - - - - - + + diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 7c9870ca07e..35031180523 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -34,31 +34,21 @@ search - - - - - - - - - - - - + + + + + + - - - - diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index 54275f6a4b3..8c445052094 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -67,54 +67,35 @@ search - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - + - - - - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 7d6a4003b53..e3e0b210f20 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -55,68 +55,32 @@ search - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - diff --git a/addons/account/report/account_treasury_report_view.xml b/addons/account/report/account_treasury_report_view.xml index 9e07c196f3c..f0096b561bb 100644 --- a/addons/account/report/account_treasury_report_view.xml +++ b/addons/account/report/account_treasury_report_view.xml @@ -36,12 +36,9 @@ search - - - - - - + + + diff --git a/addons/account_accountant/__openerp__.py b/addons/account_accountant/__openerp__.py index ff4e3faa3b6..7c97112b875 100644 --- a/addons/account_accountant/__openerp__.py +++ b/addons/account_accountant/__openerp__.py @@ -24,7 +24,7 @@ "author" : "OpenERP SA", "category": 'Accounting & Finance', "sequence": 10, - "summary": "Accounts Moves, Journals, Chart of Accounts", + "summary": "Financial and Analytic Accounting", "description": """ Accounting Access Rights. ========================= diff --git a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml index 8f86e9eeedc..bca6b2ab260 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_menu.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_menu.xml @@ -19,32 +19,24 @@ search - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml index beb4dcbd34e..3e2ba0fe5f3 100644 --- a/addons/account_analytic_default/account_analytic_default_view.xml +++ b/addons/account_analytic_default/account_analytic_default_view.xml @@ -46,23 +46,17 @@ search - - - - - - - - - - + + + + + + - - diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py index 6d0d29e468b..5073d6522e3 100644 --- a/addons/account_anglo_saxon/__openerp__.py +++ b/addons/account_anglo_saxon/__openerp__.py @@ -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_asset/account_asset_invoice_view.xml b/addons/account_asset/account_asset_invoice_view.xml index fe1435d4745..40ee51e10b8 100644 --- a/addons/account_asset/account_asset_invoice_view.xml +++ b/addons/account_asset/account_asset_invoice_view.xml @@ -1,22 +1,19 @@ - + - #--------------------------------------------------------- - # Fiscal Year - #--------------------------------------------------------- - - - account.invoice.line.form - account.invoice.line - - form - - - + + + account.invoice.line.form + account.invoice.line + + form + + + + - - + - + diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml index dec5f3714d6..cdc772ad65d 100644 --- a/addons/account_asset/account_asset_view.xml +++ b/addons/account_asset/account_asset_view.xml @@ -65,7 +65,6 @@ - @@ -231,17 +230,12 @@ search - - - - - - - - - - - + + + + + + diff --git a/addons/account_asset/i18n/es_EC.po b/addons/account_asset/i18n/es_EC.po index b9e3fc013a5..9ce2a26fcec 100644 --- a/addons/account_asset/i18n/es_EC.po +++ b/addons/account_asset/i18n/es_EC.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-30 04:55+0000\n" -"X-Generator: Launchpad (build 15702)\n" +"X-Launchpad-Export-Date: 2012-08-01 04:44+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. module: account_asset #: view:account.asset.asset:0 diff --git a/addons/account_asset/report/account_asset_report_view.xml b/addons/account_asset/report/account_asset_report_view.xml index 6cb138b072a..a6652890ec5 100644 --- a/addons/account_asset/report/account_asset_report_view.xml +++ b/addons/account_asset/report/account_asset_report_view.xml @@ -43,34 +43,24 @@ search - - - - - - - - - - - - - + + + + + + + + - + - - - - diff --git a/addons/account_bank_statement_extensions/account_bank_statement_view.xml b/addons/account_bank_statement_extensions/account_bank_statement_view.xml index a3185db2c92..c77fb896840 100644 --- a/addons/account_bank_statement_extensions/account_bank_statement_view.xml +++ b/addons/account_bank_statement_extensions/account_bank_statement_view.xml @@ -123,22 +123,16 @@ search - - - - - - - - - - - - - - - - + + + + + + + + + + @@ -146,7 +140,6 @@ - diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml index db83df9c07f..c2fba2c6917 100644 --- a/addons/account_budget/account_budget_view.xml +++ b/addons/account_budget/account_budget_view.xml @@ -19,7 +19,7 @@ - + @@ -201,17 +201,12 @@ search - - - - - - - - - - - + + + + + + diff --git a/addons/account_check_writing/i18n/sv.po b/addons/account_check_writing/i18n/sv.po new file mode 100644 index 00000000000..f15ca09baa9 --- /dev/null +++ b/addons/account_check_writing/i18n/sv.po @@ -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 , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \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 \n" +"Language-Team: Swedish \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-03 05:48+0000\n" +"X-Generator: Launchpad (build 15734)\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 "" diff --git a/addons/account_coda/account_coda_view.xml b/addons/account_coda/account_coda_view.xml index bb2e833ce25..07f397c663f 100644 --- a/addons/account_coda/account_coda_view.xml +++ b/addons/account_coda/account_coda_view.xml @@ -12,18 +12,13 @@ search - - + - - - - + + @@ -271,20 +266,15 @@ search - - - - - - - - - - - - + + + + + + + @@ -389,20 +379,13 @@ search - - - - - - - - - - - - - + + + + + + + @@ -481,20 +464,12 @@ search - - - - - - - - - - - - + + + + + + diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index 9c11815e05b..3f6591953de 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -71,11 +71,8 @@ search - - - - - + + diff --git a/addons/account_followup/report/account_followup_report.xml b/addons/account_followup/report/account_followup_report.xml index 2bdf8eb74bf..854bba0652e 100644 --- a/addons/account_followup/report/account_followup_report.xml +++ b/addons/account_followup/report/account_followup_report.xml @@ -40,31 +40,20 @@ search - - - - - - - - - - - - + + + + + + + - - - diff --git a/addons/account_followup/wizard/account_followup_print_view.xml b/addons/account_followup/wizard/account_followup_print_view.xml index c897b283ab0..2949177205f 100644 --- a/addons/account_followup/wizard/account_followup_print_view.xml +++ b/addons/account_followup/wizard/account_followup_print_view.xml @@ -42,9 +42,7 @@ - - diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml index 1577d1b86bd..3d0f9c0a78c 100644 --- a/addons/account_payment/account_payment_view.xml +++ b/addons/account_payment/account_payment_view.xml @@ -47,12 +47,9 @@ search - - - - - + + + @@ -216,20 +213,13 @@ search - - - - - - - - - - - - - + + + + + + + diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index 0b37bdbd4a2..a7be61db2c9 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -23,7 +23,7 @@ "name" : "eInvoicing & Payments", "version" : "1.0", "author" : 'OpenERP SA', - "summary": 'Supplier & Customer Invoices, Payments', + "summary": 'Send Invoices and Track Payments', "description": """ eInvoicing & Payments module manage all Voucher Entries such as "Reconciliation Entries", "Adjustment Entries", "Closing or Opening Entries" for Sales, Purchase, Bank, Cash, Expense, Contra. ============================================================================================================================================================================================== @@ -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/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index d1912a58d1c..b212c07acb3 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -126,21 +126,15 @@ 1 - - - - - - - - - - - - - - - + + + + + + + + + diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml index 704135ba421..527c959c2ad 100644 --- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml +++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml @@ -48,48 +48,26 @@ search - - - - - - - - - - - + + + + + + - + - - + - - - - - - diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index 372d8aa1937..2c19cb621c4 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -8,21 +8,13 @@ search - - - - - - - - - - - - - - - + + + + + + + @@ -40,21 +32,13 @@ search - - - - - - - - - - - - - - - + + + + + + + @@ -72,7 +56,7 @@
- + + domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"/> @@ -108,8 +91,7 @@ + domain="[('account_id.type','=','payable'), ('reconcile_id','=', False), ('partner_id','=',parent.partner_id)]"/> @@ -156,11 +138,11 @@ - - + delivery.carrier.form delivery.carrier @@ -90,7 +90,7 @@ - + Delivery Method ir.actions.act_window @@ -299,7 +299,7 @@ stock.picking - + +
@@ -129,7 +129,7 @@
  • Delete
    •  -
  • Remove from Wall
    • +
  • Hide
  • - Attachment - Attachments () + 1 Attachment + Attachments
    • diff --git a/addons/marketing_campaign/marketing_campaign_demo.xml b/addons/marketing_campaign/marketing_campaign_demo.xml index aaf5a98c6bc..54897cd111a 100644 --- a/addons/marketing_campaign/marketing_campaign_demo.xml +++ b/addons/marketing_campaign/marketing_campaign_demo.xml @@ -4,7 +4,7 @@ Template for New Partner - info@tinyerp.com + info@openerp.com Welcome in OpenERP Partner Channel! ${object.email or ''} @@ -12,7 +12,7 @@ Template for Silver Partner - info@tinyerp.com + info@openerp.com Congratulation! You become now our Silver Partner. ${object.email or ''} @@ -21,7 +21,7 @@ Template for Gold Partner - info@tinyerp.com + info@openerp.com Congratulation! You become our Gold Partner. ${object.email or ''} diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 6a06cb33f1d..d0823b93ab1 100644 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -4,19 +4,14 @@ - + + context="{'search_default_campaign_id': [active_id], 'default_campaign_id': active_id}"/> + view_type="form"/> marketing.campaign.form @@ -43,10 +38,10 @@
    @@ -633,37 +637,28 @@ search - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - - @@ -745,11 +740,8 @@ search - - - - - + +     @@ -820,7 +812,7 @@     - + diff --git a/addons/project/report/project_cumulative.xml b/addons/project/report/project_cumulative.xml index 3f7f3b26d96..ae87b3f2fe2 100644 --- a/addons/project/report/project_cumulative.xml +++ b/addons/project/report/project_cumulative.xml @@ -53,21 +53,20 @@ project.task.history.cumulative search - - - - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/addons/project/report/project_report_view.xml b/addons/project/report/project_report_view.xml index 40235ad03b7..ab880536ced 100644 --- a/addons/project/report/project_report_view.xml +++ b/addons/project/report/project_report_view.xml @@ -58,60 +58,32 @@ search - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + - - - - diff --git a/addons/project/res_partner_view.xml b/addons/project/res_partner_view.xml index 09170c43434..e16c18d1582 100644 --- a/addons/project/res_partner_view.xml +++ b/addons/project/res_partner_view.xml @@ -28,7 +28,5 @@ - - diff --git a/addons/project/static/src/js/project.js b/addons/project/static/src/js/project.js index 510fcbb99e7..c8250edcafd 100644 --- a/addons/project/static/src/js/project.js +++ b/addons/project/static/src/js/project.js @@ -1,25 +1,61 @@ openerp.project = function(openerp) { openerp.web_kanban.KanbanView.include({ - on_groups_started: function() { + project_display_members_names: function() { + /* + * Set avatar title for members. + * In kanban views, many2many fields only return a list of ids. + * We can implement return value of m2m fields like [(1,"Adminstration"),...]. + */ var self = this; - self._super.apply(this, arguments); - if (this.dataset.model === 'project.project') { - /* Set avatar title for members. - In many2many fields, returns only list of ids. - we can implement return value of m2m fields like [(1,"Adminstration"),...]. - */ - var members_ids = []; - this.$element.find('.oe_kanban_project_avatars img').each(function() { - members_ids.push($(this).data('member_id')); - }); - var dataset = new openerp.web.DataSetSearch(this, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]); - dataset.read_slice(['id', 'name']).then(function(result) { - _.each(result, function(v, k) { - self.$element.find('.oe_kanban_project_avatars img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({ - offset: 10 - }); + var members_ids = []; + + // Collect members ids + self.$element.find('img[data-member_id]').each(function() { + members_ids.push($(this).data('member_id')); + }); + + // Find their matching names + var dataset = new openerp.web.DataSetSearch(self, 'res.users', self.session.context, [['id', 'in', _.uniq(members_ids)]]); + dataset.read_slice(['id', 'name']).then(function(result) { + _.each(result, function(v, k) { + // Set the proper value in the DOM + self.$element.find('img[data-member_id=' + v.id + ']').attr('title', v.name).tipsy({ + offset: 10 }); }); + }); + }, + project_display_categ_names: function() { + /* + * Set proper names to project categories. + * In kanban views, many2many fields only return a list of ids. + * Therefore, we have to fetch the matching data by ourselves. + */ + var self = this; + var categ_ids = []; + + // Collect categories ids + self.$element.find('span[data-categ_id]').each(function() { + categ_ids.push($(this).data('categ_id')); + }); + + // Find their matching names + var dataset = new openerp.web.DataSetSearch(self, 'project.category', self.session.context, [['id', 'in', _.uniq(categ_ids)]]); + dataset.read_slice(['id', 'name']).then(function(result) { + _.each(result, function(v, k) { + // Set the proper value in the DOM and display the element + self.$element.find('span[data-categ_id=' + v.id + ']').text(v.name); + }); + }); + }, + on_groups_started: function() { + var self = this; + self._super.apply(self, arguments); + + if (self.dataset.model === 'project.project') { + self.project_display_members_names(); + } else if (self.dataset.model === 'project.task') { + self.project_display_categ_names(); } } }); diff --git a/addons/project_gtd/project_gtd_view.xml b/addons/project_gtd/project_gtd_view.xml index 5b48f6b4648..cce02ab329d 100644 --- a/addons/project_gtd/project_gtd_view.xml +++ b/addons/project_gtd/project_gtd_view.xml @@ -112,9 +112,9 @@ - + diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py index fa7d002f571..8aeecf2985e 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -25,7 +25,7 @@ 'version': '1.0', 'category': 'Project Management', "sequence": 22, - "summary": "Multi Level Support", + "summary": "Support, Bug Traker, Helpdesk", 'description': """ This module provides Issues/Bugs Management in Project. ======================================================= @@ -39,7 +39,7 @@ and decide on their status as they evolve. 'website': 'http://www.openerp.com', 'images': ['images/issue_analysis.jpeg','images/project_issue.jpeg'], 'depends': [ - 'base_status', + 'base_status', 'crm', 'project', ], @@ -66,6 +66,9 @@ and decide on their status as they evolve. 'auto_install': False, 'application': True, 'certificate' : '001236490750848623845', + 'js': [ + 'static/src/js/project_issue.js', + ], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_issue/board_project_issue_view.xml b/addons/project_issue/board_project_issue_view.xml index cedcd85d4fc..8bc34177d7d 100644 --- a/addons/project_issue/board_project_issue_view.xml +++ b/addons/project_issue/board_project_issue_view.xml @@ -18,7 +18,7 @@ - + diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index a7c9d2b5bc3..4c973eed068 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -236,7 +236,7 @@ class project_issue(base_stage, osv.osv): 'date_closed': fields.datetime('Closed', readonly=True,select=True), 'date': fields.datetime('Date'), 'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."), - 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('object_id.model', '=', 'crm.project.bug')]"), + 'categ_ids': fields.many2many('project.category', string='Categories'), 'priority': fields.selection(crm.AVAILABLE_PRIORITIES, 'Priority', select=True), 'version_id': fields.many2one('project.issue.version', 'Version'), 'stage_id': fields.many2one ('project.task.type', 'Stage', @@ -279,7 +279,6 @@ class project_issue(base_stage, osv.osv): 'section_id': lambda s, cr, uid, c: s._get_default_section_id(cr, uid, c), 'company_id': lambda s, cr, uid, c: s.pool.get('res.company')._company_default_get(cr, uid, 'crm.helpdesk', context=c), 'priority': crm.AVAILABLE_PRIORITIES[2][0], - 'categ_id' : lambda *a: False, } _group_by_full = { @@ -304,11 +303,11 @@ class project_issue(base_stage, osv.osv): def convert_issue_task(self, cr, uid, ids, context=None): if context is None: context = {} - + case_obj = self.pool.get('project.issue') data_obj = self.pool.get('ir.model.data') task_obj = self.pool.get('project.task') - + result = data_obj._get_id(cr, uid, 'project', 'view_task_search_form') res = data_obj.read(cr, uid, result, ['res_id']) id2 = data_obj._get_id(cr, uid, 'project', 'view_task_form2') @@ -351,23 +350,6 @@ class project_issue(base_stage, osv.osv): 'nodestroy': True } - - def _convert(self, cr, uid, ids, xml_id, context=None): - data_obj = self.pool.get('ir.model.data') - id2 = data_obj._get_id(cr, uid, 'project_issue', xml_id) - categ_id = False - if id2: - categ_id = data_obj.browse(cr, uid, id2, context=context).res_id - if categ_id: - self.write(cr, uid, ids, {'categ_id': categ_id}) - return True - - def convert_to_feature(self, cr, uid, ids, context=None): - return self._convert(cr, uid, ids, 'feature_request_categ', context=context) - - def convert_to_bug(self, cr, uid, ids, context=None): - return self._convert(cr, uid, ids, 'bug_categ', context=context) - def copy(self, cr, uid, id, default=None, context=None): issue = self.read(cr, uid, id, ['name'], context=context) if not default: @@ -376,7 +358,7 @@ class project_issue(base_stage, osv.osv): default['name'] = issue['name'] + _(' (copy)') return super(project_issue, self).copy(cr, uid, id, default=default, context=context) - + def write(self, cr, uid, ids, vals, context=None): #Update last action date every time the user change the stage, the state or send a new email logged_fields = ['stage_id', 'state', 'message_ids'] @@ -463,7 +445,7 @@ class project_issue(base_stage, osv.osv): # ------------------------------------------------------- # Mail gateway # ------------------------------------------------------- - + def message_new(self, cr, uid, msg, custom_values=None, context=None): """ Overrides mail_thread message_new that is called by the mailgateway through message_process. @@ -485,7 +467,7 @@ class project_issue(base_stage, osv.osv): custom_values.update(self.message_partner_by_email(cr, uid, msg.get('from'), context=context)) res_id = super(project_issue, self).message_new(cr, uid, msg, custom_values=custom_values, context=context) - self.convert_to_bug(cr, uid, [res_id], context=context) + # self.convert_to_bug(cr, uid, [res_id], context=context) return res_id def message_update(self, cr, uid, ids, msg, update_vals=None, context=None): @@ -515,7 +497,7 @@ class project_issue(base_stage, osv.osv): update_vals[key] = res.group(2).lower() return super(project_issue, self).message_update(cr, uid, ids, update_vals=update_vals, context=context) - + # ------------------------------------------------------- # OpenChatter methods and notifications # ------------------------------------------------------- @@ -588,18 +570,18 @@ project() class account_analytic_account(osv.osv): _inherit = 'account.analytic.account' _description = 'Analytic Account' - + _columns = { 'use_issues' : fields.boolean('Issues Tracking', help="Check this field if this project manages issues"), } - + def on_change_template(self, cr, uid, ids, template_id, context=None): res = super(account_analytic_account, self).on_change_template(cr, uid, ids, template_id, context=context) if template_id and 'value' in res: template = self.browse(cr, uid, template_id, context=context) res['value']['use_issues'] = template.use_issues return res - + def _trigger_project_creation(self, cr, uid, vals, context=None): res = super(account_analytic_account, self)._trigger_project_creation(cr, uid, vals, context=context) return res or vals.get('use_issues') diff --git a/addons/project_issue/project_issue_demo.xml b/addons/project_issue/project_issue_demo.xml index b3fb4582cf2..298dd6a25d9 100644 --- a/addons/project_issue/project_issue_demo.xml +++ b/addons/project_issue/project_issue_demo.xml @@ -1,236 +1,239 @@ - + - - - - - - - - - - - - - - + + + Little problem + + + PBCK + + + Deadly bug + - - - - - - - - - - - - - + + + + 5 + + + + + + + Bug in Accounts module + agr@agrolait.com + + + - - - - - - - - - - - - + + + 3 + + + + + + Program not giving proper output + + + - - - - - - - - - - - - - + + + 4 + + + + + + Output incorrect + + + - - - - - - - - - - - - - + + + 3 + + + + + + + Problem loading page + + - - - - - - - - - - - - - + + + 3 + + + + + + + Page not Found + + - - - - - - - - - - - - - + + + 3 + + + + + + + Programming Error + + + - - - - - - - - - - - - - + + + 2 + + + + + + + Logical Error in Program + + - - - - - - - - - - - - + + + 2 + + + + + + + Constraint Error + + - - - - - - - - - - - - - + + + 2 + + + + + + Error in Program + + - - - - - - - - - - - - - + + + 2 + + + + + + + Patches Error in Program + + - - - - - - - - - - - - - - + + + 4 + + + + + + + New Features To Be Added + + - - - - - - - - - - - - - - + + + 1 + + + + + + + Add menus to the module + info@opensides.be + + - - - - - - - - - - - - - + + + 3 + + + + + + + Include Attendance sheet in Project + contact@tecsas.fr + + - - - - - - - - - - - - - + + + 3 + + + + + + + Create new object + + - - - - - - - - - - - - - + + + 4 + + + + + + + Improve Reports in HRMS + + - - + + + 2 + + + + + + + Improve Reports in PMS + + - + + + + diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index e730805fb46..c7e73010b8b 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -16,9 +16,9 @@ action_project_issue_unread - + action - + project.issue client_action_multi @@ -34,9 +34,9 @@ action_project_issue_read - + action - + project.issue client_action_multi @@ -48,7 +48,6 @@ - @@ -133,14 +132,12 @@ +
    - - - @@ -194,7 +191,7 @@ - + @@ -206,46 +203,26 @@ search - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + @@ -265,79 +242,81 @@ - + - - Project Issue Kanban - project.issue - kanban - - - - - - - - - -
      -
    • Project:
      • -
    • Category:
      • -
    -     - -
    -
    - i -
    -
    -
    -
    -
    - -
    -
    -
    - - - - - - - - - - - - - - - - - - - + + Project Issue Kanban + project.issue + kanban + + + + + + + + + +
      +
    • Project:
      • +
    • Category:
      • +
    +     + +
    +
    + i +
    +
    +
    +
    +
    + +
    +
    +
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + +
    +
    -
    -
    - - - - - + + + + + - # ------------------------------------------------------ - # Feature Requests - # ------------------------------------------------------ - + Project Issue- Feature Tracker Tree project.issue @@ -363,22 +342,17 @@ search - - - - - - - - - - - - + + + + + + + - + - # ------------------------------------------------------ - # Project - # ------------------------------------------------------ - + project.project.form.inherited project.project @@ -409,7 +380,7 @@ - + project.project.kanban.inherited project.project @@ -427,7 +398,8 @@ - + + account.analytic.account.issue.form.inherit account.analytic.account form @@ -438,9 +410,10 @@ - + + diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py index 5957ee284e8..b43cbc51c50 100644 --- a/addons/project_issue/report/project_issue_report.py +++ b/addons/project_issue/report/project_issue_report.py @@ -50,7 +50,6 @@ class project_issue_report(osv.osv): 'opening_date': fields.date('Date of Opening', readonly=True), 'creation_date': fields.date('Creation Date', readonly=True), 'date_closed': fields.date('Date of Closing', readonly=True), - 'categ_id': fields.many2one('crm.case.categ', 'Category', domain="[('section_id','=',section_id),('object_id.model', '=', 'project.issue')]"), 'stage_id': fields.many2one('project.task.type', 'Stage'), 'nbr': fields.integer('# of Issues', readonly=True), 'working_hours_open': fields.float('Avg. Working Hours to Open', readonly=True), @@ -86,7 +85,6 @@ class project_issue_report(osv.osv): c.working_hours_open, c.working_hours_close, c.section_id, - c.categ_id, c.stage_id, to_char(c.date_closed, 'YYYY-mm-dd') as date_closed, c.company_id as company_id, @@ -104,7 +102,7 @@ class project_issue_report(osv.osv): FROM project_issue c - WHERE c.active= 'true' and c.categ_id IN (select id from crm_case_categ where object_id in (select id from ir_model where model = 'project.issue')) + WHERE c.active= 'true' )""") project_issue_report() diff --git a/addons/project_issue/report/project_issue_report_view.xml b/addons/project_issue/report/project_issue_report_view.xml index 862f52b1931..c1ae69517c2 100644 --- a/addons/project_issue/report/project_issue_report_view.xml +++ b/addons/project_issue/report/project_issue_report_view.xml @@ -17,19 +17,18 @@ - - + - - - - - - + + + + + + @@ -52,61 +51,30 @@ search - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - + - - + - - - - - - - - - - + + + + + diff --git a/addons/project_issue/static/src/js/project_issue.js b/addons/project_issue/static/src/js/project_issue.js new file mode 100644 index 00000000000..24e5ff7cc49 --- /dev/null +++ b/addons/project_issue/static/src/js/project_issue.js @@ -0,0 +1,13 @@ +openerp.portal_project_issue = function(openerp) { + openerp.web_kanban.KanbanView.include({ + on_groups_started: function() { + var self = this; + self._super.apply(this, arguments); + + if (self.dataset.model === 'project.issue') { + // Load project's categories names from m2m field + self.project_display_categ_names(); + } + } + }); +}; diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 7d7310465d6..3b814cbab6e 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -2,12 +2,9 @@ - - - # ------------------------------------------------------ - # Project User Allocation - # ------------------------------------------------------ + + project.user.allocation.gantt project.user.allocation @@ -69,17 +66,13 @@ search - - - - - - + + + - - - - + + + @@ -94,9 +87,7 @@ - # ------------------------------------------------------ - # Project Phase - # ------------------------------------------------------ + - + @@ -195,7 +186,7 @@ - + @@ -272,25 +263,18 @@ search - - - - - - - - - - - - - - + + + + + + + + + - - @@ -317,10 +301,7 @@ - # ------------------------------------------------------ - # Project Task - # ------------------------------------------------------ - + phase.task.form2 project.task @@ -368,16 +349,15 @@ - + - + account.analytic.account.phase.form.inherit account.analytic.account form @@ -393,10 +373,7 @@ - # ------------------------------------------------------ - # Menu Items - # ------------------------------------------------------ - + diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml index 7208885748c..3e627eaf01d 100644 --- a/addons/project_timesheet/project_timesheet_view.xml +++ b/addons/project_timesheet/project_timesheet_view.xml @@ -47,8 +47,9 @@ search - - + + + diff --git a/addons/project_timesheet/report/task_report.py b/addons/project_timesheet/report/task_report.py index 3c223ab6b07..b32d852bc5f 100644 --- a/addons/project_timesheet/report/task_report.py +++ b/addons/project_timesheet/report/task_report.py @@ -29,22 +29,8 @@ class report_timesheet_task_user(osv.osv): _auto = False _order = "name" - def _get_task_hours(self, cr, uid, ids, name,args,context): - result = {} - for record in self.browse(cr, uid, ids,context): - last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1) - task_obj = self.pool.get('project.task.work') - task_ids = task_obj.search(cr, uid, [('user_id','=',record.user_id.id),('date','>=',record.name),('date','<=',last_date.strftime('%Y-%m-%d'))]) - tsk_hrs = task_obj.read(cr, uid, task_ids, ['hours','date','user_id']) - total = 0.0 - for hrs in tsk_hrs: - total += hrs['hours'] - result[record.id] = total - return result - def get_hrs_timesheet(self, cr, uid, ids, name,args,context): result = {} - sum = 0.0 for record in self.browse(cr, uid, ids, context): last_date = datetime.strptime(record.name, '%Y-%m-%d') + relativedelta(months=1) - relativedelta(days=1) obj = self.pool.get('hr_timesheet_sheet.sheet.day') @@ -63,7 +49,7 @@ class report_timesheet_task_user(osv.osv): ('07','July'), ('08','August'), ('09','September'), ('10','October'), ('11','November'), ('12','December')],'Month',readonly=True), 'user_id': fields.many2one('res.users', 'User',readonly=True), 'timesheet_hrs': fields.function(get_hrs_timesheet, string="Timesheet Hours"), - 'task_hrs': fields.function(_get_task_hours, string="Task Hours"), + 'task_hrs' : fields.float('Task Hours'), } def init(self, cr): @@ -74,7 +60,9 @@ class report_timesheet_task_user(osv.osv): months.name as name, r.id as user_id, to_char(to_date(months.name, 'YYYY/MM/DD'),'YYYY') as year, - to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month + to_char(to_date(months.name, 'YYYY/MM/DD'),'MM') as month, + (select sum(hours) from project_task_work where user_id = r.id and date between to_date(months.name, 'YYYY/MM/DD') and (to_date(months.name, 'YYYY/MM/DD') + interval '1 month' - + interval '1 day') ) as task_hrs from res_users r, (select to_char(p.date,'YYYY-MM-01') as name, to_char(p.date,'MM') as m_id diff --git a/addons/project_timesheet/report/task_report_view.xml b/addons/project_timesheet/report/task_report_view.xml index 7e79b3793b7..32f8719e9a3 100644 --- a/addons/project_timesheet/report/task_report_view.xml +++ b/addons/project_timesheet/report/task_report_view.xml @@ -30,15 +30,10 @@ search - - - - - - + + - diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index cb2e8f093aa..eb8df0ff77b 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -25,7 +25,7 @@ 'version': '1.1', 'category': 'Purchase Management', "sequence": 19, - "summary": "Requests for Quotation, Invoicing Control", + "summary": "RfQ, Purchase Orders, Delivery & Invoicing Control", 'description': """ Purchase Management module is for generating a purchase order for purchase of goods from a supplier. ==================================================================================================== diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 38a858e94d7..313df25a563 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -7,6 +7,7 @@ id="base.menu_purchase_root" groups="group_purchase_manager,group_purchase_user" sequence="40"/> + @@ -54,12 +55,12 @@ action="base.action_partner_category_form" id="menu_partner_categories_in_form" name="Partner Categories" parent="purchase.menu_purchase_partner_cat" groups="base.group_no_one"/> - + - + [('type','=','in_invoice')] {'default_type':'in_invoice', 'type':'in_invoice', 'journal_type': 'purchase', 'search_default_draft': 1} - - Use this menu to control the invoices to be received from your supplier. - OpenERP generates draft invoices from your purchase orders or receptions, according to your settings. - Once you receive a supplier invoice, you can match it with the draft invoice and validate it. - + + Use this menu to control the invoices to be received from your supplier. + OpenERP generates draft invoices from your purchase orders or receptions, according to your settings. + Once you receive a supplier invoice, you can match it with the draft invoice and validate it. + - + @@ -140,7 +141,7 @@ client_action_multi - + purchase.order.calendar purchase.order calendar @@ -245,7 +246,7 @@ - + @@ -256,7 +257,7 @@
    - +
    @@ -268,29 +269,23 @@ search - - - - + + - - - - - - - - - - - - + + + + + + + +     @@ -300,34 +295,25 @@ search - - - - + + - - + + - - - - - - - - - - - - + + + + + + + + @@ -492,21 +478,16 @@ search - - - - - - + + + - - - + @@ -559,9 +540,7 @@ parent="menu_procurement_management_invoice" sequence="72"/> - + procurement.order.form.inherit @@ -574,6 +553,5 @@     -     diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 4cf91053666..aa915c620f5 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -53,29 +53,16 @@ search - - - - - - - - + + + + - - - + - @@ -85,7 +72,6 @@ - @@ -93,11 +79,8 @@ - - - diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml index 27318adc0f5..2191e642ab2 100644 --- a/addons/purchase/stock_view.xml +++ b/addons/purchase/stock_view.xml @@ -46,35 +46,21 @@ search - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - + + + + diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index c1fc14c29bf..e0b8db4862f 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -134,28 +134,21 @@ search - - + - + - - - - - - - - - - - - - + + + + + + + diff --git a/addons/report_intrastat/report_intrastat_view.xml b/addons/report_intrastat/report_intrastat_view.xml index c481296196c..73cf99bec34 100644 --- a/addons/report_intrastat/report_intrastat_view.xml +++ b/addons/report_intrastat/report_intrastat_view.xml @@ -99,12 +99,10 @@ search - - - - - - + + + + diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 8a0823a8c15..5b388469f3c 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -10,23 +10,15 @@ search - - - - - - - - - - + + + + + - - - @@ -39,12 +31,9 @@ search - - - - - - + + + @@ -55,19 +44,13 @@ search - - - - - - - - - + + + + + - - diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index f5bf1adb436..b6be6f7b1e3 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -24,7 +24,7 @@ 'version': '1.0', 'category': 'Sales Management', "sequence": 14, - "summary": "Quotations, Sales, Invoicing", + "summary": "Quotations, Sale Orders, Invoicing", 'description': """ The base module to manage quotations and sales orders. ====================================================== diff --git a/addons/sale/i18n/mn.po b/addons/sale/i18n/mn.po index 2fc96bd7db5..ced25296fcc 100644 --- a/addons/sale/i18n/mn.po +++ b/addons/sale/i18n/mn.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2012-05-10 17:34+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-07-31 11:44+0000\n" +"Last-Translator: gobi \n" "Language-Team: Mongolian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-07-21 05:07+0000\n" -"X-Generator: Launchpad (build 15654)\n" +"X-Launchpad-Export-Date: 2012-08-01 04:43+0000\n" +"X-Generator: Launchpad (build 15719)\n" #. module: sale #: field:sale.config.picking_policy,timesheet:0 @@ -1491,7 +1491,7 @@ msgstr "Борлуулалт Захиалгын Мөр Нэхэмжлэх Үүс #. module: sale #: selection:sale.order,state:0 selection:sale.report,state:0 msgid "Invoice Exception" -msgstr "Нэхэмжлэлийн алдаа" +msgstr "Нэхэмжлэлийн сондгойрол" #. module: sale #: model:process.node,note:sale.process_node_saleorder0 diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index 8eb4fc85ce6..1ac6d425530 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -50,53 +50,35 @@ search - - - - - - - - - - - - - - + + + + + + + + + + + - - - + + + - - - - - - - - - + + + diff --git a/addons/sale/res_partner.py b/addons/sale/res_partner.py index 84c1a9c96ad..d7bcd5804ee 100644 --- a/addons/sale/res_partner.py +++ b/addons/sale/res_partner.py @@ -31,6 +31,14 @@ class res_partner(osv.osv): res[partner.id] = len(partner.sale_order_ids) return res + def copy(self, cr, uid, record_id, default=None, context=None): + if default is None: + default = {} + + default.update({'sale_order_ids': []}) + + super(res_partner, self).copy(cr, uid, record_id, default, context) + _columns = { 'sale_order_count': fields.function(_sale_order_count, string='# of Sales Order', type='integer'), 'sale_order_ids': fields.one2many('sale.order','partner_id','Sales Order') diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index a73f7744e53..3bb78ae1c04 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -164,7 +164,7 @@
    + -
    -
    - +
    +