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 fba1c8ed099..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-31 04:58+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/res_config_view.xml b/addons/account/res_config_view.xml index 2ad9d5aa404..3711e1e419d 100644 --- a/addons/account/res_config_view.xml +++ b/addons/account/res_config_view.xml @@ -15,7 +15,7 @@ account.config.settings form -
+
@@ -126,20 +130,20 @@
- - + +
- - - - + + + + @@ -328,37 +332,22 @@ search - - - - - - - - - - - - - - + + + + + + + + + + + - - - + @@ -474,8 +463,8 @@
@@ -529,34 +518,21 @@ search - - - - - - - - - - - - - + + + + + + + + + - - @@ -571,12 +547,11 @@ view_ - - + diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index 7ae6c0fae2e..f05fdcc09e1 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -52,24 +52,12 @@ search - - - - - - - - - + + + + + + @@ -80,27 +68,18 @@ - - - - - - - + + + - + diff --git a/addons/event/security/event_security.xml b/addons/event/security/event_security.xml index e0d17c3bacb..f46bc5fff96 100644 --- a/addons/event/security/event_security.xml +++ b/addons/event/security/event_security.xml @@ -1,45 +1,46 @@ - + - + Event Helps you manage your Events. 3 - - User - - + + User + + - - Manager - - - - + + Manager + + + + - + + + Event multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + - - Event multi-company - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - - - Event Registration multi-company - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - + + Event Registration multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + - - Report Event Registration multi-company - - - ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - --> - + + Report Event Registration multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + + diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 9567f7746f3..3325ae38c0b 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -80,10 +80,9 @@ - - + diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml index bbf66f0d4c3..ed0156e6cce 100644 --- a/addons/hr/hr_department_view.xml +++ b/addons/hr/hr_department_view.xml @@ -2,11 +2,7 @@ - + hr.department.form hr.department @@ -37,18 +33,17 @@ - + Departments hr.department search - - + Departments @@ -60,5 +55,5 @@ - + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index f160eda6301..ca07c8ce173 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -11,7 +11,7 @@ + parent="menu_hr_reporting" sequence="6"/> @@ -40,9 +40,9 @@ - + - + @@ -50,7 +50,7 @@ - + @@ -109,16 +109,13 @@ - - - + + - - @@ -142,7 +139,9 @@
-

()

+

