From c9f3b0f46a833adb32e11ccdddd03c2fc9afcbfc Mon Sep 17 00:00:00 2001 From: florian da Costa Date: Mon, 27 Feb 2012 16:06:20 -0300 Subject: [PATCH 001/163] [FIX] fixed sale order line properties not copied in procurement bug lp bug: https://launchpad.net/bugs/926107 fixed bzr revid: florian.dacosta@akretion.com.br-20120227190620-ltdpop07hggjc9lb --- addons/sale/sale.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 82bfda7b580..5dca3d432f0 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -720,7 +720,8 @@ class sale_order(osv.osv): 'procure_method': line.type, 'move_id': move_id, 'company_id': order.company_id.id, - 'note': line.notes + 'note': line.notes, + 'property_ids': [(6, 0, [x.id for x in line.property_ids])] } def _prepare_order_line_move(self, cr, uid, order, line, picking_id, date_planned, context=None): From 5ba6b775acbedf74eac34fa1bc52a809585e96ff Mon Sep 17 00:00:00 2001 From: "Bhumi Thakkar (Open ERP)" Date: Tue, 8 May 2012 19:02:10 +0530 Subject: [PATCH 002/163] [IMP] Image displayed in kanban. bzr revid: bth@tinyerp.com-20120508133210-hs3ku34n957fkxvk --- addons/web_kanban/static/src/js/kanban.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 928a06d8ba2..f402573b4fc 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -581,10 +581,14 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ }, kanban_image: function(model, field, id) { id = id || ''; - var url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; - if (this.record.__last_update && this.record.__last_update.raw_value) { - var time = instance.web.str_to_datetime(this.record.__last_update.raw_value).getTime(); - url += '&t=' + time; + if (typeof(id)=="string" && this.record[field].value && this.record[field].value.substr(0, 10).indexOf(' ') == -1) { + url = 'data:image/png;base64,' + this.record[field].value; + }else{ + var url = instance.connection.prefix + '/web/binary/image?session_id=' + this.session.session_id + '&model=' + model + '&field=' + field + '&id=' + id; + if (this.record.__last_update && this.record.__last_update.raw_value) { + var time = instance.web.str_to_datetime(this.record.__last_update.raw_value).getTime(); + url += '&t=' + time; + } } return url; }, From 4afcce3a4722cddef89a1548cfd406960f8e9c23 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre <> Date: Mon, 21 May 2012 11:57:36 +0530 Subject: [PATCH 003/163] [FIX] the problem of Empty list of journals when trying to create invoice from picking lp bug: https://launchpad.net/bugs/1001806 fixed bzr revid: rmu@tinyerp.com-20120521062736-qkd3d20k0pxzn2l8 --- addons/stock/wizard/stock_invoice_onshipping.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py index 46c55311045..ca294f8ec79 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -36,7 +36,7 @@ class stock_invoice_onshipping(osv.osv_memory): context = {} model = context.get('active_model') - if not model or model != 'stock.picking': + if not model or 'stock.picking' not in model: return [] model_pool = self.pool.get(model) From 4d3944243fbfb88efdb5b5a383a403eedd1bc51f Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 11 Jun 2012 18:15:18 +0530 Subject: [PATCH 004/163] [IMP]Sale order -preventing from creating invoice without invoicing payment terms bzr revid: dhr@tinyerp.com-20120611124518-oz0nei3qccmpmnwm --- addons/sale/security/ir.model.access.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 2e08a025971..30a70a9c127 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -4,8 +4,8 @@ access_sale_order,sale.order,model_sale_order,base.group_sale_salesman,1,1,1,0 access_sale_order_line,sale.order.line,model_sale_order_line,base.group_sale_salesman,1,1,1,1 access_sale_order_line_accountant,sale.order.line accountant,model_sale_order_line,account.group_account_user,1,1,0,0 access_account_invoice_tax_salesman,account_invoice_tax salesman,account.model_account_invoice_tax,base.group_sale_salesman,1,1,1,0 -access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,1,1,0 -access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,1,1,1 +access_account_invoice_salesman,account_invoice salesman,account.model_account_invoice,base.group_sale_salesman,1,0,0,0 +access_account_invoice_manager,account_invoice manager,account.model_account_invoice,base.group_sale_manager,1,0,0,0 access_account_invoice_line_salesman,account_invoice.line salesman,account.model_account_invoice_line,base.group_sale_salesman,1,1,1,0 access_account_payment_term_salesman,account_payment_term salesman,account.model_account_payment_term,base.group_sale_salesman,1,0,0,0 access_account_analytic_account_salesman,account_analytic_account salesman,analytic.model_account_analytic_account,base.group_sale_salesman,1,1,1,0 @@ -58,4 +58,4 @@ access_product_pricelist_type_sale_manager,product.pricelist.type salemanager,pr access_product_pricelist_sale_manager,product.pricelist salemanager,product.model_product_pricelist,base.group_sale_manager,1,1,1,1 access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1 -access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0 \ No newline at end of file +access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0 From 921fe3ce3d7836191bc7ff6ad97366e98fe278fb Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 11 Jun 2012 18:37:30 +0530 Subject: [PATCH 005/163] [IMP]Sales - Open product form by sale user and manager bzr revid: dhr@tinyerp.com-20120611130730-n8eaqa596o2bn67k --- addons/sale/security/ir.model.access.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 30a70a9c127..e71c47ad23b 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -59,3 +59,5 @@ access_product_pricelist_sale_manager,product.pricelist salemanager,product.mode access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0 +access_stock_warehouse_orderpoint_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0 +access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0 From 7dbbcc58bd95fe77a49b22a2ddf86e446bb50453 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 11 Jun 2012 18:41:43 +0530 Subject: [PATCH 006/163] [IMP]Sales-No access to Product form view for sale user bzr revid: dhr@tinyerp.com-20120611131143-rsp590xxiqk1ug52 --- addons/sale/security/ir.model.access.csv | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index e71c47ad23b..23777b04378 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -59,5 +59,4 @@ access_product_pricelist_sale_manager,product.pricelist salemanager,product.mode access_product_group_res_partner_sale_manager,res_partner group_sale_manager,base.model_res_partner,base.group_sale_manager,1,1,1,0 access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0 -access_stock_warehouse_orderpoint_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0 access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0 From 68ed95181f7c91b779e09186a67b845db91901ff Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 11 Jun 2012 19:02:03 +0530 Subject: [PATCH 007/163] [IMP]Warehouse - all access of physical inventory to warehouse manager and readonly access to user bzr revid: dhr@tinyerp.com-20120611133203-d65rt11vur0yjxwh --- addons/stock/security/ir.model.access.csv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index a391f117393..19d724eb02c 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -18,10 +18,10 @@ access_stock_production_lot_user,stock.production.lot user,model_stock_productio access_stock_production_lot_revision,stock.production.lot.revision,model_stock_production_lot_revision,stock.group_stock_user,1,1,1,1 access_stock_move_manager,stock.move manager,model_stock_move,stock.group_stock_manager,1,1,0,0 access_stock_move_user,stock.move user,model_stock_move,stock.group_stock_user,1,0,0,0 -access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,1,1,1 -access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,0,0,0 -access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,1,1,1 -access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,0,0,0 +access_stock_inventory_user,stock.inventory user,model_stock_inventory,stock.group_stock_user,1,0,0,0 +access_stock_inventory_manager,stock.inventory manager,model_stock_inventory,stock.group_stock_manager,1,1,1,1 +access_stock_inventory_line_user,stock.inventory.line user,model_stock_inventory_line,stock.group_stock_user,1,0,0,0 +access_stock_inventory_line_manager,stock.inventory.line manager,model_stock_inventory_line,stock.group_stock_manager,1,1,1,1 access_stock_report_prodlots,stock.report.prodlots,model_stock_report_prodlots,stock.group_stock_manager,1,0,0,0 access_stock_location_sale_manager,stock.location sale manager,model_stock_location,base.group_sale_manager,1,0,0,0 access_stock_location_stock_manager,stock.location stock manager,model_stock_location,stock.group_stock_manager,1,0,0,0 From f34c85369f65eda08999d573f4c300c9424baa6b Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Tue, 12 Jun 2012 15:51:29 +0530 Subject: [PATCH 008/163] [IMP]Event - applying proper access rights for user and manager bzr revid: dhr@tinyerp.com-20120612102129-gqdlz6911b3h1ld6 --- addons/event/security/ir.model.access.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv index cf95d00876e..cb2d5bcbcd9 100644 --- a/addons/event/security/ir.model.access.csv +++ b/addons/event/security/ir.model.access.csv @@ -4,5 +4,5 @@ access_event_type_manager,event.type manager,model_event_type,event.group_event_ access_event_event,event.event,model_event_event,event.group_event_user,1,1,1,0 access_event_registration,event.registration,model_event_registration,event.group_event_user,1,1,1,0 access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1 -access_event_event_manager,event.event manager,model_event_event,event.group_event_manager,1,0,0,0 -access_event_registration_manager,event.registration manager,model_event_registration,event.group_event_manager,1,0,0,0 +access_event_event_manager,event.event manager,model_event_event,event.group_event_manager,1,1,1,1 +access_event_registration_manager,event.registration manager,model_event_registration,event.group_event_manager,1,1,1,1 From 06e0f2ff53f681ea7ef709b1a7de09ea6b78f07c Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Fri, 15 Jun 2012 11:34:10 +0530 Subject: [PATCH 009/163] [IMP]fixing event rights for sale user and manager to view customer form when event is installed bzr revid: dhr@tinyerp.com-20120615060410-coxn0w8ddt7jhj6x --- addons/sale/security/ir.model.access.csv | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 23777b04378..1adf5469a16 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -60,3 +60,8 @@ access_product_group_res_partner_sale_manager,res_partner group_sale_manager,bas access_product_pricelist_version_sale_manager,product.pricelist.version sale_manager,product.model_product_pricelist_version,base.group_sale_manager,1,1,1,1 access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0 access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0 +access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0 +access_event_event_sale_salesman,event.event,event.model_event_event,base.group_sale_salesman,1,0,0,0 +access_event_event_sale_manager,event.event,event.model_event_event,base.group_sale_manager,1,0,0,0 +access_event_registration_sale_salesman,event.registration,event.model_event_registration,base.group_sale_salesman,1,0,0,0 +access_event_registration_sale_manager,event.registration,event.model_event_registration,base.group_sale_manager,1,0,0,0 From 053285acd04bf9b292c543fb00abeb54117e6c01 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Fri, 15 Jun 2012 18:13:16 +0530 Subject: [PATCH 010/163] [IMP]Project - fixing access rights for project user and manager bzr revid: dhr@tinyerp.com-20120615124316-m8vx3pq2jmjl4o46 --- addons/account_analytic_analysis/security/ir.model.access.csv | 4 ++++ addons/project/security/ir.model.access.csv | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/account_analytic_analysis/security/ir.model.access.csv b/addons/account_analytic_analysis/security/ir.model.access.csv index 74425cea3dd..fdc45d8137e 100644 --- a/addons/account_analytic_analysis/security/ir.model.access.csv +++ b/addons/account_analytic_analysis/security/ir.model.access.csv @@ -3,3 +3,7 @@ access_account_analytic_analysis_summary_user_sale,account_analytic_analysis.sum access_account_analytic_analysis_summary_month_sale,account_analytic_analysis.summary.month sale,model_account_analytic_analysis_summary_month,base.group_sale_salesman,1,0,0,0 access_account_analytic_analysis_summary_user,account_analytic_analysis.summary.user,model_account_analytic_analysis_summary_user,account.group_account_manager,1,0,0,0 access_account_analytic_analysis_summary_month,account_analytic_analysis.summary.month,model_account_analytic_analysis_summary_month,account.group_account_manager,1,0,0,0 +access_account_analytic_analysis_summary_user_project,account_analytic_analysis.summary.user project,model_account_analytic_analysis_summary_user,project.group_project_manager,1,0,0,0 +access_account_analytic_analysis_summary_month_project,account_analytic_analysis.summary.month project,model_account_analytic_analysis_summary_month,project.group_project_manager,1,0,0,0 +access_account_analytic_analysis_summary_user_project_user,account_analytic_analysis.summary.user project,model_account_analytic_analysis_summary_user,project.group_project_user,1,0,0,0 +access_account_analytic_analysis_summary_month_project_user,account_analytic_analysis.summary.month project,model_account_analytic_analysis_summary_month,project.group_project_user,1,0,0,0 diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index 5b51dc85e7c..1c7dae3ebb3 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -1,6 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_project_project,project.project,model_project_project,project.group_project_user,1,1,1,1 -access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,1,1,1 +access_project_project,project.project,model_project_project,project.group_project_user,1,0,0,0 +access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1 access_project_task_work,project.task.work,model_project_task_work,project.group_project_user,1,1,1,1 From 4dddcfcb53172981ef2dd659bf60aab3aced5363 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 18 Jun 2012 12:43:39 +0530 Subject: [PATCH 011/163] [IMP]allocating all accessrights of project to a project manager bzr revid: dhr@tinyerp.com-20120618071339-101ym86uisbxmr2i --- addons/project/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index 1c7dae3ebb3..752d21131b9 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -1,5 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_project_project,project.project,model_project_project,project.group_project_user,1,0,0,0 +access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,1,1 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1 From b886574065ab8e621e76dc9ba436a0d3c20954b4 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 18 Jun 2012 15:26:30 +0530 Subject: [PATCH 012/163] [IMP]allocating read access of events to partner manager bzr revid: dhr@tinyerp.com-20120618095630-svru4lbqlbtpgdr3 --- addons/event/security/ir.model.access.csv | 2 ++ addons/sale/security/ir.model.access.csv | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/addons/event/security/ir.model.access.csv b/addons/event/security/ir.model.access.csv index cb2d5bcbcd9..8c884cfca9d 100644 --- a/addons/event/security/ir.model.access.csv +++ b/addons/event/security/ir.model.access.csv @@ -6,3 +6,5 @@ access_event_registration,event.registration,model_event_registration,event.grou access_report_event_registration,report.event.registration,model_report_event_registration,event.group_event_user,1,1,1,1 access_event_event_manager,event.event manager,model_event_event,event.group_event_manager,1,1,1,1 access_event_registration_manager,event.registration manager,model_event_registration,event.group_event_manager,1,1,1,1 +access_event_event_partner,event.event,model_event_event,base.group_partner_manager,1,0,0,0 +access_event_registration_partner,event.registration,model_event_registration,base.group_partner_manager,1,0,0,0 diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 1adf5469a16..6ef377027be 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -61,7 +61,4 @@ access_product_pricelist_version_sale_manager,product.pricelist.version sale_man access_account_invoice_report_salesman,account.invoice.report salesman,account.model_account_invoice_report,base.group_sale_salesman,1,0,0,0 access_stock_warehouse_orderpoint_sale_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_manager,1,0,0,0 access_stock_warehouse_orderpoint_sale_salesman,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,base.group_sale_salesman,1,0,0,0 -access_event_event_sale_salesman,event.event,event.model_event_event,base.group_sale_salesman,1,0,0,0 -access_event_event_sale_manager,event.event,event.model_event_event,base.group_sale_manager,1,0,0,0 -access_event_registration_sale_salesman,event.registration,event.model_event_registration,base.group_sale_salesman,1,0,0,0 -access_event_registration_sale_manager,event.registration,event.model_event_registration,base.group_sale_manager,1,0,0,0 + From 0f20a859ba7f5dfd77d7e03811671a3eb9740948 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 18 Jun 2012 18:00:34 +0530 Subject: [PATCH 013/163] [IMP]change in project manager's access right for calendar attendance bzr revid: dhr@tinyerp.com-20120618123034-covf7ordsjaux5l0 --- addons/project_long_term/security/ir.model.access.csv | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/project_long_term/security/ir.model.access.csv b/addons/project_long_term/security/ir.model.access.csv index 6ca496f691d..2a00088b8f4 100644 --- a/addons/project_long_term/security/ir.model.access.csv +++ b/addons/project_long_term/security/ir.model.access.csv @@ -7,3 +7,6 @@ access_resource_resource_user,user.user user,resource.model_resource_resource,pr access_resource_calendar_leaves_user,user.calendar.leaves user,resource.model_resource_calendar_leaves,project.group_project_user,1,1,1,1 access_resource_resource_manager,user.user manager,resource.model_resource_resource,project.group_project_manager,1,1,1,1 access_project_user_allocation_manager,project.user.allocation.manager,model_project_user_allocation,project.group_project_manager,1,1,1,1 +access_project_resource_calendar_attendance,resource.calendar.attendance,resource.model_resource_calendar_attendance,project.group_project_manager,1,0,0,0 + + From ded491ae3ea53fc1c339a2e7c906b4534f450b61 Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Mon, 18 Jun 2012 18:13:05 +0530 Subject: [PATCH 014/163] [IMP]project user read access to analytic account bzr revid: dhr@tinyerp.com-20120618124305-6la3hyl6gz0t27jv --- addons/project/security/ir.model.access.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/project/security/ir.model.access.csv b/addons/project/security/ir.model.access.csv index 752d21131b9..dceafa9fe87 100644 --- a/addons/project/security/ir.model.access.csv +++ b/addons/project/security/ir.model.access.csv @@ -1,6 +1,7 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_project_project,project.project,model_project_project,project.group_project_user,1,0,0,0 access_project_project_manager,project.project,model_project_project,project.group_project_manager,1,1,1,1 +access_account_analytic_account_user,account.analytic.account,analytic.model_account_analytic_account,project.group_project_user,1,0,0,0 access_account_analytic_account,account.analytic.account,analytic.model_account_analytic_account,project.group_project_manager,1,1,1,1 access_project_task_type_user,project.task.type user,model_project_task_type,project.group_project_user,1,1,1,1 access_project_task,project.task,model_project_task,project.group_project_user,1,1,1,1 From b366ef0544e0fcbddd5bf470d42054f069a4e34b Mon Sep 17 00:00:00 2001 From: "Dharti Ratani (OpenERP)" Date: Thu, 21 Jun 2012 10:46:16 +0530 Subject: [PATCH 015/163] [IMP]Allocating read access of product form to group purchase manager bzr revid: dhr@tinyerp.com-20120621051616-bk606ej84oauqbzn --- addons/mrp/security/ir.model.access.csv | 1 + addons/purchase/security/ir.model.access.csv | 1 + 2 files changed, 2 insertions(+) diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index cd6b8db2195..5d254f86b4e 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -80,3 +80,4 @@ access_product_pricelist_item_mrp_manager,product.pricelist.item mrp_manager,pro access_resource_calendar_manufacturinguser,resource.calendar manufacturing.user,resource.model_resource_calendar,mrp.group_mrp_user,1,0,0,0 access_account_journal_mrp_manager,account.journal mrp manager,account.model_account_journal,mrp.group_mrp_manager,1,0,0,0 access_purchase_order_stock_user,purchase.order stock user,purchase.model_purchase_order,stock.group_stock_user,1,1,1,0 +access_mrp_bom_purchase_manager,mrp.bom,model_mrp_bom,purchase.group_purchase_manager,1,0,0,0 diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index b19a62bf5d1..c45b8a9b070 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -64,3 +64,4 @@ access_account_account_purchase_manager,account.account purchase manager,account access_account_journal_purchase_manager,account.journal purchase manager,account.model_account_journal,purchase.group_purchase_manager,1,0,0,0 access_stock_tracking_purchase_user,stock.tracking purchase.user,stock.model_stock_tracking,purchase.group_purchase_user,1,1,1,0 access_stock_location_purchase_manager,stock.location purchase manager,stock.model_stock_location,purchase.group_purchase_manager,1,0,0,0 +access_stock_warehouse_orderpoint_manager,stock.warehouse.orderpoint,procurement.model_stock_warehouse_orderpoint,purchase.group_purchase_manager,1,0,0,0 From 70b78feb630a35f34312229fbd3e7ea805fc9bed Mon Sep 17 00:00:00 2001 From: "Jiten (OpenERP)" Date: Fri, 22 Jun 2012 11:44:47 +0530 Subject: [PATCH 016/163] [IMP] Improved kanban_image for o2m list(e.g. contacts of company). bzr revid: jra@tinyerp.com-20120622061447-kszcg6tq9q5qjctr --- addons/web_kanban/static/src/js/kanban.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 6811953465d..483f84aa3c5 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -718,6 +718,9 @@ instance.web_kanban.KanbanRecord = instance.web.OldWidget.extend({ // Set the cache duration in seconds. url += '&cache=' + parseInt(cache, 10); } + if (typeof(id)=="string" && this.record[field].value && this.record[field].value.substr(0, 10).indexOf(' ') == -1) { + url = 'data:image/png;base64,' + this.record[field].value; + } return url; }, kanban_text_ellipsis: function(s, size) { From 145656b555cc61e5d2d9154d3c127c73522c6f3e Mon Sep 17 00:00:00 2001 From: "Foram Katharotiya (OpenERP)" Date: Tue, 26 Jun 2012 15:56:18 +0530 Subject: [PATCH 017/163] [IMP] change form view of registration in event module bzr revid: fka@tinyerp.com-20120626102618-py2cnj472tzofwbw --- addons/event/event_view.xml | 86 +++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 41 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index ed539e7bf39..c577c43a2e2 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -362,50 +362,54 @@ From 5e973e676b62155c6155db3f1c7c0a34b9ee4336 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 5 Jul 2012 10:00:09 +0200 Subject: [PATCH 073/163] [FIX] base_calendar: move method accessing opportunities and phone calls back to module crm bzr revid: rco@openerp.com-20120705080009-dine29zce1d865rw --- addons/base_calendar/crm_meeting.py | 30 ----------------------------- addons/crm/crm_meeting.py | 27 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 30 deletions(-) diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py index 7c18f6826e8..dcc97156681 100644 --- a/addons/base_calendar/crm_meeting.py +++ b/addons/base_calendar/crm_meeting.py @@ -66,11 +66,6 @@ class crm_meeting(base_state, osv.Model): 'state': 'draft', } - def create(self, cr, uid, vals, context=None): - obj_id = super(crm_meeting, self).create(cr, uid, vals, context=context) - self.create_send_note(cr, uid, [obj_id], context=context) - return obj_id - # ---------------------------------------- # OpenChatter # ---------------------------------------- @@ -78,31 +73,6 @@ class crm_meeting(base_state, osv.Model): def case_get_note_msg_prefix(self, cr, uid, id, context=None): return 'Meeting' - def create_send_note(self, cr, uid, ids, context=None): - if context is None: - context = {} - # update context: if come from phonecall, default state values can make the message_append_note crash - context.pop('default_state', False) - for meeting in self.browse(cr, uid, ids, context=context): - # convert datetime field to a datetime, using server format, then - # convert it to the user TZ and re-render it with %Z to add the timezone - meeting_datetime = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT) - meeting_date_str = fields.datetime.context_timestamp(cr, uid, meeting_datetime, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)") - message = _("A meeting has been scheduled on %s.") % (meeting_date_str) - if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent - lead = meeting.opportunity_id - parent_message = _("Meeting linked to the opportunity %s has been created and cscheduled on %s.") % (lead.name, meeting.date) - lead.message_append_note(_('System Notification'), message) - elif meeting.phonecall_id: - phonecall = meeting.phonecall_id - parent_message = _("Meeting linked to the phonecall %s has been created and cscheduled on %s.") % (phonecall.name, meeting.date) - phonecall.message_append_note(body=message) - else: - parent_message = message - if parent_message: - meeting.message_append_note(body=parent_message) - return True - def case_open_send_note(self, cr, uid, ids, context=None): return self.message_append_note(cr, uid, ids, body=_("Meeting has been confirmed."), context=context) diff --git a/addons/crm/crm_meeting.py b/addons/crm/crm_meeting.py index e16e03f2206..bdc5e91ad33 100644 --- a/addons/crm/crm_meeting.py +++ b/addons/crm/crm_meeting.py @@ -38,6 +38,33 @@ class crm_meeting(osv.Model): 'opportunity_id': fields.many2one ('crm.lead', 'Opportunity', domain="[('type', '=', 'opportunity')]"), } + def create(self, cr, uid, vals, context=None): + obj_id = super(crm_meeting, self).create(cr, uid, vals, context=context) + self.create_send_note(cr, uid, [obj_id], context=context) + return obj_id + + def create_send_note(self, cr, uid, ids, context=None): + if context is None: + context = {} + # update context: if come from phonecall, default state values can make the message_append_note crash + context.pop('default_state', False) + for meeting in self.browse(cr, uid, ids, context=context): + # in the message, transpose meeting.date to the timezone of the current user + meeting_date = fields.DT.datetime.strptime(meeting.date, tools.DEFAULT_SERVER_DATETIME_FORMAT) + meeting_date_tz = fields.datetime.context_timestamp(cr, uid, meeting_date, context=context).strftime(tools.DATETIME_FORMATS_MAP['%+'] + " (%Z)") + if meeting.opportunity_id: # meeting can be create from phonecalls or opportunities, therefore checking for the parent + lead = meeting.opportunity_id + message = _("Meeting linked to the opportunity %s has been created and scheduled on %s.") % (lead.name, meeting_date_tz) + lead.message_append_note(_('System Notification'), message) + elif meeting.phonecall_id: + phonecall = meeting.phonecall_id + message = _("Meeting linked to the phonecall %s has been created and scheduled on %s.") % (phonecall.name, meeting_date_tz) + phonecall.message_append_note(body=message) + else: + message = _("A meeting has been scheduled on %s.") % (meeting_date_tz) + meeting.message_append_note(body=message) + return True + class calendar_attendee(osv.osv): """ Calendar Attendee """ From 7163de4d2c42cf507448ec2ac391affba844ff9f Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 5 Jul 2012 10:06:16 +0200 Subject: [PATCH 074/163] [FIX] base_calendar: define access rights for crm.meeting and crm.meeting.type bzr revid: rco@openerp.com-20120705080616-k9rhleajvmdg0ieu --- addons/base_calendar/security/ir.model.access.csv | 6 ++++++ addons/crm/security/ir.model.access.csv | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/base_calendar/security/ir.model.access.csv b/addons/base_calendar/security/ir.model.access.csv index 34543f0e912..24af1abf0e5 100644 --- a/addons/base_calendar/security/ir.model.access.csv +++ b/addons/base_calendar/security/ir.model.access.csv @@ -5,3 +5,9 @@ access_res_alarm,res.alarm,model_res_alarm,base.group_user,1,1,1,1 access_calendar_todo,calendar.todo,model_calendar_todo,base.group_user,1,1,1,1 access_calendar_event,calendar.event,model_calendar_event,base.group_user,1,1,1,1 access_calendar_attendee_survey_user,calendar.attendee,model_calendar_attendee,base.group_survey_user,1,0,0,0 +access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1 +access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0 +access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0 +access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1 +access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_sale_manager,1,1,1,0 +access_crm_meeting_type_manager,crm.meeting.type.manager,model_crm_meeting_type,base.group_system,1,1,1,1 diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index 7707118324f..5665839f365 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -7,12 +7,9 @@ access_crm_case_channel_user,crm.case.channel user,model_crm_case_channel,base.g access_crm_case_channel_manager,crm.case.channel manager,model_crm_case_channel,base.group_sale_manager,1,1,1,1 access_crm_case_section,crm.case.section,model_crm_case_section,base.group_user,1,0,0,0 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_sale_salesman,1,1,1,0 -access_crm_meeting_manager,crm.meeting.manager,model_crm_meeting,base.group_sale_manager,1,1,1,1 access_crm_lead_manager,crm.lead.manager,model_crm_lead,base.group_sale_manager,1,1,1,1 access_crm_phonecall_manager,crm.phonecall.manager,model_crm_phonecall,base.group_sale_manager,1,1,1,1 access_crm_case_categ,crm.case.categ,model_crm_case_categ,base.group_user,1,0,0,0 -access_crm_meeting,crm.meeting,model_crm_meeting,base.group_sale_salesman,1,1,1,0 -access_crm_meeting_all,crm.meeting_allll,model_crm_meeting,base.group_user,1,0,0,0 access_crm_lead,crm.lead,model_crm_lead,base.group_sale_salesman,1,1,1,0 access_crm_lead_all,crm.lead.all,model_crm_lead,base.group_user,1,0,0,0 access_crm_phonecall,crm.phonecall,model_crm_phonecall,base.group_sale_salesman,1,1,1,0 @@ -40,4 +37,3 @@ access_crm_lead_report_user,crm.lead.report user,model_crm_lead_report,base.grou access_res_partner_bank_type_crm_user,res.partner.bank.type.crm.user,base.model_res_partner_bank_type,base.group_sale_salesman,1,0,0,0 access_crm_lead_partner_manager,crm.lead.partner.manager,model_crm_lead,base.group_partner_manager,1,0,0,0 access_crm_phonecall_partner_manager,crm.phonecall.partner.manager,model_crm_phonecall,base.group_partner_manager,1,1,1,1 -access_crm_meeting_partner_manager,crm.meeting.partner.manager,model_crm_meeting,base.group_partner_manager,1,1,1,1 From 76500b8a5e9d6f80b9734a2df3f1d5b09ff98e64 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 5 Jul 2012 10:06:59 +0200 Subject: [PATCH 075/163] [IMP] hr_holidays: remove dependency on module crm bzr revid: rco@openerp.com-20120705080659-983x3zcr3cdz48ob --- addons/hr_holidays/__openerp__.py | 2 +- addons/hr_holidays/hr_holidays.py | 40 +++++++++---------------- addons/hr_holidays/hr_holidays_view.xml | 13 ++------ 3 files changed, 17 insertions(+), 38 deletions(-) diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 09809e488ba..c5c2d370cd1 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -50,7 +50,7 @@ Note that: for example, you maybe will do it for the user 'admin'. """, 'images': ['images/hr_allocation_requests.jpeg', 'images/hr_leave_requests.jpeg', 'images/leaves_analysis.jpeg'], - 'depends': ['hr', 'crm', 'process', 'resource'], + 'depends': ['hr', 'base_calendar', 'process', 'resource'], 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py index a1ab0ae04f3..2a2648f1beb 100644 --- a/addons/hr_holidays/hr_holidays.py +++ b/addons/hr_holidays/hr_holidays.py @@ -74,7 +74,8 @@ class hr_holidays_status(osv.osv): _columns = { 'name': fields.char('Leave Type', size=64, required=True, translate=True), - 'categ_id': fields.many2one('crm.case.categ', 'Meeting', domain="[('object_id.model', '=', 'crm.meeting')]", help='If you set a meeting type, OpenERP will create a meeting in the calendar once a leave is validated.'), + 'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type', + help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'), 'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Departement'), 'limit': fields.boolean('Allow to Override Limit', help='If you select this checkbox, the system allows the employees to take more leaves than the available ones for this type.'), 'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."), @@ -128,7 +129,7 @@ class hr_holidays(osv.osv): 'notes': fields.text('Reasons',readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'number_of_days_temp': fields.float('Number of Days', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}), 'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True), - 'case_id': fields.many2one('crm.meeting', 'Meeting'), + 'meeting_id': fields.many2one('crm.meeting', 'Meeting'), 'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True), 'parent_id': fields.many2one('hr.holidays', 'Parent'), 'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',), @@ -217,19 +218,12 @@ class hr_holidays(osv.osv): } return result - def onchange_sec_id(self, cr, uid, ids, status, context=None): - warning = {} + def onchange_status_id(self, cr, uid, ids, status_id, context=None): double_validation = False - obj_holiday_status = self.pool.get('hr.holidays.status') - if status: - holiday_status = obj_holiday_status.browse(cr, uid, status, context=context) + if status_id: + holiday_status = self.pool.get('hr.holidays.status').browse(cr, uid, status_id, context=context) double_validation = holiday_status.double_validation - if holiday_status.categ_id and holiday_status.categ_id.section_id and not holiday_status.categ_id.section_id.allow_unlink: - warning = { - 'title': "Warning for ", - 'message': "You won\'t be able to cancel this leave request because the CRM Sales Team of the leave type disallows." - } - return {'warning': warning, 'value': {'double_validation': double_validation}} + return {'value': {'double_validation': double_validation}} def set_to_draft(self, cr, uid, ids, context=None): self.write(cr, uid, ids, { @@ -271,7 +265,7 @@ class hr_holidays(osv.osv): holiday_ids.append(record.id) if record.holiday_type == 'employee' and record.type == 'remove': meeting_obj = self.pool.get('crm.meeting') - vals = { + meeting_vals = { 'name': record.name, 'categ_id': record.holiday_status_id.categ_id.id, 'duration': record.number_of_days_temp * 8, @@ -280,11 +274,11 @@ class hr_holidays(osv.osv): 'date': record.date_from, 'end_date': record.date_to, 'date_deadline': record.date_to, - 'leave_id': record.id, + 'state': 'done', # to block that meeting date in the calendar } - case_id = meeting_obj.create(cr, uid, vals) + meeting_id = meeting_obj.create(cr, uid, meeting_vals) self._create_resource_leave(cr, uid, [record], context=context) - self.write(cr, uid, ids, {'case_id': case_id}) + self.write(cr, uid, ids, {'meeting_id': meeting_id}) elif record.holiday_type == 'category': emp_ids = obj_emp.search(cr, uid, [('category_ids', 'child_of', [record.category_id.id])]) leave_ids = [] @@ -330,11 +324,11 @@ class hr_holidays(osv.osv): return True def holidays_cancel(self, cr, uid, ids, context=None): - obj_crm_meeting = self.pool.get('crm.meeting') + meeting_obj = self.pool.get('crm.meeting') for record in self.browse(cr, uid, ids): # Delete the meeting - if record.case_id: - obj_crm_meeting.unlink(cr, uid, [record.case_id.id]) + if record.meeting_id: + meeting_obj.unlink(cr, uid, [record.meeting_id.id]) # If a category that created several holidays, cancel all related wf_service = netsvc.LocalService("workflow") @@ -519,10 +513,4 @@ class hr_employee(osv.osv): hr_employee() -class crm_meeting(osv.osv): - _inherit = 'crm.meeting' - _columns = { - 'leave_id': fields.many2one('hr.holidays','Leave'), - } - # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index bda18f1bc6c..dc541b20ceb 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -122,7 +122,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -556,14 +556,5 @@ - - From c9345ee6583c8f8231f7bf90bebe81f53053c279 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Thu, 5 Jul 2012 10:31:57 +0200 Subject: [PATCH 076/163] [FIX] crm_caldav: fix incorrect field references (because crm.meeting changed module) bzr revid: rco@openerp.com-20120705083157-b8kgwb12c6u182hs --- addons/crm_caldav/crm_caldav_setup.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/addons/crm_caldav/crm_caldav_setup.xml b/addons/crm_caldav/crm_caldav_setup.xml index 7e20a318e4f..36f3c3fd78b 100644 --- a/addons/crm_caldav/crm_caldav_setup.xml +++ b/addons/crm_caldav/crm_caldav_setup.xml @@ -29,7 +29,7 @@ [('user_id','=', dctx_user_id)] vevent - + @@ -103,7 +103,7 @@ - + field @@ -127,7 +127,7 @@ - + field @@ -163,7 +163,7 @@ - + {'tentative': 'draft', 'confirmed': 'open', 'cancelled': 'cancel'} field @@ -176,7 +176,7 @@ - + datetime_utc From c5d9158a292c6439d4192cbd2601b15ae9ee51b5 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Thu, 5 Jul 2012 14:38:30 +0530 Subject: [PATCH 077/163] [IMP]event: remove conflict bzr revid: kjo@tinyerp.com-20120705090830-trou4tqk01ylqqqh --- addons/event/event_view.xml | 51 ++++--------------------------------- 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 34b3b6b71ad..1019706f8db 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -462,9 +462,8 @@ -<<<<<<< TREE - +
+
+ i +
+
+

