From 6efd32d8e5de775c7ca222b7cac9ea367524d3be Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 28 May 2010 10:38:01 +0530 Subject: [PATCH 1/9] [IMP]sale:Corrected conflict in SQL report. bzr revid: apa@tinyerp.com-20100528050801-t6biri188t4dn8c5 --- addons/sale/report/sale_report.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 6bb34ea4472..cad05c8dcc8 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -36,13 +36,8 @@ class sale_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id':fields.many2one('product.product', 'Product', readonly=True), -<<<<<<< TREE - 'uom_id': fields.many2one('product.uom', 'Default Unit Of Measure', readonly=True), - 'product_qty':fields.float('# of Qty', readonly=True), -======= 'uom_name': fields.char('Default UoM', size=128, readonly=True), 'product_uom_qty':fields.float('# of Qty', readonly=True), ->>>>>>> MERGE-SOURCE 'partner_id':fields.many2one('res.partner', 'Partner', readonly=True), 'shop_id':fields.many2one('sale.shop', 'Shop', readonly=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), From 9180d920aa05a9e1e00796293c91619d649d6afc Mon Sep 17 00:00:00 2001 From: apa-tiny Date: Fri, 28 May 2010 12:01:04 +0530 Subject: [PATCH 2/9] [IMP]:stock,account:rename the buttons name of the SQL reports. bzr revid: apa@tinyerp.com-20100528063104-fwka6w697en3na9n --- .../account/report/account_analytic_entries_report_view.xml | 4 ++-- addons/account/report/account_analytic_report_view.xml | 4 ++-- addons/account/report/account_entries_report_view.xml | 4 ++-- addons/account/report/account_invoice_report_view.xml | 4 ++-- addons/stock/report/report_stock_picking_view.xml | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/account/report/account_analytic_entries_report_view.xml b/addons/account/report/account_analytic_entries_report_view.xml index 157a08f8ca5..82a063256c1 100644 --- a/addons/account/report/account_analytic_entries_report_view.xml +++ b/addons/account/report/account_analytic_entries_report_view.xml @@ -35,10 +35,10 @@ - - diff --git a/addons/account/report/account_analytic_report_view.xml b/addons/account/report/account_analytic_report_view.xml index eba69e2785b..f853b809867 100644 --- a/addons/account/report/account_analytic_report_view.xml +++ b/addons/account/report/account_analytic_report_view.xml @@ -36,10 +36,10 @@ - - diff --git a/addons/account/report/account_entries_report_view.xml b/addons/account/report/account_entries_report_view.xml index f61348c290c..5d1b99b578e 100644 --- a/addons/account/report/account_entries_report_view.xml +++ b/addons/account/report/account_entries_report_view.xml @@ -50,10 +50,10 @@ - - diff --git a/addons/account/report/account_invoice_report_view.xml b/addons/account/report/account_invoice_report_view.xml index 597e5f43675..94f181cd587 100644 --- a/addons/account/report/account_invoice_report_view.xml +++ b/addons/account/report/account_invoice_report_view.xml @@ -54,10 +54,10 @@ - - diff --git a/addons/stock/report/report_stock_picking_view.xml b/addons/stock/report/report_stock_picking_view.xml index c343b09931a..e570e2b55ea 100644 --- a/addons/stock/report/report_stock_picking_view.xml +++ b/addons/stock/report/report_stock_picking_view.xml @@ -54,10 +54,10 @@ - - From 948c9e8ae2fe92369cc247a65a02142ea0ab3a38 Mon Sep 17 00:00:00 2001 From: "ssi (Open ERP)" Date: Fri, 28 May 2010 12:29:50 +0530 Subject: [PATCH 3/9] [ADD] added new module marketing to manage menus bzr revid: ssi@tinyerp.com-20100528065950-ia7kz041py33m54k --- addons/marketing/__init__.py | 23 +++++++++++++++++ addons/marketing/__openerp__.py | 38 +++++++++++++++++++++++++++++ addons/marketing/marketing_view.xml | 6 +++++ 3 files changed, 67 insertions(+) create mode 100644 addons/marketing/__init__.py create mode 100644 addons/marketing/__openerp__.py create mode 100644 addons/marketing/marketing_view.xml diff --git a/addons/marketing/__init__.py b/addons/marketing/__init__.py new file mode 100644 index 00000000000..2aefd8b3c11 --- /dev/null +++ b/addons/marketing/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: + diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py new file mode 100644 index 00000000000..36cec655d15 --- /dev/null +++ b/addons/marketing/__openerp__.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2010 Tiny SPRL (). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +# +############################################################################## + + +{ + "name" : "Marketing", + "version" : "1.1", + "depends" : ["base"], + "author" : "Tiny", + "category": 'Generic Modules/Marketing', + "description": "Menu for Marketing", + 'website': 'http://www.openerp.com', + 'init_xml': [], + 'demo_xml':[], + 'update_xml': ['marketing_view.xml'], + 'demo_xml': [], + 'installable': True, + 'active': False, +} +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/marketing_view.xml b/addons/marketing/marketing_view.xml new file mode 100644 index 00000000000..b920ce369fc --- /dev/null +++ b/addons/marketing/marketing_view.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From e74b683ab5101ce1e495e097e6cfd87129a8eba5 Mon Sep 17 00:00:00 2001 From: "ssi (Open ERP)" Date: Fri, 28 May 2010 12:54:14 +0530 Subject: [PATCH 4/9] [IMP] marketing_campaign: modified menus and dependency bzr revid: ssi@tinyerp.com-20100528072414-8uatbvbl7g3rlrj4 --- addons/marketing_campaign/__openerp__.py | 5 ++++- addons/marketing_campaign/marketing_campaign_view.xml | 11 ++++++----- .../report/campaign_analysis_view.xml | 7 ++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index 9a10fdbaa3d..ad91466817c 100755 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -23,7 +23,8 @@ { "name" : "", "version" : "1.1", - "depends" : ["crm", + "depends" : ["marketing", + "crm", "document", "poweremail" # need to get this module form the branch # lp:poweremail @@ -34,11 +35,13 @@ """, 'website': 'http://www.openerp.com', 'init_xml': [], + 'demo_xml':[], 'update_xml': [ 'marketing_campaign_view.xml', 'marketing_campaign_data.xml', 'marketing_campaign_workflow.xml', 'report/campaign_analysis_view.xml', + 'marketing_campaign_demo.xml' ], 'demo_xml': [ 'marketing_campaign_demo.xml', diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml index 5a7f8529cc0..fb88b6d283d 100755 --- a/addons/marketing_campaign/marketing_campaign_view.xml +++ b/addons/marketing_campaign/marketing_campaign_view.xml @@ -1,7 +1,7 @@ - +