From 5c854d68caf08e1baecced7ec858c998e8b82d9e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 16 Jun 2010 13:38:52 +0200 Subject: [PATCH 1/2] merge bzr revid: fp@tinyerp.com-20100616113852-cj3dwha1w74l5q3w --- addons/idea/test/test_idea.yml | 4 ++-- addons/purchase/purchase_view.xml | 3 +-- addons/sale_order_dates/__openerp__.py | 8 +++++--- addons/sale_order_dates/sale_view.xml | 12 +++++------- addons/stock/stock.py | 5 +---- 5 files changed, 14 insertions(+), 18 deletions(-) diff --git a/addons/idea/test/test_idea.yml b/addons/idea/test/test_idea.yml index 4c3f5301a5a..bcb764f8933 100644 --- a/addons/idea/test/test_idea.yml +++ b/addons/idea/test/test_idea.yml @@ -19,13 +19,13 @@ user_id: base.user_root - | - I check that idea on draft state. + I check that the idea is in draft state. - !assert {model: idea.idea, id: idea_idea_0}: - state == 'draft' - | - I open this idea by click on "Open" button. + I open this idea by clicking on the "Open" button. - !workflow {model: idea.idea, action: idea_open, ref: idea_idea_0} diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 3a7277a4766..e6cf510b018 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -91,8 +91,7 @@ - - + diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py index e8a2cf6e6b6..0f7a56fba20 100644 --- a/addons/sale_order_dates/__openerp__.py +++ b/addons/sale_order_dates/__openerp__.py @@ -21,11 +21,13 @@ { - 'name': 'Customer & Sales', + 'name': 'Sale Order Dates', 'version': '1.0', 'category': 'Generic Modules/CRM & SRM', - 'description': """Sale Orders Dates""", - 'author': 'Tiny', + 'description': """ +Add commitment, requested and effective dates on the sale order. +""", + 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ["sale"], 'init_xml': [ diff --git a/addons/sale_order_dates/sale_view.xml b/addons/sale_order_dates/sale_view.xml index 7f5edf811ef..54248fa0176 100644 --- a/addons/sale_order_dates/sale_view.xml +++ b/addons/sale_order_dates/sale_view.xml @@ -2,22 +2,20 @@ - + sale.order.form.inherit5 sale.order form - - + - - + - + - + diff --git a/addons/stock/stock.py b/addons/stock/stock.py index a7241c2bbe6..924bf69c520 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2251,7 +2251,7 @@ class stock_inventory(osv.osv): 'prodlot_id': lot_id, 'date': inv.date, 'date_planned': inv.date, - 'state': 'assigned' + 'state': 'done' } if change > 0: value.update( { @@ -2271,9 +2271,6 @@ class stock_inventory(osv.osv): 'product_qty': line.product_qty }) move_ids.append(self._inventory_line_hook(cr, uid, line, value)) - if len(move_ids): - self.pool.get('stock.move').action_done(cr, uid, move_ids, - context=context) self.write(cr, uid, [inv.id], {'state': 'done', 'date_done': time.strftime('%Y-%m-%d %H:%M:%S'), 'move_ids': [(6, 0, move_ids)]}) return True From e28676b821b440bdaa9771adccf36b902dfe0b00 Mon Sep 17 00:00:00 2001 From: "Vir (Open ERP)" Date: Wed, 16 Jun 2010 17:11:41 +0530 Subject: [PATCH 2/2] [MOD,IMP] point_of_sale : improvements in pos order report, account,hr,mrp,project,stock: changes in icons bzr revid: vir@tinyerp.com-20100616114141-l6nbfgc6wsof1hzh --- addons/account/account_invoice_view.xml | 20 +++++------ addons/account/account_view.xml | 20 +++++------ .../project_account_analytic_line_view.xml | 2 +- .../account_analytic_entries_report_view.xml | 2 +- .../report/account_analytic_report_view.xml | 2 +- .../report/account_entries_report_view.xml | 2 +- .../report/account_invoice_report_view.xml | 2 +- .../account_automatic_reconcile_view.xml | 4 +-- .../wizard/account_central_journal_view.xml | 2 +- .../wizard/account_change_currency_view.xml | 2 +- addons/account/wizard/account_chart_view.xml | 2 +- .../wizard/account_invoice_state_view.xml | 6 ++-- .../wizard/account_journal_select_view.xml | 4 +-- .../account_move_bank_reconcile_view.xml | 4 +-- .../wizard/account_move_journal_view.xml | 4 +-- ...ccount_move_line_reconcile_select_view.xml | 4 +-- .../wizard/account_move_line_select_view.xml | 4 +-- ...ount_move_line_unreconcile_select_view.xml | 4 +-- .../account_open_closed_fiscalyear_view.xml | 4 +-- .../account_partner_balance_report_view.xml | 2 +- .../wizard/account_period_close_view.xml | 2 +- .../account/wizard/account_reconcile_view.xml | 4 +-- .../account_statement_from_invoice_view.xml | 2 +- .../account/wizard/account_use_model_view.xml | 4 +-- .../wizard/account_validate_move_view.xml | 2 +- addons/crm/report/crm_lead_report_view.xml | 2 +- .../crm/report/crm_phonecall_report_view.xml | 2 +- .../report/crm_claim_report_view.xml | 2 +- .../report/crm_fundraising_report_view.xml | 2 +- addons/hr_attendance/hr_attendance_view.xml | 2 +- .../report/hr_evaluation_report_view.xml | 2 +- .../report/hr_expense_report_view.xml | 2 +- .../report/available_holidays_view.xml | 2 +- .../report/hr_holidays_report_view.xml | 2 +- .../report/hr_recruitment_report_view.xml | 2 +- .../hr_timesheet_invoice_report_view.xml | 2 +- .../hr_timesheet_sheet_view.xml | 20 +++++------ .../report/timesheet_report_view.xml | 2 +- .../mrp/report/mrp_production_order_view.xml | 2 +- .../report/report_pos_order_view.xml | 13 ++++--- addons/project/report/project_report_view.xml | 2 +- .../report/project_issue_report_view.xml | 4 +-- .../purchase/report/purchase_report_view.xml | 34 +++++++++---------- addons/sale/report/sale_report_view.xml | 4 +-- .../stock/report/report_stock_move_view.xml | 2 +- .../report/report_stock_picking_view.xml | 2 +- 46 files changed, 111 insertions(+), 106 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 1f86fb07b90..2421c4c044d 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -193,7 +193,7 @@ -