+
+ By: +

+
+ Open From: + + + , + + +

+
+ Rate: + Fill +
+
+
From a47b42cd69dec5ef4fde79ba94cb21f86691f870 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 5 Jul 2012 18:32:58 +0530 Subject: [PATCH 087/163] [IMP] remove extra class bzr revid: dbr@tinyerp.com-20120705130258-0fmma20qwhv2vssg --- addons/survey/survey_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index c1e0355073c..a8a8c59f24b 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -316,7 +316,7 @@ -
+
i
    From 58549bc503cd715589c4da32e9c4dbde4e419b6a Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 5 Jul 2012 18:46:54 +0530 Subject: [PATCH 088/163] [IMP]String imp bzr revid: dbr@tinyerp.com-20120705131654-fy1c092kne3bwftj --- addons/survey/survey_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml index a8a8c59f24b..8aeec213648 100644 --- a/addons/survey/survey_view.xml +++ b/addons/survey/survey_view.xml @@ -331,8 +331,8 @@ By:

- Open From: + Opened at , From 5babd88330af133b3bc893ed6e30b42eb2b7fa03 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Fri, 6 Jul 2012 05:07:51 +0000 Subject: [PATCH 089/163] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120706045835-psdlu6pet8cabwna bzr revid: launchpad_translations_on_behalf_of_openerp-20120706050751-xzq60elhr5ajn5i6 --- addons/account/i18n/ja.po | 10 +- addons/crm/i18n/ja.po | 20 +- addons/crm_claim/i18n/ja.po | 10 +- addons/crm_fundraising/i18n/ja.po | 12 +- addons/crm_helpdesk/i18n/ja.po | 14 +- addons/crm_partner_assign/i18n/ja.po | 8 +- addons/crm_profiling/i18n/ja.po | 10 +- addons/edi/i18n/ar.po | 26 +- addons/project/i18n/hr.po | 18 +- addons/stock_planning/i18n/ja.po | 4 +- addons/survey/i18n/ja.po | 358 ++++++++++++++------------- addons/web_process/i18n/nl.po | 10 +- 12 files changed, 251 insertions(+), 249 deletions(-) diff --git a/addons/account/i18n/ja.po b/addons/account/i18n/ja.po index 21c7bea93f3..d71bbe0de56 100644 --- a/addons/account/i18n/ja.po +++ b/addons/account/i18n/ja.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 00:35+0000\n" -"PO-Revision-Date: 2012-06-20 16:18+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-07-06 02:41+0000\n" +"Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-22 04:38+0000\n" -"X-Generator: Launchpad (build 15461)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: account #: view:account.invoice.report:0 @@ -4942,7 +4942,7 @@ msgstr "会計表" #. module: account #: field:account.journal.column,name:0 msgid "Column Name" -msgstr "カラム名" +msgstr "列名" #. module: account #: view:account.general.journal:0 diff --git a/addons/crm/i18n/ja.po b/addons/crm/i18n/ja.po index f0761c35843..3454896c55a 100644 --- a/addons/crm/i18n/ja.po +++ b/addons/crm/i18n/ja.po @@ -8,19 +8,19 @@ 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-06-11 07:49+0000\n" -"Last-Translator: Tomomi Mengelberg \n" +"PO-Revision-Date: 2012-07-06 04:15+0000\n" +"Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-12 04:55+0000\n" -"X-Generator: Launchpad (build 15389)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: crm #: view:crm.lead.report:0 msgid "# Leads" -msgstr "# リード" +msgstr "リード番号" #. module: crm #: view:crm.lead:0 selection:crm.lead,type:0 view:crm.lead.report:0 @@ -36,12 +36,12 @@ msgstr "必要なサービス" #. module: crm #: selection:crm.meeting,rrule_type:0 msgid "Monthly" -msgstr "毎月" +msgstr "月次" #. module: crm #: model:ir.model,name:crm.model_crm_case_stage msgid "Stage of case" -msgstr "お問い合わせ対応状況" +msgstr "案件のステージ" #. module: crm #: view:crm.meeting:0 @@ -82,7 +82,7 @@ msgstr " " #. module: crm #: view:crm.lead.report:0 field:crm.phonecall.report,delay_close:0 msgid "Delay to close" -msgstr "" +msgstr "閉鎖の遅延" #. module: crm #: view:crm.lead:0 @@ -114,13 +114,13 @@ msgstr "日" #. module: crm #: sql_constraint:crm.case.section:0 msgid "The code of the sales team must be unique !" -msgstr "" +msgstr "営業チームのコードは固有である必要があります。" #. module: crm #: code:addons/crm/crm_lead.py:553 #, python-format msgid "Lead '%s' has been converted to an opportunity." -msgstr "" +msgstr "リード %s はオポチュニティに変換されました。" #. module: crm #: code:addons/crm/crm_lead.py:294 diff --git a/addons/crm_claim/i18n/ja.po b/addons/crm_claim/i18n/ja.po index f76197d8d79..0d6587f3b09 100644 --- a/addons/crm_claim/i18n/ja.po +++ b/addons/crm_claim/i18n/ja.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 00:36+0000\n" -"PO-Revision-Date: 2012-06-09 18:59+0000\n" +"PO-Revision-Date: 2012-07-06 04:04+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n" -"X-Generator: Launchpad (build 15376)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: crm_claim #: field:crm.claim.report,nbr:0 @@ -249,7 +249,7 @@ msgstr "次のアクション" #. module: crm_claim #: view:crm.claim.report:0 msgid "My Sales Team(s)" -msgstr "私の販売チーム" +msgstr "私の営業チーム" #. module: crm_claim #: model:crm.case.stage,name:crm_claim.stage_claim3 @@ -670,7 +670,7 @@ msgstr "クレームを検索する" #: field:crm.claim,section_id:0 #: view:crm.claim.report:0 msgid "Sales Team" -msgstr "販売チーム" +msgstr "営業チーム" #. module: crm_claim #: selection:crm.claim.report,month:0 diff --git a/addons/crm_fundraising/i18n/ja.po b/addons/crm_fundraising/i18n/ja.po index e094f9ed8d0..0fbac12e0f4 100644 --- a/addons/crm_fundraising/i18n/ja.po +++ b/addons/crm_fundraising/i18n/ja.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 00:36+0000\n" -"PO-Revision-Date: 2012-06-09 19:04+0000\n" +"PO-Revision-Date: 2012-07-06 04:05+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-10 04:37+0000\n" -"X-Generator: Launchpad (build 15376)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: crm_fundraising #: field:crm.fundraising,planned_revenue:0 @@ -236,7 +236,7 @@ msgstr "最低" #: view:crm.fundraising:0 #: view:crm.fundraising.report:0 msgid "My Sales Team(s)" -msgstr "私の販売チーム" +msgstr "私の営業チーム" #. module: crm_fundraising #: field:crm.fundraising,create_date:0 @@ -626,7 +626,7 @@ msgstr "責任者" msgid "" "Sales team to which Case belongs to. Define Responsible user and Email " "account for mail gateway." -msgstr "案件が割当てられた販売チーム。担当ユーザとEメール・アカウントを指定します。" +msgstr "案件が割当てられた営業チーム。担当ユーザとEメール・アカウントを指定します。" #. module: crm_fundraising #: model:ir.model,name:crm_fundraising.model_crm_fundraising_report @@ -763,7 +763,7 @@ msgstr "高い" #: field:crm.fundraising,section_id:0 #: view:crm.fundraising.report:0 msgid "Sales Team" -msgstr "販売チーム" +msgstr "営業チーム" #. module: crm_fundraising #: field:crm.fundraising.report,create_date:0 diff --git a/addons/crm_helpdesk/i18n/ja.po b/addons/crm_helpdesk/i18n/ja.po index 3228f329919..156399a8159 100644 --- a/addons/crm_helpdesk/i18n/ja.po +++ b/addons/crm_helpdesk/i18n/ja.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 00:36+0000\n" -"PO-Revision-Date: 2012-05-28 19:12+0000\n" -"Last-Translator: Masaki Yamaya \n" +"PO-Revision-Date: 2012-07-06 04:05+0000\n" +"Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-29 04:46+0000\n" -"X-Generator: Launchpad (build 15316)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: crm_helpdesk #: field:crm.helpdesk.report,delay_close:0 @@ -207,7 +207,7 @@ msgstr "Eメールの数" #: view:crm.helpdesk:0 #: view:crm.helpdesk.report:0 msgid "My Sales Team(s)" -msgstr "私の販売チーム" +msgstr "私の営業チーム" #. module: crm_helpdesk #: field:crm.helpdesk,create_date:0 @@ -533,7 +533,7 @@ msgstr "催促を送る" msgid "" "Sales team to which Case belongs to. Define " "Responsible user and Email account for mail gateway." -msgstr "事象を割り当てる販売チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。" +msgstr "事象を割り当てる営業チーム。メールゲートウェイにと担当ユーザとEメールアカウントを作って下さい。" #. module: crm_helpdesk #: view:crm.helpdesk:0 @@ -708,7 +708,7 @@ msgstr "高い" #: field:crm.helpdesk,section_id:0 #: view:crm.helpdesk.report:0 msgid "Sales Team" -msgstr "販売チーム" +msgstr "営業チーム" #. module: crm_helpdesk #: field:crm.helpdesk,date_action_last:0 diff --git a/addons/crm_partner_assign/i18n/ja.po b/addons/crm_partner_assign/i18n/ja.po index 043ade7d9cc..b3c1547c154 100644 --- a/addons/crm_partner_assign/i18n/ja.po +++ b/addons/crm_partner_assign/i18n/ja.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 00:36+0000\n" -"PO-Revision-Date: 2012-05-25 04:47+0000\n" +"PO-Revision-Date: 2012-07-06 04:06+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-28 04:40+0000\n" -"X-Generator: Launchpad (build 15505)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: crm_partner_assign #: field:crm.lead.forward.to.partner,send_to:0 @@ -858,7 +858,7 @@ msgstr "高" #: field:crm.lead.report.assign,section_id:0 #: field:crm.partner.report.assign,section_id:0 msgid "Sales Team" -msgstr "販売チーム" +msgstr "営業チーム" #. module: crm_partner_assign #: field:crm.lead.report.assign,create_date:0 diff --git a/addons/crm_profiling/i18n/ja.po b/addons/crm_profiling/i18n/ja.po index bb07a87bb23..2f8aa5ef26c 100644 --- a/addons/crm_profiling/i18n/ja.po +++ b/addons/crm_profiling/i18n/ja.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 00:36+0000\n" -"PO-Revision-Date: 2012-05-10 18:04+0000\n" -"Last-Translator: Raphael Collet (OpenERP) \n" +"PO-Revision-Date: 2012-07-06 04:06+0000\n" +"Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-05-11 05:04+0000\n" -"X-Generator: Launchpad (build 15225)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: crm_profiling #: view:crm_profiling.questionnaire:0 @@ -30,7 +30,7 @@ msgid "" "segmentation tool allows you to automatically assign a partner to a category " "according to his answers to the different questionnaires." msgstr "" -"特定のトピックに関連した質問票を作成して、それを使って販売チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート" +"特定のトピックに関連した質問票を作成して、それを使って営業チームが適切な質問をするように指導できます。区分ツールを使って、質問に対する回答に応じて、パート" "ナを自動的に区分することができます。" #. module: crm_profiling diff --git a/addons/edi/i18n/ar.po b/addons/edi/i18n/ar.po index 486cbbc8533..4a1208670d7 100644 --- a/addons/edi/i18n/ar.po +++ b/addons/edi/i18n/ar.po @@ -8,19 +8,19 @@ 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-04-06 00:12+0000\n" -"Last-Translator: FULL NAME \n" +"PO-Revision-Date: 2012-07-06 02:21+0000\n" +"Last-Translator: Ahmad Khayyat \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-04-07 04:56+0000\n" -"X-Generator: Launchpad (build 15060)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: edi #: sql_constraint:res.currency:0 msgid "The currency code must be unique per company!" -msgstr "" +msgstr "يجب أن يكون رمز العملة فريداً للشركة!" #. module: edi #: model:ir.model,name:edi.model_res_partner_address @@ -30,12 +30,12 @@ msgstr "عناوين الشريك" #. module: edi #: sql_constraint:res.company:0 msgid "The company name must be unique !" -msgstr "اسم الشركة يجب أن يكون فريداً !" +msgstr "يجب أن يكون اسم الشركة فريداً !" #. module: edi #: constraint:res.partner:0 msgid "Error ! You cannot create recursive associated members." -msgstr "" +msgstr "خطأ ! لا يمكنك إنشاء أعضاء مرتبطين و متداخلين." #. module: edi #: field:edi.document,name:0 @@ -111,12 +111,12 @@ msgstr "مستند" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:23 msgid "View/Print" -msgstr "" +msgstr "عرض/طباعة" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:28 msgid "Import this document" -msgstr "" +msgstr "إستيراد هذه الوثيقة" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:33 @@ -126,7 +126,7 @@ msgstr "" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:36 msgid "OpenERP instance address:" -msgstr "عنوان مثال أوبنيرب:" +msgstr "عنوان نسخة أوبن إي آر بي:" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:39 @@ -177,7 +177,7 @@ msgstr "" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:60 msgid "OpenERP documentation" -msgstr "وثائق أوبنيرب" +msgstr "توثيق أوبن إي آر بي" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:61 @@ -202,12 +202,12 @@ msgstr "تحميل" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87 msgid "Powered by" -msgstr "مدعوم من kifcaliph و" +msgstr "يتم تشغيل هذا التطبيق بواسطة" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi.xml:87 msgid "OpenERP" -msgstr "أوبنيرب" +msgstr "أوبن إي آر بي" #. openerp-web #: /home/odo/repositories/addons/trunk/edi/static/src/xml/edi_account.xml:34 diff --git a/addons/project/i18n/hr.po b/addons/project/i18n/hr.po index ea508ead52c..83182e409ef 100644 --- a/addons/project/i18n/hr.po +++ b/addons/project/i18n/hr.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 6.0dev\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 01:37+0100\n" -"PO-Revision-Date: 2010-08-03 09:16+0000\n" -"Last-Translator: Mantavya Gajjar (Open ERP) \n" +"PO-Revision-Date: 2012-07-05 11:02+0000\n" +"Last-Translator: Marko Carevic \n" "Language-Team: Vinteh\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-06-28 04:36+0000\n" -"X-Generator: Launchpad (build 15505)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" "Language: hr\n" #. module: project @@ -108,7 +108,7 @@ msgstr "Sati za procjenu" #. module: project #: view:project.project:0 msgid "Pending Projects" -msgstr "" +msgstr "Projekti na čekanju" #. module: project #: help:project.task,remaining_hours:0 @@ -191,7 +191,7 @@ msgstr "Tvrtka" #. module: project #: view:report.project.task.user:0 msgid "Pending tasks" -msgstr "" +msgstr "Zadaci na čekanju" #. module: project #: field:project.task.delegate,prefix:0 @@ -206,7 +206,7 @@ msgstr "" #. module: project #: model:process.transition.action,name:project.process_transition_action_openpendingtask0 msgid "Set pending" -msgstr "Postavite u tijeku" +msgstr "Staviti na čekanje" #. module: project #: selection:project.task,priority:0 @@ -641,7 +641,7 @@ msgstr "Srednji" #. module: project #: view:project.task:0 view:project.task.history.cumulative:0 msgid "Pending Tasks" -msgstr "" +msgstr "Zadaci na čekanju" #. module: project #: view:project.task:0 field:project.task,remaining_hours:0 @@ -705,7 +705,7 @@ msgstr "" #: selection:project.vs.hours,state:0 view:report.project.task.user:0 #: selection:report.project.task.user,state:0 selection:task.by.days,state:0 msgid "Pending" -msgstr "U toku" +msgstr "Na čekanju" #. module: project #: field:project.task.delegate,name:0 diff --git a/addons/stock_planning/i18n/ja.po b/addons/stock_planning/i18n/ja.po index a9c9426d479..4e21f56fa79 100644 --- a/addons/stock_planning/i18n/ja.po +++ b/addons/stock_planning/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-05 04:49+0000\n" -"X-Generator: Launchpad (build 15544)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: stock_planning #: code:addons/stock_planning/wizard/stock_planning_createlines.py:73 diff --git a/addons/survey/i18n/ja.po b/addons/survey/i18n/ja.po index b92f178c95a..b3670aba55e 100644 --- a/addons/survey/i18n/ja.po +++ b/addons/survey/i18n/ja.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 00:37+0000\n" -"PO-Revision-Date: 2012-07-05 03:55+0000\n" +"PO-Revision-Date: 2012-07-06 03:16+0000\n" "Last-Translator: Akira Hiyama \n" "Language-Team: Japanese \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-05 04:49+0000\n" -"X-Generator: Launchpad (build 15544)\n" +"X-Launchpad-Export-Date: 2012-07-06 04:58+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. module: survey #: view:survey.print:0 @@ -30,7 +30,7 @@ msgid "" "Minimum Required Answer you entered is " "greater than the number of answer. " "Please use a number that is smaller than %d." -msgstr "あなたが入力した最低必要な回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。" +msgstr "あなたが入力した最小必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。" #. module: survey #: view:survey.question.wiz:0 @@ -50,7 +50,7 @@ msgid "" "Maximum Required Answer you entered for " "your maximum is greater than the number of answer. " " Please use a number that is smaller than %d." -msgstr "あなたが入力した最大必要な回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。" +msgstr "あなたが入力した最大必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。" #. module: survey #: view:survey:0 @@ -142,7 +142,7 @@ msgstr "コメント項目の許可" #: selection:survey.print,paper_size:0 #: selection:survey.print.answer,paper_size:0 msgid "A4 (210mm x 297mm)" -msgstr "" +msgstr "A4（210mm x 297mm）" #. module: survey #: field:survey.question,comment_maximum_date:0 @@ -163,7 +163,7 @@ msgstr "完了" #. module: survey #: selection:survey.question,required_type:0 msgid "Exactly" -msgstr "" +msgstr "一致" #. module: survey #: view:survey:0 @@ -212,7 +212,7 @@ msgstr "調査の質問" #. module: survey #: selection:survey.question,type:0 msgid "Matrix of Choices (Only One Answers Per Row)" -msgstr "選択肢（1行に付き1回答）" +msgstr "選択の行列（1行に付き1回答）" #. module: survey #: code:addons/survey/survey.py:470 @@ -240,7 +240,7 @@ msgstr "質問タイプが評価尺度の場合に使用" #: field:survey.print,page_number:0 #: field:survey.print.answer,page_number:0 msgid "Include Page Number" -msgstr "" +msgstr "ページ番号を含む" #. module: survey #: view:survey.page:0 @@ -305,7 +305,7 @@ msgstr "終了した調査の合計" #. module: survey #: view:survey.response.answer:0 msgid "(Use Only Question Type is matrix_of_drop_down_menus)" -msgstr "（質問タイプがドロップダウンメニューのマトリックスの時のみ使用）" +msgstr "（質問タイプがドロップダウンメニューの行列の時のみ使用）" #. module: survey #: model:ir.actions.report.xml,name:survey.survey_analysis @@ -391,7 +391,7 @@ msgstr "既存ユーザに注意喚起を送信" #. module: survey #: selection:survey.question,type:0 msgid "Multiple Choice (Multiple Answer)" -msgstr "複数選択（複数回答）" +msgstr "複数の選択肢（複数回答）" #. module: survey #: view:survey:0 @@ -411,7 +411,7 @@ msgstr "メニュー選択" #. module: survey #: selection:survey.question,required_type:0 msgid "At Most" -msgstr "" +msgstr "最大" #. module: survey #: view:survey:0 @@ -431,7 +431,7 @@ msgstr "キャンセル" #. module: survey #: field:survey.response.line,single_text:0 msgid "Text" -msgstr "" +msgstr "テキスト" #. module: survey #: constraint:res.users:0 @@ -442,7 +442,7 @@ msgstr "選択した会社は、このユーザに許された会社ではあり #: selection:survey.print,paper_size:0 #: selection:survey.print.answer,paper_size:0 msgid "Letter (8.5\" x 11\")" -msgstr "" +msgstr "レター（8.5\" x 11\"）" #. module: survey #: view:survey:0 @@ -492,7 +492,7 @@ msgstr "コメントテキストを検証しない" #: selection:survey.question,comment_valid_type:0 #: selection:survey.question,validation_type:0 msgid "Must Be A Whole Number" -msgstr "整数にすべきです" +msgstr "整数が必須" #. module: survey #: field:survey.answer,question_id:0 @@ -530,6 +530,8 @@ msgid "" "etc. You can edit survey manually or click on the 'Edit Survey' for a " "WYSIWYG interface." msgstr "" +"異なる目的の調査を作成することができます：採用面接、従業員の期間毎の評価、マーケティングキャンペーンなど。調査は複数のタイプの質問を含むページで作成されま" +"す：テキスト、複数選択など。調査はWYSIWYGインタフェースで手動または調査の編集をクリックすることで編集可能です。" #. module: survey #: view:survey:0 @@ -548,7 +550,7 @@ msgstr "計画段階の評価" #: view:survey.page:0 #: view:survey.question:0 msgid "Between" -msgstr "" +msgstr "間" #. module: survey #: view:survey.print:0 @@ -635,7 +637,7 @@ msgstr "調査タイプ" #. module: survey #: field:survey.page,sequence:0 msgid "Page Nr" -msgstr "" +msgstr "ページ番号" #. module: survey #: view:survey:0 @@ -644,12 +646,12 @@ msgstr "" #: field:survey.question,descriptive_text:0 #: selection:survey.question,type:0 msgid "Descriptive Text" -msgstr "" +msgstr "説明文" #. module: survey #: field:survey.question,minimum_req_ans:0 msgid "Minimum Required Answer" -msgstr "" +msgstr "最小必要回答数" #. module: survey #: code:addons/survey/survey.py:479 @@ -662,7 +664,7 @@ msgstr "列見出しに1つ以上のメニュー選択の入力が必要です #. module: survey #: field:survey.question,req_error_msg:0 msgid "Error Message" -msgstr "" +msgstr "エラーメッセージ" #. module: survey #: code:addons/survey/survey.py:477 @@ -673,13 +675,13 @@ msgstr "列見出しに1つ以上のメニュー選択の入力が必要です #. module: survey #: field:survey.request,date_deadline:0 msgid "Deadline date" -msgstr "" +msgstr "締切日" #. module: survey #: selection:survey.question,comment_valid_type:0 #: selection:survey.question,validation_type:0 msgid "Must Be A Date" -msgstr "" +msgstr "日付が必須" #. module: survey #: model:ir.model,name:survey.model_survey_print @@ -695,13 +697,13 @@ msgstr "列見出し" #. module: survey #: field:survey.question,is_require_answer:0 msgid "Require Answer to Question" -msgstr "" +msgstr "質問の回答が必要" #. module: survey #: model:ir.actions.act_window,name:survey.action_survey_request_tree #: model:ir.ui.menu,name:survey.menu_survey_type_form1 msgid "Survey Requests" -msgstr "" +msgstr "調査要求" #. module: survey #: code:addons/survey/survey.py:370 @@ -715,7 +717,7 @@ msgstr "1つ以上の列見出しの入力が必要です。" #: code:addons/survey/wizard/survey_answer.py:940 #, python-format msgid "Please enter an integer value" -msgstr "" +msgstr "整数値を入力して下さい。" #. module: survey #: model:ir.model,name:survey.model_survey_browse_answer @@ -725,7 +727,7 @@ msgstr "" #. module: survey #: selection:survey.question,comment_field_type:0 msgid "Paragraph of Text" -msgstr "" +msgstr "テキストの段落" #. module: survey #: code:addons/survey/survey.py:423 @@ -734,37 +736,37 @@ msgid "" "Maximum Required Answer you entered for " "your maximum is greater than the number of answer. " " Please use a number that is smaller than %d." -msgstr "" +msgstr "最大値のためにあなたが入力した最大必要回答数が回答の数よりも多くなっています。%d より小さい数を使って下さい。" #. module: survey #: view:survey:0 #: view:survey.page:0 #: view:survey.question:0 msgid "When the question is not answered, display this error message:" -msgstr "" +msgstr "質問に回答されない場合に、このエラーメッセージを表示します。" #. module: survey #: view:survey:0 #: view:survey.page:0 #: view:survey.question:0 msgid "Options" -msgstr "" +msgstr "オプション" #. module: survey #: view:survey.send.invitation.log:0 msgid "_Ok" -msgstr "" +msgstr "OK" #. module: survey #: model:ir.ui.menu,name:survey.menu_browse_survey_response msgid "Browse Answers" -msgstr "" +msgstr "回答のブラウズ" #. module: survey #: field:survey.response.answer,comment_field:0 #: view:survey.response.line:0 msgid "Comment" -msgstr "" +msgstr "コメント" #. module: survey #: model:ir.model,name:survey.model_survey_answer @@ -774,70 +776,70 @@ msgstr "" #: view:survey.response.answer:0 #: view:survey.response.line:0 msgid "Survey Answer" -msgstr "" +msgstr "調査の回答" #. module: survey #: selection:survey.answer,type:0 msgid "Selection" -msgstr "" +msgstr "選択" #. module: survey #: model:ir.actions.act_window,name:survey.action_browse_survey_response #: view:survey:0 msgid "Answer Survey" -msgstr "" +msgstr "調査の回答" #. module: survey #: view:survey:0 #: view:survey.page:0 #: view:survey.question:0 msgid "Comment Field" -msgstr "" +msgstr "コメント項目" #. module: survey #: selection:survey.response,response_type:0 msgid "Manually" -msgstr "" +msgstr "手動" #. module: survey #: view:survey.send.invitation:0 msgid "_Send" -msgstr "" +msgstr "送信" #. module: survey #: help:survey,responsible_id:0 msgid "User responsible for survey" -msgstr "" +msgstr "調査を担当するユーザ" #. module: survey #: field:survey,page_ids:0 #: view:survey.question:0 #: field:survey.response.line,page_id:0 msgid "Page" -msgstr "" +msgstr "ページ" #. module: survey #: field:survey.question,comment_column:0 msgid "Add comment column in matrix" -msgstr "" +msgstr "行列でコメント列に追加" #. module: survey #: field:survey.answer,response:0 msgid "#Answer" -msgstr "" +msgstr "回答番号" #. module: survey #: field:survey.print,without_pagebreak:0 #: field:survey.print.answer,without_pagebreak:0 msgid "Print Without Page Breaks" -msgstr "" +msgstr "改ページなしで印刷" #. module: survey #: view:survey:0 #: view:survey.page:0 #: view:survey.question:0 msgid "When the comment is an invalid format, display this error message" -msgstr "" +msgstr "コメントが無効なフォーマットの場合、このエラーメッセージを表示します。" #. module: survey #: code:addons/survey/wizard/survey_selection.py:83 @@ -845,85 +847,85 @@ msgstr "" msgid "" "You can not give more response. Please contact the author of this survey for " "further assistance." -msgstr "" +msgstr "あなたはこれ以上多くの応答を与えることができません。これ以上のサポートが必要であれば、この調査の作者に連絡をして下さい。" #. module: survey #: model:ir.actions.act_window,name:survey.act_survey_page_question #: model:ir.actions.act_window,name:survey.act_survey_question msgid "Questions" -msgstr "" +msgstr "質問" #. module: survey #: help:survey,response_user:0 msgid "Set to one if you require only one Answer per user" -msgstr "" +msgstr "1ユーザにつき1回答のみとする場合は、1を設定します。" #. module: survey #: field:survey,users:0 msgid "Users" -msgstr "" +msgstr "ユーザ" #. module: survey #: view:survey.send.invitation:0 msgid "Message" -msgstr "" +msgstr "メッセージ" #. module: survey #: view:survey:0 #: view:survey.request:0 msgid "MY" -msgstr "" +msgstr "私の" #. module: survey #: field:survey.question,maximum_req_ans:0 msgid "Maximum Required Answer" -msgstr "" +msgstr "最大必要回答数" #. module: survey #: field:survey.name.wiz,page_no:0 msgid "Page Number" -msgstr "" +msgstr "ページ番号" #. module: survey #: code:addons/survey/wizard/survey_answer.py:87 #, python-format msgid "Cannot locate survey for the question wizard!" -msgstr "" +msgstr "質問ウィザードのための調査を見つけることができません。" #. module: survey #: view:survey:0 #: view:survey.page:0 #: view:survey.question:0 msgid "and" -msgstr "" +msgstr "かつ" #. module: survey #: model:ir.actions.act_window,name:survey.action_view_survey_print_statistics #: view:survey.print.statistics:0 msgid "Survey Print Statistics" -msgstr "" +msgstr "調査印刷統計値" #. module: survey #: field:survey.send.invitation.log,note:0 msgid "Log" -msgstr "" +msgstr "ログ" #. module: survey #: view:survey:0 #: view:survey.page:0 #: view:survey.question:0 msgid "When the choices do not add up correctly, display this error message" -msgstr "" +msgstr "選択肢を正しく追加していない場合、このエラーメッセージが表示されます。" #. module: survey #: field:survey,date_close:0 msgid "Survey Close Date" -msgstr "" +msgstr "調査閉鎖日" #. module: survey #: field:survey,date_open:0 msgid "Survey Open Date" -msgstr "" +msgstr "調査開設日" #. module: survey #: field:survey.question.column.heading,in_visible_rating_weight:0 @@ -934,25 +936,25 @@ msgstr "評価尺度は非表示ですか？" #: view:survey.browse.answer:0 #: view:survey.name.wiz:0 msgid "Start" -msgstr "" +msgstr "開始" #. module: survey #: code:addons/survey/survey.py:472 #, python-format msgid "Maximum Required Answer is greater than Minimum Required Answer" -msgstr "" +msgstr "最大必要回答数は最小必要回答数よりも大きい。" #. module: survey #: field:survey.question,comment_maximum_no:0 #: field:survey.question,validation_maximum_no:0 msgid "Maximum number" -msgstr "" +msgstr "最大値" #. module: survey #: selection:survey.request,state:0 #: selection:survey.response.line,state:0 msgid "Draft" -msgstr "" +msgstr "ドラフト" #. module: survey #: model:ir.model,name:survey.model_survey_print_statistics @@ -962,12 +964,12 @@ msgstr "" #. module: survey #: selection:survey,state:0 msgid "Closed" -msgstr "" +msgstr "閉鎖" #. module: survey #: selection:survey.question,type:0 msgid "Matrix of Drop-down Menus" -msgstr "" +msgstr "ドロップダウンメニューの行列" #. module: survey #: view:survey:0 @@ -989,133 +991,133 @@ msgstr "" #: field:survey.send.invitation,partner_ids:0 #: field:survey.tbl.column.heading,response_table_id:0 msgid "Answer" -msgstr "" +msgstr "回答" #. module: survey #: field:survey,max_response_limit:0 msgid "Maximum Answer Limit" -msgstr "" +msgstr "回答上限最大値" #. module: survey #: model:ir.actions.act_window,name:survey.action_act_view_survey_send_invitation msgid "Send Invitations" -msgstr "" +msgstr "招待の送信" #. module: survey #: field:survey.name.wiz,store_ans:0 msgid "Store Answer" -msgstr "" +msgstr "回答の保存" #. module: survey #: selection:survey.question,type:0 msgid "Date and Time" -msgstr "" +msgstr "日付と時間" #. module: survey #: field:survey,state:0 #: field:survey.response,state:0 #: field:survey.response.line,state:0 msgid "Status" -msgstr "" +msgstr "状態" #. module: survey #: model:ir.actions.act_window,name:survey.action_view_survey_print msgid "Print Survey" -msgstr "" +msgstr "調査の印刷" #. module: survey #: field:survey,send_response:0 msgid "E-mail Notification on Answer" -msgstr "" +msgstr "回答のEメール通知" #. module: survey #: field:survey.response.answer,value_choice:0 msgid "Value Choice" -msgstr "" +msgstr "値の選択" #. module: survey #: view:survey:0 msgid "Started" -msgstr "" +msgstr "開始済" #. module: survey #: model:ir.actions.act_window,name:survey.action_view_survey_print_answer #: view:survey:0 #: view:survey.print.answer:0 msgid "Print Answer" -msgstr "" +msgstr "回答の印刷" #. module: survey #: selection:survey.question,type:0 msgid "Multiple Textboxes" -msgstr "" +msgstr "複数のテキストボックス" #. module: survey #: selection:survey.print,orientation:0 #: selection:survey.print.answer,orientation:0 msgid "Landscape(Horizontal)" -msgstr "" +msgstr "横向き" #. module: survey #: field:survey.question,no_of_rows:0 msgid "No of Rows" -msgstr "" +msgstr "行数" #. module: survey #: view:survey:0 #: view:survey.name.wiz:0 msgid "Survey Details" -msgstr "" +msgstr "調査の詳細" #. module: survey #: selection:survey.question,type:0 msgid "Multiple Textboxes With Different Type" -msgstr "" +msgstr "異なるタイプの複数のテキストボックス" #. module: survey #: view:survey.question.column.heading:0 msgid "Menu Choices (each choice on separate lines)" -msgstr "" +msgstr "メニュー選択（行毎に別の選択）" #. module: survey #: field:survey.response,response_type:0 msgid "Answer Type" -msgstr "" +msgstr "回答タイプ" #. module: survey #: view:survey:0 #: view:survey.page:0 #: view:survey.question:0 msgid "Validation" -msgstr "" +msgstr "検証" #. module: survey #: view:survey.request:0 #: selection:survey.request,state:0 msgid "Waiting Answer" -msgstr "" +msgstr "回答待ち" #. module: survey #: selection:survey.question,comment_valid_type:0 #: selection:survey.question,validation_type:0 msgid "Must Be A Decimal Number" -msgstr "" +msgstr "10進数値が必須" #. module: survey #: field:res.users,survey_id:0 msgid "Groups" -msgstr "" +msgstr "グループ" #. module: survey #: selection:survey.answer,type:0 #: selection:survey.question,type:0 msgid "Date" -msgstr "" +msgstr "日付" #. module: survey #: view:survey:0 msgid "All New Survey" -msgstr "" +msgstr "新規調査全て" #. module: survey #: model:ir.model,name:survey.model_survey_send_invitation @@ -1128,40 +1130,40 @@ msgstr "" #: field:survey.request,user_id:0 #: field:survey.response,user_id:0 msgid "User" -msgstr "" +msgstr "ユーザ" #. module: survey #: field:survey.name.wiz,transfer:0 msgid "Page Transfer" -msgstr "" +msgstr "ページ転送" #. module: survey #: selection:survey.response.line,state:0 msgid "Skiped" -msgstr "" +msgstr "スキップ済" #. module: survey #: field:survey.print,paper_size:0 #: field:survey.print.answer,paper_size:0 msgid "Paper Size" -msgstr "" +msgstr "用紙サイズ" #. module: survey #: field:survey.response.answer,column_id:0 #: field:survey.tbl.column.heading,column_id:0 msgid "Column" -msgstr "" +msgstr "列" #. module: survey #: model:ir.model,name:survey.model_survey_response_line msgid "Survey Response Line" -msgstr "" +msgstr "調査回答行" #. module: survey #: code:addons/survey/wizard/survey_selection.py:80 #, python-format msgid "You can not give response for this survey more than %s times" -msgstr "" +msgstr "この調査には %s 回を超えての応答はできません。" #. module: survey #: model:ir.actions.report.xml,name:survey.report_survey_form @@ -1182,7 +1184,7 @@ msgstr "" #: field:survey.request,survey_id:0 #: field:survey.response,survey_id:0 msgid "Survey" -msgstr "" +msgstr "調査" #. module: survey #: field:survey.question,in_visible_rating_weight:0 @@ -1192,12 +1194,12 @@ msgstr "評価尺度は非表示ですか？" #. module: survey #: selection:survey.answer,type:0 msgid "Integer" -msgstr "" +msgstr "整数" #. module: survey #: selection:survey.question,type:0 msgid "Numerical Textboxes" -msgstr "" +msgstr "数値のテキストボックス" #. module: survey #: model:ir.model,name:survey.model_survey_question_wiz @@ -1207,17 +1209,17 @@ msgstr "" #. module: survey #: view:survey:0 msgid "History" -msgstr "" +msgstr "履歴" #. module: survey #: view:survey.request:0 msgid "Late" -msgstr "" +msgstr "遅延" #. module: survey #: field:survey.type,code:0 msgid "Code" -msgstr "" +msgstr "コード" #. module: survey #: model:ir.ui.menu,name:survey.menu_print_survey_statistics @@ -1228,7 +1230,7 @@ msgstr "" #: field:survey.print,orientation:0 #: field:survey.print.answer,orientation:0 msgid "Orientation" -msgstr "" +msgstr "向き" #. module: survey #: view:survey:0 @@ -1236,55 +1238,55 @@ msgstr "" #: view:survey.page:0 #: view:survey.question:0 msgid "Seq" -msgstr "" +msgstr "順序" #. module: survey #: field:survey.request,email:0 msgid "E-mail" -msgstr "" +msgstr "Eメール" #. module: survey #: field:survey.question,comment_minimum_no:0 #: field:survey.question,validation_minimum_no:0 msgid "Minimum number" -msgstr "" +msgstr "最小値" #. module: survey #: field:survey.question,req_ans:0 msgid "#Required Answer" -msgstr "" +msgstr "要求される回答数" #. module: survey #: field:survey.answer,sequence:0 #: field:survey.question,sequence:0 msgid "Sequence" -msgstr "" +msgstr "順序" #. module: survey #: field:survey.question,comment_label:0 msgid "Field Label" -msgstr "" +msgstr "項目ラベル" #. module: survey #: view:survey:0 msgid "Other" -msgstr "" +msgstr "その他" #. module: survey #: view:survey.request:0 #: selection:survey.request,state:0 msgid "Done" -msgstr "" +msgstr "完了" #. module: survey #: view:survey:0 msgid "Test Survey" -msgstr "" +msgstr "テスト調査" #. module: survey #: field:survey.question,rating_allow_one_column_require:0 msgid "Allow Only One Answer per Column (Forced Ranking)" -msgstr "" +msgstr "列毎に1個の回答のみを許可（強制ランキング）" #. module: survey #: view:survey:0 @@ -1294,29 +1296,29 @@ msgstr "" #: view:survey.print.answer:0 #: view:survey.print.statistics:0 msgid "Cancel" -msgstr "" +msgstr "キャンセル" #. module: survey #: view:survey:0 msgid "Close" -msgstr "" +msgstr "閉じる" #. module: survey #: field:survey.question,comment_minimum_float:0 #: field:survey.question,validation_minimum_float:0 msgid "Minimum decimal number" -msgstr "" +msgstr "最小10進数" #. module: survey #: view:survey:0 #: selection:survey,state:0 msgid "Open" -msgstr "" +msgstr "開く" #. module: survey #: field:survey,tot_start_survey:0 msgid "Total Started Survey" -msgstr "" +msgstr "開始した調査合計" #. module: survey #: code:addons/survey/survey.py:462 @@ -1324,17 +1326,17 @@ msgstr "" msgid "" "#Required Answer you entered is greater than the number of answer. Please " "use a number that is smaller than %d." -msgstr "" +msgstr "入力した要求回答数が回答の数より大きいです。%d より小さな数を使用して下さい。" #. module: survey #: help:survey,max_response_limit:0 msgid "Set to one if survey is answerable only once" -msgstr "" +msgstr "調査が1回のみ回答可能な場合、1を設定します。" #. module: survey #: selection:survey.response,state:0 msgid "Finished " -msgstr "" +msgstr "完了 " #. module: survey #: model:ir.model,name:survey.model_survey_question_column_heading @@ -1344,17 +1346,17 @@ msgstr "調査質問の列見出し" #. module: survey #: field:survey.answer,average:0 msgid "#Avg" -msgstr "" +msgstr "平均数" #. module: survey #: selection:survey.question,type:0 msgid "Matrix of Choices (Multiple Answers Per Row)" -msgstr "" +msgstr "選択の行列（1行に付き複数回答）" #. module: survey #: model:ir.actions.act_window,name:survey.action_view_survey_name msgid "Give Survey Answer" -msgstr "" +msgstr "調査の回答を提供" #. module: survey #: model:ir.model,name:survey.model_res_users @@ -1365,60 +1367,60 @@ msgstr "" #: help:survey.browse.answer,response_id:0 msgid "" "If this field is empty, all answers of the selected survey will be print." -msgstr "" +msgstr "この項目が空の場合、選択された調査の回答の全てが印刷されます。" #. module: survey #: selection:survey.response.line,state:0 msgid "Answered" -msgstr "" +msgstr "回答済" #. module: survey #: code:addons/survey/wizard/survey_answer.py:425 #, python-format msgid "Complete Survey Answer" -msgstr "" +msgstr "調査の回答の完了" #. module: survey #: selection:survey.question,type:0 msgid "Comment/Essay Box" -msgstr "" +msgstr "コメント / エッセイボックス" #. module: survey #: field:survey.answer,type:0 msgid "Type of Answer" -msgstr "" +msgstr "回答のタイプ" #. module: survey #: field:survey.question,required_type:0 msgid "Respondent must answer" -msgstr "" +msgstr "回答者の回答必須" #. module: survey #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation #: view:survey.send.invitation:0 msgid "Send Invitation" -msgstr "" +msgstr "招待の送信" #. module: survey #: code:addons/survey/wizard/survey_answer.py:779 #, python-format msgid "You cannot select the same answer more than one time" -msgstr "" +msgstr "複数回の同じ回答は選択できません。" #. module: survey #: view:survey.question:0 msgid "Search Question" -msgstr "" +msgstr "質問の検索" #. module: survey #: field:survey,title:0 msgid "Survey Title" -msgstr "" +msgstr "調査タイトル" #. module: survey #: selection:survey.question,type:0 msgid "Single Textbox" -msgstr "" +msgstr "単数テキストボックス" #. module: survey #: view:survey:0 @@ -1428,17 +1430,17 @@ msgstr "" #: field:survey.page,note:0 #: view:survey.response.line:0 msgid "Description" -msgstr "" +msgstr "詳細" #. module: survey #: view:survey.name.wiz:0 msgid "Select Survey" -msgstr "" +msgstr "調査の選択" #. module: survey #: selection:survey.question,required_type:0 msgid "At Least" -msgstr "" +msgstr "最低" #. module: survey #: model:ir.actions.act_window,name:survey.action_view_survey_send_invitation_log @@ -1450,27 +1452,27 @@ msgstr "" #: selection:survey.print,orientation:0 #: selection:survey.print.answer,orientation:0 msgid "Portrait(Vertical)" -msgstr "" +msgstr "縦向き" #. module: survey #: selection:survey.question,comment_valid_type:0 #: selection:survey.question,validation_type:0 msgid "Must Be Specific Length" -msgstr "" +msgstr "長さ指定が必須" #. module: survey #: view:survey:0 #: view:survey.page:0 #: field:survey.question,page_id:0 msgid "Survey Page" -msgstr "" +msgstr "調査ページ" #. module: survey #: view:survey:0 #: view:survey.page:0 #: view:survey.question:0 msgid "Required Answer" -msgstr "" +msgstr "必要回答数" #. module: survey #: code:addons/survey/survey.py:468 @@ -1478,39 +1480,39 @@ msgstr "" msgid "" "Minimum Required Answer you entered is greater than the number of answer. " "Please use a number that is smaller than %d." -msgstr "" +msgstr "入力した最小必要回答数が回答数より大きくなっています。%d より小さな数を使用して下さい。" #. module: survey #: code:addons/survey/survey.py:453 #, python-format msgid "You must enter one or more answer." -msgstr "" +msgstr "１個以上の回答の入力が必要です。" #. module: survey #: view:survey:0 msgid "All Open Survey" -msgstr "" +msgstr "開いている調査全て" #. module: survey #: model:ir.actions.report.xml,name:survey.survey_browse_response #: field:survey.browse.answer,response_id:0 msgid "Survey Answers" -msgstr "" +msgstr "調査の回答" #. module: survey #: view:survey.browse.answer:0 msgid "Select Survey and Related Answer" -msgstr "" +msgstr "調査と関係する回答を選択" #. module: survey #: model:ir.ui.menu,name:survey.menu_print_survey_answer msgid "Surveys Answers" -msgstr "" +msgstr "調査の回答" #. module: survey #: model:ir.actions.act_window,name:survey.act_survey_pages msgid "Pages" -msgstr "" +msgstr "ページ" #. module: survey #: code:addons/survey/survey.py:401 @@ -1519,29 +1521,29 @@ msgid "" "#Required Answer you entered is greater " "than the number of answer. Please use a " "number that is smaller than %d." -msgstr "" +msgstr "入力した要求回答数は回答の数より大きくなっています。%d より小さな数を使用して下さい。" #. module: survey #: code:addons/survey/wizard/survey_answer.py:971 #, python-format msgid "You cannot select same answer more than one time'" -msgstr "" +msgstr "複数回の同じ回答は選択できません。" #. module: survey #: selection:survey.print,paper_size:0 #: selection:survey.print.answer,paper_size:0 msgid "Legal (8.5\" x 14\")" -msgstr "" +msgstr "リーガル（8.5\" x 14\"）" #. module: survey #: field:survey.type,name:0 msgid "Name" -msgstr "" +msgstr "名称" #. module: survey #: view:survey.page:0 msgid "#Questions" -msgstr "" +msgstr "質問数" #. module: survey #: model:ir.model,name:survey.model_survey_response @@ -1554,19 +1556,19 @@ msgstr "" #: field:survey.question,numeric_required_sum_err_msg:0 #: field:survey.question,validation_valid_err_msg:0 msgid "Error message" -msgstr "" +msgstr "エラーメッセージ" #. module: survey #: view:survey.send.invitation:0 #: field:survey.send.invitation,send_mail:0 msgid "Send Mail for New User" -msgstr "" +msgstr "新規ユーザのためのメール送信" #. module: survey #: code:addons/survey/survey.py:382 #, python-format msgid "You must enter one or more Answer." -msgstr "" +msgstr "1つ以上の回答を入力する必要があります。" #. module: survey #: code:addons/survey/survey.py:411 @@ -1575,12 +1577,12 @@ msgid "" "Minimum Required Answer you entered is " "greater than the number of answer. Please " "use a number that is smaller than %d." -msgstr "" +msgstr "入力した最小必要回答数が回答数より大きくなっています。%d より小さな数を使用して下さい。" #. module: survey #: field:survey.answer,menu_choice:0 msgid "Menu Choices" -msgstr "" +msgstr "メニュー選択" #. module: survey #: field:survey,id:0 @@ -1593,28 +1595,28 @@ msgstr "" msgid "" "Maximum Required Answer is greater than " "Minimum Required Answer" -msgstr "" +msgstr "最大必要回答数は最小必要回答数よりも大きい。" #. module: survey #: view:survey.send.invitation.log:0 msgid "User creation" -msgstr "" +msgstr "ユーザの作成" #. module: survey #: selection:survey.question,required_type:0 msgid "All" -msgstr "" +msgstr "全て" #. module: survey #: selection:survey.question,comment_valid_type:0 #: selection:survey.question,validation_type:0 msgid "Must Be An Email Address" -msgstr "" +msgstr "Eメールアドレスが必須" #. module: survey #: selection:survey.question,type:0 msgid "Multiple Choice (Only One Answer)" -msgstr "" +msgstr "複数の選択肢（回答は１つのみ）" #. module: survey #: field:survey.answer,in_visible_answer_type:0 @@ -1629,44 +1631,44 @@ msgstr "" #. module: survey #: view:survey.answer:0 msgid "Menu Choices (each choice on separate by lines)" -msgstr "" +msgstr "メニュー選択（行毎に別の選択）" #. module: survey #: selection:survey.answer,type:0 msgid "Float" -msgstr "" +msgstr "実数" #. module: survey #: view:survey.response.line:0 msgid "Single Textboxes" -msgstr "" +msgstr "単数テキストボックス" #. module: survey #: code:addons/survey/wizard/survey_send_invitation.py:74 #, python-format msgid "%sSurvey is not in open state" -msgstr "" +msgstr "%s 調査は開いた状態ではありません。" #. module: survey #: field:survey.question.column.heading,rating_weight:0 msgid "Weight" -msgstr "" +msgstr "重量" #. module: survey #: selection:survey.answer,type:0 msgid "Date & Time" -msgstr "" +msgstr "日時" #. module: survey #: field:survey.response,date_create:0 #: field:survey.response.line,date_create:0 msgid "Create Date" -msgstr "" +msgstr "作成日" #. module: survey #: field:survey.question,column_name:0 msgid "Column Name" -msgstr "" +msgstr "カラム名" #. module: survey #: model:ir.actions.act_window,name:survey.action_survey_page_form @@ -1674,24 +1676,24 @@ msgstr "" #: model:ir.ui.menu,name:survey.menu_survey_page_form1 #: view:survey.page:0 msgid "Survey Pages" -msgstr "" +msgstr "調査ページ" #. module: survey #: field:survey.question,numeric_required_sum:0 msgid "Sum of all choices" -msgstr "" +msgstr "全選択の合計" #. module: survey #: selection:survey.question,type:0 #: view:survey.response.line:0 msgid "Table" -msgstr "" +msgstr "表" #. module: survey #: code:addons/survey/survey.py:630 #, python-format msgid "You cannot duplicate the resource!" -msgstr "" +msgstr "リソースの複製はできません。" #. module: survey #: field:survey.question,comment_minimum_date:0 @@ -1702,9 +1704,9 @@ msgstr "最小の日付" #. module: survey #: field:survey,response_user:0 msgid "Maximum Answer per User" -msgstr "" +msgstr "ユーザ毎の最大回答数" #. module: survey #: field:survey.name.wiz,page:0 msgid "Page Position" -msgstr "" +msgstr "ページ位置" diff --git a/addons/web_process/i18n/nl.po b/addons/web_process/i18n/nl.po index 99381ec92fe..9d20ebd412e 100644 --- a/addons/web_process/i18n/nl.po +++ b/addons/web_process/i18n/nl.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openerp-web\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2012-07-02 09:06+0200\n" -"PO-Revision-Date: 2012-02-11 08:49+0000\n" -"Last-Translator: Mario Gielissen \n" +"PO-Revision-Date: 2012-07-05 08:01+0000\n" +"Last-Translator: Erwin \n" "Language-Team: Dutch \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-03 05:55+0000\n" -"X-Generator: Launchpad (build 15531)\n" +"X-Launchpad-Export-Date: 2012-07-06 05:07+0000\n" +"X-Generator: Launchpad (build 15558)\n" #. openerp-web #: addons/web_process/static/src/js/process.js:261 @@ -110,7 +110,7 @@ msgstr "Proces selecteren" #. openerp-web #: addons/web_process/static/src/xml/web_process.xml:98 msgid "Select" -msgstr "Selecteer" +msgstr "Kies" #. openerp-web #: addons/web_process/static/src/xml/web_process.xml:109 From 55aace115f8781a7ba26001e393ef9e6006eb77e Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 6 Jul 2012 10:53:21 +0530 Subject: [PATCH 090/163] [IMP]event: remove name_get method bzr revid: kjo@tinyerp.com-20120706052321-fcxb95cckpfwsyvo --- addons/event/event.py | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/addons/event/event.py b/addons/event/event.py index 51e067e7d66..5e075d4bd30 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -51,27 +51,6 @@ class event_event(osv.osv): _order = 'date_begin' _inherit = ['ir.needaction_mixin','mail.thread'] - def name_get(self, cr, uid, ids, context=None): - if not ids: - return [] - res = [] - for record in self.browse(cr, uid, ids, context=context): - date = record.date_begin.split(" ") - date = date[0] - registers='' - if record.register_max !=0: - register_max = str(record.register_max) - register_tot = record.register_current+record.register_prospect - register_tot = str(register_tot) - registers = register_tot+'/'+register_max - name = record.name+' ('+date+') '+registers - res.append((record['id'], name)) - return res - - def _name_get_fnc(self, cr, uid, ids,prop,unknow, context=None): - res = self.name_get(cr, uid, ids, context=context) - return dict(res) - def create(self, cr, uid, vals, context=None): obj_id = super(event_event, self).create(cr, uid, vals, context) self.create_send_note(cr, uid, [obj_id], context=context) @@ -211,7 +190,6 @@ class event_event(osv.osv): help='If event is created, the state is \'Draft\'.If event is confirmed for the particular dates the state is set to \'Confirmed\'. If the event is over, the state is set to \'Done\'.If event is cancelled the state is set to \'Cancelled\'.'), 'email_registration_id' : fields.many2one('email.template','Registration Confirmation Email', help='This field contains the template of the mail that will be automatically sent each time a registration for this event is confirmed.'), 'email_confirmation_id' : fields.many2one('email.template','Event Confirmation Email', help="If you set an email template, each participant will receive this email announcing the confirmation of the event."), - 'full_name' : fields.function(_name_get_fnc, type="char", string='Name'), 'reply_to': fields.char('Reply-To Email', size=64, readonly=False, states={'done': [('readonly', True)]}, help="The email address of the organizer is likely to be put here, with the effect to be in the 'Reply-To' of the mails sent automatically at event or registrations confirmation. You can also put the email address of your mail gateway if you use one."), 'main_speaker_id': fields.many2one('res.partner','Main Speaker', readonly=False, states={'done': [('readonly', True)]}, help="Speaker who will be giving speech at the event."), 'address_id': fields.many2one('res.partner','Location Address', readonly=False, states={'done': [('readonly', True)]}), From f9cfe908cfebceed95c6cbf10b4d0290aa9a8b70 Mon Sep 17 00:00:00 2001 From: "Kuldeep Joshi (OpenERP)" Date: Fri, 6 Jul 2012 12:20:05 +0530 Subject: [PATCH 091/163] [IMP]event: remove oe_subtotal_footer oe_right class bzr revid: kjo@tinyerp.com-20120706065005-agkoyvnja05apcvq --- addons/event/event_view.xml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 276842c4d4a..6fc0a149cf3 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -151,6 +151,7 @@ + @@ -186,11 +187,6 @@ - - - - - From f323d4209d818b944e894024fa97d192f011ba9e Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 6 Jul 2012 09:30:30 +0200 Subject: [PATCH 092/163] [IMP] width of sheet in a variable bzr revid: fp@tinyerp.com-20120706073030-dejwb1d37cmjm738 --- addons/web/static/src/css/base.css | 2 +- addons/web/static/src/css/base.sass | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ac767243e75..863dbb80044 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1674,7 +1674,7 @@ } .openerp .oe_form footer { min-width: 650px; - max-width: 960px; + max-width: 860px; margin: 0 auto; } .openerp ul.oe_form_steps { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cdb14123666..be1e8b6c08e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -6,6 +6,7 @@ $facets-border: #afafb6 $facets-border-selected: #a6a6fe $hover-background: #f0f0fa $colour4: #8a89ba +$sheet-max-width: 860px // }}} // Mixins {{{ @font-face @@ -1307,7 +1308,7 @@ $colour4: #8a89ba float: right footer min-width: 650px - max-width: 960px + max-width: $sheet-max-width margin: 0 auto ul.oe_form_steps height: 30px @@ -1362,7 +1363,7 @@ $colour4: #8a89ba border-bottom: 1px solid #ddd .oe_form_sheet_width min-width: 650px - max-width: 860px + max-width: $sheet-max-width margin: 0 auto .oe_form_sheet background: white From 47fd55c8b4a446b10e555a0f616334bba1c83eb8 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 6 Jul 2012 10:00:17 +0200 Subject: [PATCH 093/163] [IMP] removed EDI specific css bzr revid: fp@tinyerp.com-20120706080017-vqlq69nj8p5vrdrv --- addons/edi/static/src/css/edi.css | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/addons/edi/static/src/css/edi.css b/addons/edi/static/src/css/edi.css index 1601151ae1f..6385959c036 100644 --- a/addons/edi/static/src/css/edi.css +++ b/addons/edi/static/src/css/edi.css @@ -24,21 +24,6 @@ button.oe_edi_action_print img { height: 32px; } -.openerp input.invalid { - background-color: #F66 !important; - border: 1px solid #D00 !important; - color: #000; -} -/* following browse-specific hacks need to be separate rules, as browsers are - required to ignore rules with unknown selectors. At time of writing, there - is no standard way to style HTML5 placeholders */ -.openerp input.invalid:-moz-placeholder { - color: #FFF; -} -.openerp input.invalid::-webkit-input-placeholder { - color: #FFF; -} - /** EDI Sidebar **/ .oe_edi_sidebar_title { border-bottom: 1px solid #D2CFCF; @@ -81,9 +66,6 @@ button.oe_edi_action_print img { /** Paperbox, from http://www.sitepoint.com/pure-css3-paper-curl/ **/ -body { - background: #EEE; /* contrast with paper */ -} .oe_edi_paperbox { position: relative; width: 700px; @@ -225,4 +207,4 @@ table.oe_edi_data, .oe_edi_doc_title { .python .nu0 {color: #ff4500;} .python .me1 {color: black;} .python span.xtra { display:block; } -.python ol { padding: 0px; } \ No newline at end of file +.python ol { padding: 0px; } From 788b670b2027cf46971ab40d94ec4dd10648f513 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 6 Jul 2012 10:24:16 +0200 Subject: [PATCH 094/163] [FIX] hr_holidays: change onchange method name bzr revid: rco@openerp.com-20120706082416-hi7fqtdevepvzwbk --- addons/hr_holidays/hr_holidays_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index 1237cdb14f4..c22c4add718 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -119,7 +119,7 @@ - + + + + + + - - - - - - + + + - + + + + + + + + + diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml index ad3488deb98..0cec5899c41 100644 --- a/addons/knowledge/res_config_view.xml +++ b/addons/knowledge/res_config_view.xml @@ -13,19 +13,17 @@
- -
+