+ () +

  • @@ -225,12 +224,7 @@ - - + hr.employee.tree hr.employee @@ -269,12 +263,7 @@ - - + hr.employee.category.form hr.employee.category @@ -373,8 +362,8 @@ - - + + @@ -418,16 +407,9 @@ - - - - - - + + + diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py index c9e5b7a8628..4973417ec88 100644 --- a/addons/hr/res_config.py +++ b/addons/hr/res_config.py @@ -26,23 +26,23 @@ class hr_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - 'module_hr_timesheet_sheet': fields.boolean('Timesheet Validation by Manager', + 'module_hr_timesheet_sheet': fields.boolean('allow timesheets validation by managers', help ="""This installs the module hr_timesheet_sheet."""), - 'module_hr_attendance': fields.boolean('Track Attendances', + 'module_hr_attendance': fields.boolean('track attendances', help ="""This installs the module hr_attendance."""), - 'module_hr_timesheet': fields.boolean('Manage Timesheets', + 'module_hr_timesheet': fields.boolean('manage timesheets', help ="""This installs the module hr_timesheet."""), - 'module_hr_holidays': fields.boolean('Leaves & Holidays', + 'module_hr_holidays': fields.boolean('manage leaves and allocation requests', help ="""This installs the module hr_holidays."""), - 'module_hr_expense': fields.boolean('Expenses', + 'module_hr_expense': fields.boolean('manage employees expenses', help ="""This installs the module hr_expense."""), - 'module_hr_recruitment': fields.boolean('Recruitment', + 'module_hr_recruitment': fields.boolean('manage the recruitment pipe', help ="""This installs the module hr_recruitment."""), - 'module_hr_contract': fields.boolean('Employees Contracts', + 'module_hr_contract': fields.boolean('manage contract per employee', help ="""This installs the module hr_contract."""), - 'module_hr_evaluation': fields.boolean('Periodic Appraisals', + 'module_hr_evaluation': fields.boolean('manage employees periodic evaluation', help ="""This installs the module hr_evaluation."""), - 'module_hr_payroll': fields.boolean('Payroll', + 'module_hr_payroll': fields.boolean('manage payroll', help ="""This installs the module hr_payroll."""), } diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml index 68a35653fc2..cf9e565bf21 100644 --- a/addons/hr/res_config_view.xml +++ b/addons/hr/res_config_view.xml @@ -14,7 +14,7 @@ hr.config.settings form - +
-
- -
@@ -70,6 +66,15 @@ + + diff --git a/addons/hr_attendance/hr_attendance_view.xml b/addons/hr_attendance/hr_attendance_view.xml index 448e6401cbd..8a671e8438f 100644 --- a/addons/hr_attendance/hr_attendance_view.xml +++ b/addons/hr_attendance/hr_attendance_view.xml @@ -55,16 +55,13 @@ - - - - - - + + + + - diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml index 8065d3b16bf..2009e500bf9 100644 --- a/addons/hr_contract/hr_contract_view.xml +++ b/addons/hr_contract/hr_contract_view.xml @@ -40,22 +40,15 @@ search - - - - - - - - - - + + + + + - - @@ -174,9 +167,7 @@ search - - - + diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml index b940313691f..c67b5b51d1f 100644 --- a/addons/hr_evaluation/hr_evaluation_view.xml +++ b/addons/hr_evaluation/hr_evaluation_view.xml @@ -8,12 +8,8 @@ search - - - - - - + + @@ -234,22 +230,15 @@ search - - - - - - - - - - + + + + + - - @@ -329,20 +318,13 @@ search - - - - - - - - - + + + + - - diff --git a/addons/hr_evaluation/report/hr_evaluation_report_view.xml b/addons/hr_evaluation/report/hr_evaluation_report_view.xml index d855e02eea7..f92ff1efedb 100644 --- a/addons/hr_evaluation/report/hr_evaluation_report_view.xml +++ b/addons/hr_evaluation/report/hr_evaluation_report_view.xml @@ -45,34 +45,22 @@ search - - - - - - - - - + + + + + - - - - - - diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index 36ebd202dc8..24514241916 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -136,27 +136,19 @@ search - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/addons/hr_expense/report/hr_expense_report_view.xml b/addons/hr_expense/report/hr_expense_report_view.xml index 7877edf4b3a..73ec45bde02 100644 --- a/addons/hr_expense/report/hr_expense_report_view.xml +++ b/addons/hr_expense/report/hr_expense_report_view.xml @@ -51,46 +51,31 @@ search - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 26683e3de8a..29ca1e7b87d 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -44,36 +44,28 @@ search - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - @@ -408,8 +400,7 @@ - - + @@ -475,8 +466,7 @@ - - + diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index e05910a27da..b08ce6983c6 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -61,10 +61,7 @@ search - - - - + @@ -179,19 +176,13 @@ search - - - - - - - + + + - - @@ -367,25 +358,16 @@ search - - - - - - - - - - - - + + + + + + - - - @@ -526,8 +508,7 @@ - - + @@ -655,13 +636,9 @@ search - - - - - - - + + + @@ -698,10 +675,8 @@ - - diff --git a/addons/hr_payroll/i18n/he.po b/addons/hr_payroll/i18n/he.po index 9b54273f823..2957d625576 100644 --- a/addons/hr_payroll/i18n/he.po +++ b/addons/hr_payroll/i18n/he.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-31 04:58+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: hr_payroll #: field:hr.payslip.line,condition_select:0 diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py index d1e33173f77..c39295dd925 100644 --- a/addons/hr_payroll/res_config.py +++ b/addons/hr_payroll/res_config.py @@ -24,6 +24,6 @@ from osv import osv, fields class human_resources_configuration(osv.osv_memory): _inherit = 'hr.config.settings' _columns = { - 'module_hr_payroll_account': fields.boolean('Manage Account Payroll', + 'module_hr_payroll_account': fields.boolean('link your payroll to accounting system', help ="""Create Journal Entries from Payslips"""), } diff --git a/addons/hr_payroll_account/hr_payroll_account_view.xml b/addons/hr_payroll_account/hr_payroll_account_view.xml index 9e3aab3ecb6..d481ae3cdde 100644 --- a/addons/hr_payroll_account/hr_payroll_account_view.xml +++ b/addons/hr_payroll_account/hr_payroll_account_view.xml @@ -62,8 +62,7 @@ - - + diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 4617011c2f9..ff20f18c1bd 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -1,23 +1,21 @@ - - + - # ------------------------------------------------------ - # Stage - # ------------------------------------------------------ + + + Recruitment / Applicants Stages hr.recruitment.stage @@ -28,10 +26,7 @@ - # ------------------------------------------------------ - # Jobs - # ------------------------------------------------------ - + Mark unread @@ -44,9 +39,9 @@ action_project_unread - + action - + hr.applicant client_action_multi @@ -62,9 +57,9 @@ action_project_read - + action - + hr.applicant client_action_multi @@ -175,12 +170,12 @@ @@ -214,45 +209,29 @@ search - - - - - - - - - - - - - - + + + + + + + + + + + + - - - @@ -260,7 +239,6 @@ - Hr Applicants Calendar hr.applicant @@ -269,15 +247,14 @@ - - + + - - + Hr Applicants kanban hr.applicant @@ -346,10 +323,7 @@ - # ------------------------------------------------------ - # HR Job - # ------------------------------------------------------ - + hr.job.form1 hr.job @@ -357,20 +331,19 @@ - - - + hr.recruitment.stage.tree hr.recruitment.stage @@ -385,8 +358,7 @@ - - + hr.recruitment.stage.form hr.recruitment.stage @@ -405,8 +377,7 @@ - - + Stages hr.recruitment.stage @@ -422,8 +393,7 @@ action="hr_recruitment_stage_act" sequence="1" groups="base.group_no_one"/> - - + hr.recruitment.degree.tree hr.recruitment.degree @@ -436,8 +406,7 @@ - - + hr.recruitment.degree.form hr.recruitment.degree @@ -452,8 +421,7 @@ - - + Degree hr.recruitment.degree @@ -468,8 +436,7 @@ action="hr_recruitment_degree_action" sequence="5" groups="base.group_no_one"/> - - + hr.recruitment.source.tree hr.recruitment.source @@ -496,11 +463,12 @@ form - + diff --git a/addons/hr_recruitment/report/hr_recruitment_report_view.xml b/addons/hr_recruitment/report/hr_recruitment_report_view.xml index 9d81d39f240..afb87aba4ff 100644 --- a/addons/hr_recruitment/report/hr_recruitment_report_view.xml +++ b/addons/hr_recruitment/report/hr_recruitment_report_view.xml @@ -49,55 +49,32 @@ search - - - - - - - - - - - - + + + + + + + + + - - + + - - - + - - - diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py index 4818d280879..bf247f303f1 100644 --- a/addons/hr_recruitment/res_config.py +++ b/addons/hr_recruitment/res_config.py @@ -26,10 +26,10 @@ class hr_applicant_settings(osv.osv_memory): _inherit = ['hr.config.settings', 'fetchmail.config.settings'] _columns = { - 'module_document_ftp': fields.boolean('Automatic Indexation of Resumes', + 'module_document_ftp': fields.boolean('allow the automatic indexation of resumes', help="""Manage your CV's and motivation letter related to all applicants. This installs the module document_ftp. This will install the knowledge management module in order to allow you to search using specific keywords through the content of all documents (PDF, .DOCx...)"""), - 'fetchmail_applicants': fields.boolean('Create Applicants from Incoming Mails', + 'fetchmail_applicants': fields.boolean('create applicants from an incoming email account', fetchmail_model='hr.applicant', fetchmail_name='Incoming HR Applications', help ="""Allow applicants to send their job application to an email address (jobs@mycompany.com), and create automatically application documents in the system."""), diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml index 61ce127794a..1d9424e0fb5 100644 --- a/addons/hr_recruitment/res_config_view.xml +++ b/addons/hr_recruitment/res_config_view.xml @@ -7,23 +7,18 @@ form - - - - +
+
+ +
+
+ +
+
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 7875aff12a0..77dbc643a08 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -68,24 +68,17 @@ search - - - - - - - + + + - - - diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py index 54257f5efba..a4f08a854ec 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice.py +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice.py @@ -126,6 +126,25 @@ class account_analytic_line(osv.osv): 'to_invoice': fields.many2one('hr_timesheet_invoice.factor', 'Type of Invoicing', help="It allows to set the discount while making invoice"), } + def _default_journal(self, cr, uid, context=None): + proxy = self.pool.get('hr.employee') + record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context) + employee = proxy.browse(cr, uid, record_ids[0], context=context) + return employee.journal_id and employee.journal_id.id or False + + def _default_general_account(self, cr, uid, context=None): + proxy = self.pool.get('hr.employee') + record_ids = proxy.search(cr, uid, [('user_id', '=', uid)], context=context) + employee = proxy.browse(cr, uid, record_ids[0], context=context) + if employee.product_id and employee.product_id.property_account_income: + return employee.product_id.property_account_income.id + return False + + _defaults = { + 'journal_id' : _default_journal, + 'general_account_id' : _default_general_account, + } + def write(self, cr, uid, ids, vals, context=None): self._check_inv(cr, uid, ids, vals) return super(account_analytic_line,self).write(cr, uid, ids, vals, diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml index 81dc1e3c9cf..90305c772cb 100644 --- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml +++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml @@ -89,11 +89,11 @@ search - + + - - + @@ -144,9 +144,7 @@ search - - - + diff --git a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml index 59b4ceb67a3..5048f2c9193 100644 --- a/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml +++ b/addons/hr_timesheet_invoice/report/hr_timesheet_invoice_report_view.xml @@ -46,29 +46,19 @@ search - - - - - - - - + + + + - - + - - @@ -149,12 +139,9 @@ search - - - - - - + + + @@ -201,7 +188,6 @@ search - @@ -282,13 +268,10 @@ search - - - - - - - + + + + @@ -351,13 +334,10 @@ search - - - - - - - + + + + diff --git a/addons/hr_timesheet_invoice/report/report_analytic_view.xml b/addons/hr_timesheet_invoice/report/report_analytic_view.xml index c7d0c6b7c25..6dbbb85aea9 100644 --- a/addons/hr_timesheet_invoice/report/report_analytic_view.xml +++ b/addons/hr_timesheet_invoice/report/report_analytic_view.xml @@ -113,13 +113,10 @@ search - - - - - - - + + + + diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml index dbc9e1d6dac..86ef3255286 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml @@ -23,11 +23,9 @@ search - - - - - + + + @@ -158,16 +156,11 @@ search - - - - - - - - - - + + + + + diff --git a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml index fd5d6b0b6d1..7492d94cba2 100644 --- a/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/hr_timesheet_report_view.xml @@ -40,29 +40,21 @@ search - - - - - + + - - - + - - - diff --git a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml index 613f92d3cf6..9956ed2655e 100644 --- a/addons/hr_timesheet_sheet/report/timesheet_report_view.xml +++ b/addons/hr_timesheet_sheet/report/timesheet_report_view.xml @@ -48,51 +48,30 @@ search - - - - - - - - - + + + + + - - + - - - - - + + - - - - - - - diff --git a/addons/hr_timesheet_sheet/res_config.py b/addons/hr_timesheet_sheet/res_config.py index 24566d668da..bb4e098e1b3 100644 --- a/addons/hr_timesheet_sheet/res_config.py +++ b/addons/hr_timesheet_sheet/res_config.py @@ -26,8 +26,8 @@ class hr_timesheet_settings(osv.osv_memory): _columns = { 'timesheet_range': fields.selection([('day','Day'),('week','Week'),('month','Month')], - 'Validate Timesheets Every', help="Periodicity on which you validate your timesheets."), - 'timesheet_max_difference': fields.float('Timesheet Allowed Difference (Hours)', + 'Validate timesheets every', help="Periodicity on which you validate your timesheets."), + 'timesheet_max_difference': fields.float('Allow a difference of time between timesheets and attendances of (in hours)', help="""Allowed difference in hours between the sign in/out and the timesheet computation for one sheet. Set this to 0 if you do not want any control."""), } diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml index ec7f0e6d328..4508301ca8c 100644 --- a/addons/idea/idea_view.xml +++ b/addons/idea/idea_view.xml @@ -110,22 +110,14 @@ search - - - - - - - - - - + + + + + - - diff --git a/addons/import_base/i18n/pt_BR.po b/addons/import_base/i18n/pt_BR.po new file mode 100644 index 00000000000..9587acd607f --- /dev/null +++ b/addons/import_base/i18n/pt_BR.po @@ -0,0 +1,105 @@ +# Brazilian Portuguese 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:36+0000\n" +"PO-Revision-Date: 2012-08-01 01:59+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Brazilian Portuguese \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-01 04:44+0000\n" +"X-Generator: Launchpad (build 15719)\n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:434 +#, python-format +msgid "Import failed due to an unexpected error" +msgstr "A importação falhou devido a um erro inesperado" + +#. module: import_base +#: code:addons/import_base/import_framework.py:461 +#, python-format +msgid "started at %s and finished at %s \n" +msgstr "Início em %s e término em %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:448 +#, python-format +msgid "Import of your data finished at %s" +msgstr "A Importação de seus dados terminou em %s" + +#. module: import_base +#: code:addons/import_base/import_framework.py:463 +#, python-format +msgid "" +"but failed, in consequence no data were imported to keep database " +"consistency \n" +" error : \n" +msgstr "" +"mas falhou, por isso nenhum dado foi importado para manter a consistência do " +"banco de dados \n" +" erro: \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:477 +#, python-format +msgid "" +"The import of data \n" +" instance name : %s \n" +msgstr "" +"A importação de dados \n" +" nome da instância: %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:470 +#, python-format +msgid "%s has been successfully imported from %s %s, %s \n" +msgstr "%s foi importada com sucesso de %s %s, %s \n" + +#. module: import_base +#: code:addons/import_base/import_framework.py:447 +#, python-format +msgid "Data Import failed at %s due to an unexpected error" +msgstr "A importação falhou em %s devido a um erro inesperado" + +#. module: import_base +#: code:addons/import_base/import_framework.py:436 +#, python-format +msgid "Import finished, notification email sended" +msgstr "Importação Concluída, o email de notificação foi enviado" + +#. module: import_base +#: code:addons/import_base/import_framework.py:190 +#, python-format +msgid "%s is not a valid model name" +msgstr "%s não é um nome de modelo válido" + +#. module: import_base +#: model:ir.ui.menu,name:import_base.menu_import_crm +msgid "Import" +msgstr "Importar" + +#. module: import_base +#: code:addons/import_base/import_framework.py:467 +#, python-format +msgid "with no warning" +msgstr "sem nenhum erro" + +#. module: import_base +#: code:addons/import_base/import_framework.py:469 +#, python-format +msgid "with warning : %s" +msgstr "com avisos: %s" + +#. module: import_base +#: code:addons/import_base/import_framework.py:191 +#, python-format +msgid " fields imported : " +msgstr " campos importados: " diff --git a/addons/lunch/lunch.py b/addons/lunch/lunch.py index 8cca4ced465..c249478ad48 100644 --- a/addons/lunch/lunch.py +++ b/addons/lunch/lunch.py @@ -210,7 +210,7 @@ class report_lunch_amount(osv.osv): _name = 'report.lunch.amount' _description = "Amount available by user and box" _auto = False - _rec_name = "user" + _rec_name = "user_id" _columns = { 'user_id': fields.many2one('res.users', 'User Name', readonly=True), diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml index 5e870c085c9..d953dfbd1a9 100644 --- a/addons/lunch/lunch_view.xml +++ b/addons/lunch/lunch_view.xml @@ -76,12 +76,9 @@ - - - @@ -192,12 +189,9 @@ - - - @@ -301,8 +295,8 @@ - + @@ -375,14 +369,10 @@ search - - - - - - - - + + + + diff --git a/addons/lunch/report/report_lunch_order_view.xml b/addons/lunch/report/report_lunch_order_view.xml index 01de4be1354..717573687df 100644 --- a/addons/lunch/report/report_lunch_order_view.xml +++ b/addons/lunch/report/report_lunch_order_view.xml @@ -25,19 +25,14 @@ search - - - - + - - diff --git a/addons/mail/data/mail_demo.xml b/addons/mail/data/mail_demo.xml index 274259e544e..f9edb8b9e2f 100644 --- a/addons/mail/data/mail_demo.xml +++ b/addons/mail/data/mail_demo.xml @@ -29,10 +29,10 @@ mail.group html - sit amet, consectetur adipiscing elit. Pellentesque et quam sapien, in sagittis tellus. - Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. + sit amet, consectetur adipiscing elit. Pellentesque et quam sapien, in sagittis tellus. +Praesent vel massa sed massa consequat egestas in tristique orci. Praesent iaculis libero et neque vehicula iaculis. Vivamus placerat tincidunt orci ac ornare. Proin ut dolor fringilla velit ultricies consequat. Maecenas sit amet ipsum non leo interdum imperdiet. Donec sapien mi, varius a consequat id, consectetur sit amet nulla. -Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. +Fusce tempus elit volutpat mi auctor adipiscing. Nam congue luctus suscipit. Duis vestibulum dapibus enim vitae dignissim. Sed tellus libero, venenatis ut mollis ut, luctus quis dui. Sed rhoncus pulvinar orci in consectetur. Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in dolor in sapien tempus vehicula.]]> comment @@ -54,11 +54,11 @@ Nulla turpis leo, rhoncus ut egestas sit amet, consectetur vitae urna. Mauris in mail.group html - comment - + @@ -76,10 +76,10 @@ Would it be possible to learn more about the author ? (second comment)]]>mail.group html - diff --git a/addons/mail/mail_group_view.xml b/addons/mail/mail_group_view.xml index c755209f952..bd01e50baa5 100644 --- a/addons/mail/mail_group_view.xml +++ b/addons/mail/mail_group_view.xml @@ -104,7 +104,6 @@ - diff --git a/addons/mail/mail_message_view.xml b/addons/mail/mail_message_view.xml index 986bb4bef38..b967035bec3 100644 --- a/addons/mail/mail_message_view.xml +++ b/addons/mail/mail_message_view.xml @@ -64,9 +64,7 @@ - - @@ -80,7 +78,6 @@ 25 - + @@ -208,31 +206,26 @@ - - + - - - - diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml index f07e1e467ee..68727832e53 100644 --- a/addons/mail/mail_thread_view.xml +++ b/addons/mail/mail_thread_view.xml @@ -9,7 +9,8 @@ sequence="10"/> - + + News Feed 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 @@
+ - - - @@ -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/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/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/sale_view.xml b/addons/sale/sale_view.xml index a73f7744e53..48e823250dc 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -359,26 +359,19 @@ - - - + + + - - - - @@ -531,13 +524,12 @@ + - - @@ -557,18 +549,17 @@ + + - - - diff --git a/addons/sale_crm/i18n/ja.po b/addons/sale_crm/i18n/ja.po index 44e1c1cc23a..aeabdf25de4 100644 --- a/addons/sale_crm/i18n/ja.po +++ b/addons/sale_crm/i18n/ja.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-31 04:58+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: sale_crm #: field:sale.order,categ_id:0 diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml index d6b7f28d049..6efaea2ac53 100644 --- a/addons/sale_crm/sale_crm_view.xml +++ b/addons/sale_crm/sale_crm_view.xml @@ -36,13 +36,14 @@ + - + diff --git a/addons/sale_margin/i18n/ja.po b/addons/sale_margin/i18n/ja.po index e9c76e11755..d0b51f8404f 100644 --- a/addons/sale_margin/i18n/ja.po +++ b/addons/sale_margin/i18n/ja.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-31 04:58+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: sale_margin #: sql_constraint:sale.order:0 diff --git a/addons/share/res_users_view.xml b/addons/share/res_users_view.xml index defbc522340..3af69bb025b 100644 --- a/addons/share/res_users_view.xml +++ b/addons/share/res_users_view.xml @@ -7,8 +7,7 @@ search - - + @@ -32,11 +31,8 @@ - - - + diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml index 04a0959739a..70fb06709f6 100644 --- a/addons/stock/product_view.xml +++ b/addons/stock/product_view.xml @@ -9,8 +9,8 @@ - - + + @@ -105,15 +105,15 @@ - -