From to @@ -124,7 +120,7 @@

+ + - - + - - - - - - - + + + +
diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 8697f46d867..17472e0cc95 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -77,12 +77,10 @@ class report_event_registration(osv.osv): r.state AS registration_state FROM event_event e - + LEFT JOIN event_registration r ON (e.id=r.event_id) - WHERE r.active = 'true' - GROUP BY event_id, user_id_registration, diff --git a/addons/event_moodle/event_view.xml b/addons/event_moodle/event_view.xml index 4fa0172c5f5..4324990a1d8 100644 --- a/addons/event_moodle/event_view.xml +++ b/addons/event_moodle/event_view.xml @@ -7,7 +7,12 @@ form + + + + + @@ -23,12 +28,12 @@ - - + + - - - + + + diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py index 426c410dd99..9e65a034544 100644 --- a/addons/event_sale/event_sale.py +++ b/addons/event_sale/event_sale.py @@ -90,4 +90,3 @@ class sale_order_line(osv.osv): message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name) registration_obj.message_append_note(cr, uid, [registration_id], body=message, context=context) return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context) - From d6100f371f185189ae452d6cb785a1f1a989415b Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 17:02:57 +0200 Subject: [PATCH 119/163] Changed popup overlay and added style for label in kanban vignette bzr revid: mit@openerp.com-20120709150257-t50t470tyxmomrt4 --- addons/web/static/src/css/base.css | 6 ++++++ addons/web/static/src/css/base.sass | 3 +++ addons/web_kanban/static/src/css/kanban.css | 14 ++++++++++++-- addons/web_kanban/static/src/css/kanban.sass | 15 +++++++++++---- 4 files changed, 32 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 7bc210298db..a9c9508c4e5 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -2348,3 +2348,9 @@ .kitten-mode-activated > * { opacity: 0.7; } + +div.ui-widget-overlay { + background: black; + filter: alpha(opacity=30); + opacity: 0.3; +} diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index d5d271fe07d..ba858ca8877 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1850,5 +1850,8 @@ $colour4: #8a89ba opacity: 0.70 // }}} +div.ui-widget-overlay + background: black + @include opacity(0.3) // au BufWritePost,FileWritePost *.sass :!sass --style expanded --line-numbers > "%:p:r.css" // vim:tabstop=4:shiftwidth=4:softtabstop=4:fdm=marker: diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 39f22d8e542..1128d2cdaff 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -29,7 +29,7 @@ color: gold; } .openerp .oe_kanban_view .oe_kanban_content div:first-child { - margin-right: 12px; + margin-right: 16px; } .openerp .oe_kanban_view .oe_kanban_button_new { color: white; @@ -59,7 +59,7 @@ } .openerp .oe_kanban_view .oe_kanban_column, .openerp .oe_kanban_view .oe_kanban_group_header { vertical-align: top; - padding: 4px; + padding: 6px 6px 6px 5px; } .openerp .oe_kanban_view .oe_kanban_column.oe_kanban_grouped, .openerp .oe_kanban_view .oe_kanban_group_header { background: #f0eeee; @@ -375,6 +375,16 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.openerp .oe_kanban_view .oe_kanban_footer_left > span { + margin-top: 4px; + display: inline-block; + background: #e6e6e6; + border: 1px solid #b9b9b9; + padding: 1px 2px; + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + border-radius: 3px; +} .openerp .oe_kanban_view .oe_kanban_status { display: inline-block; height: 12px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 4823a5928e4..facdc32e326 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -44,7 +44,7 @@ .oe_star_on color: gold div:first-child - margin-right: 12px + margin-right: 16px .oe_kanban_button_new color: white background: #DC5F59 @@ -72,7 +72,7 @@ .oe_kanban_column, .oe_kanban_group_header vertical-align: top - padding: 4px + padding: 6px 6px 6px 5px .oe_kanban_column.oe_kanban_grouped, .oe_kanban_group_header background: #f0eeee @@ -318,8 +318,15 @@ .oe_kanban_avatar @include radius(3px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) - //.oe_kanban_footer_left - // float: left + .oe_kanban_footer_left + > span + margin-top: 4px + display: inline-block + background: #E6E6E6 + border: 1px solid #B9B9B9 + padding: 1px 2px + @include radius(3px) + .oe_kanban_status display: inline-block height: 12px From 6c51450adb5bd2eca59ef8e6f8bd9f6ef3ed56e2 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 9 Jul 2012 17:17:57 +0200 Subject: [PATCH 120/163] [IMP] project: privacy/visibility field is required bzr revid: qdp-launchpad@openerp.com-20120709151757-wl019ftl2xheb9o3 --- addons/project/project.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/project/project.py b/addons/project/project.py index 487daa834bb..5810f34ad4a 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -215,7 +215,7 @@ class project(osv.osv): 'type_ids': fields.many2many('project.task.type', 'project_task_type_rel', 'project_id', 'type_id', 'Tasks Stages', states={'close':[('readonly',True)], 'cancelled':[('readonly',True)]}), 'task_count': fields.function(_task_count, type='integer', string="Open Tasks"), 'color': fields.integer('Color Index'), - 'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility'), + 'privacy_visibility': fields.selection([('public','Public'), ('followers','Followers Only')], 'Privacy / Visibility', required=True), 'state': fields.selection([('template', 'Template'),('draft','New'),('open','In Progress'), ('cancelled', 'Cancelled'),('pending','Pending'),('close','Closed')], 'Status', required=True,), 'followers': fields.function(_get_followers, method=True, fnct_search=_search_followers, type='many2many', relation='res.users', string='Followers'), @@ -236,6 +236,7 @@ class project(osv.osv): 'priority': 1, 'sequence': 10, 'type_ids': _get_type_common, + 'privacy_visibility': 'public', } # TODO: Why not using a SQL contraints ? From 36cb6f479a6483d20cc894ca91f40159d53b6ec9 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Mon, 9 Jul 2012 18:21:24 +0200 Subject: [PATCH 121/163] Use product.product instead of product.template when we go through the ORM. In this process, I re-wrote the fonction change_product_qty_send_note in stock/wizard/stock_change_product_qty.py : the code is now much better ! bzr revid: alexis@via.ecp.fr-20120709162124-jmqv7hrl94fbzk1j --- addons/product/pricelist.py | 3 +-- .../product_visible_discount.py | 10 ++-------- addons/stock/wizard/stock_change_product_qty.py | 14 ++++---------- .../wizard/stock_planning_createlines.py | 4 +--- .../wizard/stock_planning_forecast.py | 4 +--- 5 files changed, 9 insertions(+), 26 deletions(-) diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py index ea29292f445..75882c4f5dd 100644 --- a/addons/product/pricelist.py +++ b/addons/product/pricelist.py @@ -155,7 +155,6 @@ class product_pricelist(osv.osv): currency_obj = self.pool.get('res.currency') product_obj = self.pool.get('product.product') - product_template_obj = self.pool.get('product.template') product_category_obj = self.pool.get('product.category') product_uom_obj = self.pool.get('product.uom') supplierinfo_obj = self.pool.get('product.supplierinfo') @@ -246,7 +245,7 @@ class product_pricelist(osv.osv): price = 0.0 if sinfo: qty_in_product_uom = qty - product_default_uom = product_template_obj.read(cr, uid, [tmpl_id], ['uom_id'])[0]['uom_id'][0] + product_default_uom = product_obj.read(cr, uid, [product_id], ['uom_id'])[0]['uom_id'][0] supplier = supplierinfo_obj.browse(cr, uid, sinfo, context=context)[0] seller_uom = supplier.product_uom and supplier.product_uom.id or False if seller_uom and product_default_uom and product_default_uom != seller_uom: diff --git a/addons/product_visible_discount/product_visible_discount.py b/addons/product_visible_discount/product_visible_discount.py index 5d833ea6b53..d477d2bd8c3 100644 --- a/addons/product_visible_discount/product_visible_discount.py +++ b/addons/product_visible_discount/product_visible_discount.py @@ -47,7 +47,6 @@ class sale_order_line(osv.osv): item_obj = self.pool.get('product.pricelist.item') price_type_obj = self.pool.get('product.price.type') product_obj = self.pool.get('product.product') - template_obj = self.pool.get('product.template') field_name = 'list_price' if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False): @@ -57,9 +56,7 @@ class sale_order_line(osv.osv): field_name = price_type_obj.browse(cr, uid, item_base).field product = product_obj.browse(cr, uid, product_id, context) - product_tmpl_id = product.product_tmpl_id.id - - product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context) + product_read = product_obj.read(cr, uid, product_id, [field_name], context) factor = 1.0 if uom and uom != product.uom_id.id: @@ -110,7 +107,6 @@ class account_invoice_line(osv.osv): item_obj = self.pool.get('product.pricelist.item') price_type_obj = self.pool.get('product.price.type') product_obj = self.pool.get('product.product') - template_obj = self.pool.get('product.template') field_name = 'list_price' if res_dict.get('item_id',False) and res_dict['item_id'].get(pricelist,False): @@ -120,9 +116,7 @@ class account_invoice_line(osv.osv): field_name = price_type_obj.browse(cr, uid, item_base).field product = product_obj.browse(cr, uid, product_id, context) - product_tmpl_id = product.product_tmpl_id.id - - product_read = template_obj.read(cr, uid, product_tmpl_id, [field_name], context) + product_read = product_obj.read(cr, uid, product_id, [field_name], context) factor = 1.0 if uom and uom != product.uom_id.id: diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py index 9171cbc595e..9a00a6d62ce 100644 --- a/addons/stock/wizard/stock_change_product_qty.py +++ b/addons/stock/wizard/stock_change_product_qty.py @@ -103,20 +103,14 @@ class stock_change_product_qty(osv.osv_memory): self.change_product_qty_send_note(cr, uid, [data.id], context) return {} - def change_product_qty_send_note (self, cr, uid, ids, context=None): + def change_product_qty_send_note(self, cr, uid, ids, context=None): prod_obj = self.pool.get('product.product') location_obj = self.pool.get('stock.location') - prod_temp_obj = self.pool.get('product.template') - uom_obj = self.pool.get('product.uom') for data in self.browse(cr, uid, ids, context=context): - for location in location_obj.browse(cr, uid, [data.location_id.id], context=context): - location_name = location.name - for prod in prod_obj.browse(cr, uid, [data.product_id.id], context=context): - for prod_temp in prod_temp_obj.browse(cr, uid, [prod.product_tmpl_id.id], context=context): - for uom in uom_obj.browse(cr, uid, [prod_temp.uom_id.id], context=context): - message = _("Quantity has been changed to %s %s for %s location.") % (data.new_quantity,uom.name,location_name) - prod_obj.message_append_note(cr, uid, [prod.id], body=message, context=context) + location_name = location_obj.browse(cr, uid, data.location_id.id, context=context).name + message = _("Quantity has been changed to %s %s for %s location.") % (data.new_quantity, data.product_id.uom_id.name, location_name) + prod_obj.message_append_note(cr, uid, [data.product_id.id], body=message, context=context) stock_change_product_qty() diff --git a/addons/stock_planning/wizard/stock_planning_createlines.py b/addons/stock_planning/wizard/stock_planning_createlines.py index a6e12ad4bc7..3d43241341d 100644 --- a/addons/stock_planning/wizard/stock_planning_createlines.py +++ b/addons/stock_planning/wizard/stock_planning_createlines.py @@ -56,7 +56,6 @@ class stock_planning_createlines(osv.osv_memory): planning_obj = self.pool.get('stock.planning') mod_obj = self.pool.get('ir.model.data') prod_categ_obj = self.pool.get('product.category') - template_obj = self.pool.get('product.template') planning_lines = [] for f in self.browse(cr, uid, ids, context=context): if f.forecasted_products: @@ -67,8 +66,7 @@ class stock_planning_createlines(osv.osv_memory): else: categ_ids = f.product_categ_id.id and [f.product_categ_id.id] or [] prod_categ_ids = prod_categ_obj.search(cr,uid,[('parent_id','child_of',categ_ids)]) - templates_ids = template_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) - products_id1 = product_obj.search(cr,uid,[('product_tmpl_id','in',templates_ids)]) + products_id1 = product_obj.search(cr,uid,[('categ_id','in',prod_categ_ids)]) if len(products_id1)==0: raise osv.except_osv(_('Error !'), _('No forecasts for selected period or no products in selected category !')) diff --git a/addons/stock_planning/wizard/stock_planning_forecast.py b/addons/stock_planning/wizard/stock_planning_forecast.py index 9f73cf257eb..c72ac0599ea 100644 --- a/addons/stock_planning/wizard/stock_planning_forecast.py +++ b/addons/stock_planning/wizard/stock_planning_forecast.py @@ -49,13 +49,11 @@ class stock_sale_forecast_createlines(osv.osv_memory): forecast_obj = self.pool.get('stock.sale.forecast') mod_obj = self.pool.get('ir.model.data') prod_categ_obj = self.pool.get('product.category') - template_obj = self.pool.get('product.template') forecast_lines = [] for f in self.browse(cr, uid, ids, context=context): categ_ids = f.product_categ_id.id and [f.product_categ_id.id] or [] prod_categ_ids = prod_categ_obj.search(cr, uid, [('parent_id','child_of', categ_ids)]) - templates_ids = template_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)]) - products_ids = product_obj.search(cr, uid, [('product_tmpl_id','in',templates_ids)]) + products_ids = product_obj.search(cr, uid, [('categ_id','in',prod_categ_ids)]) if len(products_ids) == 0: raise osv.except_osv(_('Error !'), _('No products in selected category !')) copy = f.copy_forecast From 8ba18ce67755810d87b343c95f19e90e6e4c4c9e Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 9 Jul 2012 18:41:17 +0200 Subject: [PATCH 122/163] [FIX] timedelta doesn't have a 'months' parameter bzr revid: qdp-launchpad@openerp.com-20120709164117-bqjxqxeujhcdikim --- addons/event/event_demo.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/event/event_demo.yml b/addons/event/event_demo.yml index 5fe1fb4ef12..6f843fd0965 100644 --- a/addons/event/event_demo.yml +++ b/addons/event/event_demo.yml @@ -33,8 +33,8 @@ - !record {model: event.event, id: event_2}: name: 'Conference on ERP Business' - date_begin: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 14:00:00') - date_end: !eval (datetime.today()+ timedelta(months=2)).strftime('%Y-%m-%d 16:30:00') + date_begin: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 14:00:00') + date_end: !eval (datetime.today()+ timedelta(days=20)).strftime('%Y-%m-%d 16:30:00') register_min: 50 register_max: 350 type: event_type_2 From 3c67b48a2ae96df1d0474da292b5272e13fb4090 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 19:08:07 +0200 Subject: [PATCH 123/163] Improvements to dropdown menu, form view buttons and kanban vignette bzr revid: mit@openerp.com-20120709170807-f9x3v147bqamg7wd --- addons/web/static/src/css/base.css | 12 ++++++++---- addons/web/static/src/css/base.sass | 11 +++++++---- addons/web_kanban/static/src/css/kanban.css | 10 +++++++++- addons/web_kanban/static/src/css/kanban.sass | 7 ++++++- 4 files changed, 30 insertions(+), 10 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a9c9508c4e5..a9e2ebaf6d0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -386,8 +386,11 @@ visibility: hidden; } .openerp .oe_button_box { - width: 200px; - text-align: center; + width: 38%; + text-align: right; +} +.openerp .oe_button_box button { + margin: 4px; } .openerp .oe_avatar { margin: 0 16px 0 0; @@ -536,7 +539,7 @@ cursor: pointer; } .openerp .oe_dropdown_toggle { - color: #888888; + color: #404040; font-weight: normal; } .openerp .oe_dropdown_hover:hover .oe_dropdown_menu, .openerp .oe_dropdown_menu.oe_opened { @@ -545,7 +548,8 @@ .openerp .oe_dropdown_menu { display: none; position: absolute; - top: 32px; + top: 26px; + left: 0; z-index: 1; border: 1px solid #afafb6; background: white; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ba858ca8877..8d13bf8b046 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -329,8 +329,10 @@ $colour4: #8a89ba clear: both visibility: hidden .oe_button_box - width: 200px - text-align: center + width: 38% + text-align: right + button + margin: 4px .oe_avatar margin: 0 16px 0 0 img @@ -431,14 +433,15 @@ $colour4: #8a89ba position: relative cursor: pointer .oe_dropdown_toggle - color: #888 + color: #404040 font-weight: normal .oe_dropdown_hover:hover .oe_dropdown_menu, .oe_dropdown_menu.oe_opened display: block .oe_dropdown_menu display: none position: absolute - top: 32px + top: 26px + left: 0 z-index: 1 border: 1px solid #afafb6 background: white diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 1128d2cdaff..dc44c142683 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -375,8 +375,11 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2); } +.openerp .oe_kanban_view .oe_kanban_footer_left { + margin-top: 2px; +} .openerp .oe_kanban_view .oe_kanban_footer_left > span { - margin-top: 4px; + margin-top: 2px; display: inline-block; background: #e6e6e6; border: 1px solid #b9b9b9; @@ -385,6 +388,11 @@ -webkit-border-radius: 3px; border-radius: 3px; } +.openerp .oe_kanban_view .oe_kanban_bottom_right { + float: right; + position: relative; + top: 1px; +} .openerp .oe_kanban_view .oe_kanban_status { display: inline-block; height: 12px; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index facdc32e326..d2aa0615f67 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -319,13 +319,18 @@ @include radius(3px) @include box-shadow(0 1px 2px rgba(0,0,0,0.2)) .oe_kanban_footer_left + margin-top: 2px > span - margin-top: 4px + margin-top: 2px display: inline-block background: #E6E6E6 border: 1px solid #B9B9B9 padding: 1px 2px @include radius(3px) + .oe_kanban_bottom_right + float: right + position: relative + top: 1px .oe_kanban_status display: inline-block From a33b11a25a7deca87959b15dd40c600591794f94 Mon Sep 17 00:00:00 2001 From: Minh Tran Date: Mon, 9 Jul 2012 19:24:53 +0200 Subject: [PATCH 124/163] Added icons to kanban label for followers and messages bzr revid: mit@openerp.com-20120709172453-tsvtcz007rzitvy1 --- addons/crm/crm_lead_view.xml | 2 +- addons/mail/mail_thread.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 85f9a4aab5d..888764309ec 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -316,7 +316,7 @@ :
-
+
7 7
-
-
+
+
@@ -42,11 +42,6 @@ form
-
-
@@ -57,6 +52,11 @@
+
+
@@ -76,9 +76,6 @@ form
-
-
+
+
diff --git a/addons/stock/wizard/stock_partial_move_view.xml b/addons/stock/wizard/stock_partial_move_view.xml index 497467025b5..3e0699ec3d8 100644 --- a/addons/stock/wizard/stock_partial_move_view.xml +++ b/addons/stock/wizard/stock_partial_move_view.xml @@ -21,13 +21,13 @@ form
-
+ + +
- - + diff --git a/addons/stock/wizard/stock_partial_picking_view.xml b/addons/stock/wizard/stock_partial_picking_view.xml index c8da4459efa..fdbcabb9ed7 100644 --- a/addons/stock/wizard/stock_partial_picking_view.xml +++ b/addons/stock/wizard/stock_partial_picking_view.xml @@ -16,11 +16,6 @@ form
-
-
@@ -36,6 +31,11 @@ +
+
diff --git a/addons/stock/wizard/stock_return_picking_view.xml b/addons/stock/wizard/stock_return_picking_view.xml index 06e318c295e..5cdad44f681 100644 --- a/addons/stock/wizard/stock_return_picking_view.xml +++ b/addons/stock/wizard/stock_return_picking_view.xml @@ -59,16 +59,16 @@ form
-
-
diff --git a/addons/stock/wizard/stock_splitinto_view.xml b/addons/stock/wizard/stock_splitinto_view.xml index 573014b7cac..52b182a3f27 100644 --- a/addons/stock/wizard/stock_splitinto_view.xml +++ b/addons/stock/wizard/stock_splitinto_view.xml @@ -7,15 +7,15 @@ form
-
-
+
+
diff --git a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml index db78799f000..e65f378a638 100644 --- a/addons/stock_planning/wizard/stock_planning_create_periods_view.xml +++ b/addons/stock_planning/wizard/stock_planning_create_periods_view.xml @@ -9,7 +9,11 @@ form
-
+ + + + +
- - - - +
diff --git a/addons/stock_planning/wizard/stock_planning_createlines_view.xml b/addons/stock_planning/wizard/stock_planning_createlines_view.xml index e51ab4a3ba0..458994621c1 100644 --- a/addons/stock_planning/wizard/stock_planning_createlines_view.xml +++ b/addons/stock_planning/wizard/stock_planning_createlines_view.xml @@ -8,11 +8,6 @@ form
-
-
@@ -20,6 +15,11 @@ +
+
diff --git a/addons/stock_planning/wizard/stock_planning_forecast_view.xml b/addons/stock_planning/wizard/stock_planning_forecast_view.xml index 3c31404a070..0f3018350c0 100644 --- a/addons/stock_planning/wizard/stock_planning_forecast_view.xml +++ b/addons/stock_planning/wizard/stock_planning_forecast_view.xml @@ -9,11 +9,6 @@ form
-
-
@@ -21,6 +16,11 @@ +
+
diff --git a/addons/wiki/wizard/wiki_create_menu_view.xml b/addons/wiki/wizard/wiki_create_menu_view.xml index 45c4ba6a487..213ca9dd2e2 100644 --- a/addons/wiki/wizard/wiki_create_menu_view.xml +++ b/addons/wiki/wizard/wiki_create_menu_view.xml @@ -10,15 +10,15 @@ form
-
-
+
+
diff --git a/addons/wiki/wizard/wiki_make_index_view.xml b/addons/wiki/wizard/wiki_make_index_view.xml index c818721c09c..90139c3afac 100644 --- a/addons/wiki/wizard/wiki_make_index_view.xml +++ b/addons/wiki/wizard/wiki_make_index_view.xml @@ -10,13 +10,13 @@ form
-
+ +
- -
diff --git a/addons/wiki/wizard/wiki_show_diff_view.xml b/addons/wiki/wizard/wiki_show_diff_view.xml index c5b3583b1e5..4729586c858 100644 --- a/addons/wiki/wizard/wiki_show_diff_view.xml +++ b/addons/wiki/wizard/wiki_show_diff_view.xml @@ -10,11 +10,11 @@ form
-
-
+
+
diff --git a/addons/wiki/wizard/wiki_wiki_page_open_view.xml b/addons/wiki/wizard/wiki_wiki_page_open_view.xml index 9be2d4d22aa..49f333e453f 100644 --- a/addons/wiki/wizard/wiki_wiki_page_open_view.xml +++ b/addons/wiki/wizard/wiki_wiki_page_open_view.xml @@ -10,12 +10,12 @@ form
-
+
-
From fb7120d7b60aa04d5eb6580fb7dc769f8a46720c Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Tue, 10 Jul 2012 23:21:15 +0200 Subject: [PATCH 147/163] Add analytic account on taxes and invoice tax lines. bzr revid: alexis@via.ecp.fr-20120710212115-r56jev507ka9eca5 --- addons/account/account.py | 10 ++++++++-- addons/account/account_invoice.py | 12 ++++++++---- addons/account/account_invoice_view.xml | 2 ++ addons/account/account_view.xml | 4 ++-- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index caf1d68c45d..36e540359f5 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1862,8 +1862,10 @@ class account_tax(osv.osv): 'applicable_type': fields.selection( [('true','Always'), ('code','Given by Python Code')], 'Applicability', required=True, help="If not applicable (computed through a Python code), the tax won't appear on the invoice."), 'domain':fields.char('Domain', size=32, help="This field is only used if you develop your own module allowing developers to create specific taxes in a custom domain."), - 'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account'), - 'account_paid_id':fields.many2one('account.account', 'Refund Tax Account'), + 'account_collected_id':fields.many2one('account.account', 'Invoice Tax Account', help="Set the account that will be set by default on invoice tax lines for invoices. Leave empty to use the expense account."), + 'account_paid_id':fields.many2one('account.account', 'Refund Tax Account', help="Set the account that will be set by default on invoice tax lines for refunds. Leave empty to use the expense account."), + 'account_analytic_collected_id':fields.many2one('account.analytic.account', 'Invoice Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for invoices. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."), + 'account_analytic_paid_id':fields.many2one('account.analytic.account', 'Refund Tax Analytic Account', help="Set the analytic account that will be used by default on the invoice tax lines for refunds. Leave empty if you don't want to use an analytic account on the invoice tax lines by default."), 'parent_id':fields.many2one('account.tax', 'Parent Tax Account', select=True), 'child_ids':fields.one2many('account.tax', 'parent_id', 'Child Tax Accounts'), 'child_depend':fields.boolean('Tax on Children', help="Set if the tax computation is based on the computation of child taxes rather than on the total amount."), @@ -2001,6 +2003,8 @@ class account_tax(osv.osv): 'name':tax.description and tax.description + " - " + tax.name or tax.name, 'account_collected_id':tax.account_collected_id.id, 'account_paid_id':tax.account_paid_id.id, + 'account_analytic_collected_id': tax.account_analytic_collected_id.id, + 'account_analytic_paid_id': tax.account_analytic_paid_id.id, 'base_code_id': tax.base_code_id.id, 'ref_base_code_id': tax.ref_base_code_id.id, 'sequence': tax.sequence, @@ -2160,6 +2164,8 @@ class account_tax(osv.osv): 'amount': amount, 'account_collected_id': tax.account_collected_id.id, 'account_paid_id': tax.account_paid_id.id, + 'account_analytic_collected_id': tax.account_analytic_collected_id.id, + 'account_analytic_paid_id': tax.account_analytic_paid_id.id, 'base_code_id': tax.base_code_id.id, 'ref_base_code_id': tax.ref_base_code_id.id, 'sequence': tax.sequence, diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index c6011979f8d..5e27a2e3663 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -756,7 +756,7 @@ class account_invoice(osv.osv): for tax in inv.tax_line: if tax.manual: continue - key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id) + key = (tax.tax_code_id.id, tax.base_code_id.id, tax.account_id.id, tax.account_analytic_id.id) tax_key.append(key) if not key in compute_taxes: raise osv.except_osv(_('Warning !'), _('Global taxes defined, but they are not in invoice lines !')) @@ -1002,7 +1002,7 @@ class account_invoice(osv.osv): 'quantity': x.get('quantity',1.00), 'product_id': x.get('product_id', False), 'product_uom_id': x.get('uos_id', False), - 'analytic_account_id': x.get('account_analytic_id', False), + 'analytic_account_id': x.get('analytic_account_id', False), } def action_number(self, cr, uid, ids, context=None): @@ -1578,6 +1578,7 @@ class account_invoice_tax(osv.osv): 'invoice_id': fields.many2one('account.invoice', 'Invoice Line', ondelete='cascade', select=True), 'name': fields.char('Tax Description', size=64, required=True), 'account_id': fields.many2one('account.account', 'Tax Account', required=True, domain=[('type','<>','view'),('type','<>','income'), ('type', '<>', 'closed')]), + 'account_analytic_id': fields.many2one('account.analytic.account', 'Analytic account'), 'base': fields.float('Base', digits_compute=dp.get_precision('Account')), 'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')), 'manual': fields.boolean('Manual'), @@ -1648,14 +1649,16 @@ class account_invoice_tax(osv.osv): val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) val['account_id'] = tax['account_collected_id'] or line.account_id.id + val['account_analytic_id'] = tax['account_analytic_collected_id'] else: val['base_code_id'] = tax['ref_base_code_id'] val['tax_code_id'] = tax['ref_tax_code_id'] val['base_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['base'] * tax['ref_base_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) val['tax_amount'] = cur_obj.compute(cr, uid, inv.currency_id.id, company_currency, val['amount'] * tax['ref_tax_sign'], context={'date': inv.date_invoice or time.strftime('%Y-%m-%d')}, round=False) val['account_id'] = tax['account_paid_id'] or line.account_id.id + val['account_analytic_id'] = tax['account_analytic_paid_id'] - key = (val['tax_code_id'], val['base_code_id'], val['account_id']) + key = (val['tax_code_id'], val['base_code_id'], val['account_id'], val['account_analytic_id']) if not key in tax_grouped: tax_grouped[key] = val else: @@ -1687,7 +1690,8 @@ class account_invoice_tax(osv.osv): 'price': t['amount'] or 0.0, 'account_id': t['account_id'], 'tax_code_id': t['tax_code_id'], - 'tax_amount': t['tax_amount'] + 'tax_amount': t['tax_amount'], + 'analytic_account_id': t['account_analytic_id'], }) return res diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 7121094641c..d852c95449d 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -98,6 +98,7 @@ + @@ -215,6 +216,7 @@ + diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index a89473af134..10a523dbf6b 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -909,9 +909,9 @@ -
-
From 86853063f9aa70cf2f406d0ce7550f4e8a343e1f Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 11 Jul 2012 16:55:26 +0200 Subject: [PATCH 161/163] [FIX] Previous kanban dropdown improvement broke kanban header dropdown bzr revid: fme@openerp.com-20120711145526-7sl5fxik34zgesw1 --- addons/web_kanban/static/src/css/kanban.css | 11 +++++++---- addons/web_kanban/static/src/css/kanban.sass | 13 +++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/addons/web_kanban/static/src/css/kanban.css b/addons/web_kanban/static/src/css/kanban.css index 4f3204e15f7..cd8a6da1d45 100644 --- a/addons/web_kanban/static/src/css/kanban.css +++ b/addons/web_kanban/static/src/css/kanban.css @@ -447,9 +447,6 @@ right: 3px; cursor: pointer; } -.openerp .oe_kanban_view .oe_dropdown_kanban > span { - visibility: hidden; -} .openerp .oe_kanban_view .oe_dropdown_kanban:hover { text-decoration: none; } @@ -458,9 +455,15 @@ top: 28px; min-width: 160px; } -.openerp .oe_kanban_view .oe_dropdown_kanban.oe_opened > span { +.openerp .oe_kanban_view .oe_kanban_header .oe_dropdown_kanban { + display: none; +} +.openerp .oe_kanban_view .oe_kanban_column .oe_dropdown_kanban.oe_opened > span { visibility: visible; } +.openerp .oe_kanban_view .oe_kanban_column .oe_dropdown_kanban > span { + visibility: hidden; +} .openerp .oe_kanban_view .oe_kanban_colorpicker { padding: 3px 6px; white-space: nowrap; diff --git a/addons/web_kanban/static/src/css/kanban.sass b/addons/web_kanban/static/src/css/kanban.sass index 39898f19094..b3452b9356b 100644 --- a/addons/web_kanban/static/src/css/kanban.sass +++ b/addons/web_kanban/static/src/css/kanban.sass @@ -364,16 +364,21 @@ top: -8px right: 3px cursor: pointer - > span - visibility: hidden &:hover text-decoration: none .oe_dropdown_menu left: 0 top: 28px min-width: 160px - .oe_dropdown_kanban.oe_opened > span - visibility: visible + .oe_kanban_header + .oe_dropdown_kanban + display: none + .oe_kanban_column + .oe_dropdown_kanban + &.oe_opened > span + visibility: visible + > span + visibility: hidden // }}} // KanbanColorPicker {{{ .oe_kanban_colorpicker From 510fe019ca075e12b9db95d9d71a8c58813337cd Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 11 Jul 2012 17:26:51 +0200 Subject: [PATCH 162/163] [CHG] Added dummy cell to kanban view bzr revid: fme@openerp.com-20120711152651-iaojxuurbxzgjevz --- addons/web_kanban/static/src/js/kanban.js | 5 ++--- addons/web_kanban/static/src/xml/web_kanban.xml | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 3480418c755..ce56b7a041f 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -219,7 +219,6 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ group.destroy(); }); this.groups = []; - this.$element.find('.oe_kanban_groups_headers, .oe_kanban_groups_records').empty(); }, do_add_groups: function(groups) { var self = this; @@ -227,7 +226,7 @@ instance.web_kanban.KanbanView = instance.web.View.extend({ self.groups[group.undefined_title ? 'unshift' : 'push'](group); }); var groups_started = _.map(this.groups, function(group) { - return group.appendTo(self.$element.find('.oe_kanban_groups_headers')); + return group.insertBefore(self.$element.find('.oe_kanban_groups_headers td:last')); }); return $.when.apply(null, groups_started).then(function () { self.on_groups_started(); @@ -394,7 +393,7 @@ instance.web_kanban.KanbanGroup = instance.web.OldWidget.extend({ self.quick.replace($(".oe_kanban_no_group_qc_placeholder")); } this.$records = $(QWeb.render('KanbanView.group_records_container', { widget : this})); - this.$records.appendTo(this.view.$element.find('.oe_kanban_groups_records')); + this.$records.insertBefore(this.view.$element.find('.oe_kanban_groups_records td:last')); this.$element.find(".oe_kanban_fold_icon").click(function() { self.do_toggle_fold(); self.view.compute_groups_width(); diff --git a/addons/web_kanban/static/src/xml/web_kanban.xml b/addons/web_kanban/static/src/xml/web_kanban.xml index 7eb453371b2..0557f71b85b 100644 --- a/addons/web_kanban/static/src/xml/web_kanban.xml +++ b/addons/web_kanban/static/src/xml/web_kanban.xml @@ -4,8 +4,10 @@
+ +
From 4358a245619d9f10b41f03c99dfd8f69a6e3a964 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20van=20der=20Essen?= Date: Wed, 11 Jul 2012 18:06:53 +0200 Subject: [PATCH 163/163] [FIX] missing name in a view form broke the point of sale bzr revid: fva@openerp.com-20120711160653-9sadlkxf30u9nwn2 --- openerp/addons/base/res/res_users_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 1d934b5d390..a429c84ede7 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -209,7 +209,7 @@ groups="base.group_multi_company" on_change="on_change_company_id(company_id)"/>
- +
- -

-
- By: -

-
- Open From: - - - , - - -

-
- Rate: -
- -
-
- -