From 36fabd70a06bf53611211acdb932bf4554c15755 Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Tue, 23 Oct 2012 11:57:41 +0530 Subject: [PATCH 01/40] [IMP] purchase : string changed bzr revid: rpr@tinyerp.com-20121023062741-piioezk25796h9jf --- addons/purchase/res_config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py index 19b059d4d5b..75e42d14905 100644 --- a/addons/purchase/res_config.py +++ b/addons/purchase/res_config.py @@ -43,7 +43,7 @@ class purchase_config_settings(osv.osv_memory): 'group_costing_method':fields.boolean("Compute product cost price based on average cost", implied_group='product.group_costing_method', help="""Allows you to compute product cost price based on average cost."""), - 'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicings", + 'group_purchase_delivery_address': fields.boolean("Allow a different address for incoming products and invoicing", implied_group='purchase.group_delivery_invoice_address', help="Allows you to specify different delivery and invoice addresses on a purchase order."), 'module_warning': fields.boolean("Alerts by products or supplier", From a519d96aa9713574144340c6548032bfbf03178f Mon Sep 17 00:00:00 2001 From: "Rajesh Prajapati (OpenERP)" Date: Tue, 23 Oct 2012 12:26:10 +0530 Subject: [PATCH 02/40] [IMP] sale : string changed from plugin to plug-in bzr revid: rpr@tinyerp.com-20121023065610-41a67irfmb0t4tpn --- addons/base_setup/res_config.py | 4 ++-- addons/plugin_outlook/plugin_outlook.xml | 2 +- addons/plugin_thunderbird/plugin_thunderbird.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index 0dc4a0f0794..e7898395d62 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -60,14 +60,14 @@ class sale_config_settings(osv.osv_memory): 'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn', help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""), 'module_crm': fields.boolean('CRM'), - 'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plugin', + 'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plug-in', help="""The plugin allows you archive email and its attachments to the selected OpenERP objects. You can select a partner, or a lead and attach the selected mail as a .eml file in the attachment of a selected record. You can create documents for CRM Lead, Partner from the selected emails. This installs the module plugin_thunderbird."""), - 'module_plugin_outlook': fields.boolean('Enable Outlook plugin', + 'module_plugin_outlook': fields.boolean('Enable Outlook plug-in', help="""The Outlook plugin allows you to select an object that you would like to add to your email and its attachments from MS Outlook. You can select a partner, or a lead object and archive a selected diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index e99fbf72b6d..6ecbd14b31a 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -51,7 +51,7 @@
diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index 5ea5fc38219..cf30bdf0e9b 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -57,7 +57,7 @@
From 0696aa196d473ba2049f6f90b1b825f164bc8d5a Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 23 Oct 2012 14:19:49 +0530 Subject: [PATCH 03/40] [IMP] portal_sale: change help text for menus bzr revid: cha@tinyerp.com-20121023084949-vn1fz0axxqbj1oyt --- addons/portal_sale/portal_sale_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/portal_sale/portal_sale_view.xml b/addons/portal_sale/portal_sale_view.xml index 6b25d87b791..b46175f7feb 100644 --- a/addons/portal_sale/portal_sale_view.xml +++ b/addons/portal_sale/portal_sale_view.xml @@ -45,7 +45,7 @@ kanban,tree,form - No public products. + There are no public products. @@ -65,7 +65,7 @@ {'type':'receipt'} current - You don't have any payment. + You don't have any refunds or payments. Date: Tue, 23 Oct 2012 15:26:30 +0530 Subject: [PATCH 04/40] [IMP] sale : bullet removed and close button added bzr revid: rpr@tinyerp.com-20121023095630-uhfm502p6o8fn4d8 --- addons/plugin_outlook/plugin_outlook.xml | 11 ++++++---- .../plugin_thunderbird/plugin_thunderbird.xml | 21 +++++++++++-------- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/addons/plugin_outlook/plugin_outlook.xml b/addons/plugin_outlook/plugin_outlook.xml index 6ecbd14b31a..1d2917cf89e 100644 --- a/addons/plugin_outlook/plugin_outlook.xml +++ b/addons/plugin_outlook/plugin_outlook.xml @@ -19,14 +19,17 @@

Click on the link above to download the installer for either 32 or 64 bits, and execute it.

System requirements:

-
    -
  • 1. MS Outlook 2005 or above.
    • -
  • 2. MS .Net Framework 3.5 or above.
    • -
+
    +
  1. MS Outlook 2005 or above.
    2. +
  2. MS .Net Framework 3.5 or above.
    3. +
+
+
+ diff --git a/addons/plugin_thunderbird/plugin_thunderbird.xml b/addons/plugin_thunderbird/plugin_thunderbird.xml index cf30bdf0e9b..f1ec262c03f 100644 --- a/addons/plugin_thunderbird/plugin_thunderbird.xml +++ b/addons/plugin_thunderbird/plugin_thunderbird.xml @@ -20,19 +20,22 @@

Thunderbird plugin installation:

-
    -
  • 1. Save the Thunderbird plug-in.
    • -
  • 2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
    • -
  • 3. Select the plug-in (the file named openerp_plugin.xpi).
    • -
  • 4. Click "Install Now".
    • -
  • 5. Restart Thunderbird.
    • -
  • 6. From the Thunderbird menubar: OpenERP -> Configuration.
    • -
  • 7. Configure your openerp server.
    • -
+
    +
  1. Save the Thunderbird plug-in.
    2. +
  2. From the Thunderbird menubar: Tools ­> Add-ons -> Screwdriver/Wrench Icon -> Install add-on from file...
    3. +
  3. Select the plug-in (the file named openerp_plugin.xpi).
    4. +
  4. Click "Install Now".
    5. +
  5. Restart Thunderbird.
    6. +
  6. From the Thunderbird menubar: OpenERP -> Configuration.
    7. +
  7. Configure your openerp server.
    8. +
+
+
+ From c8d4483ba31475bcfac6f53084f70bbe6d6a8841 Mon Sep 17 00:00:00 2001 From: "Ajay Chauhan (OpenERP)" Date: Tue, 23 Oct 2012 15:27:56 +0530 Subject: [PATCH 05/40] [IMP] portal_event: change help text for event menu bzr revid: cha@tinyerp.com-20121023095756-6xssqpsxzw9wzbzz --- addons/portal_event/portal_event_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/portal_event/portal_event_view.xml b/addons/portal_event/portal_event_view.xml index 1e046bc9e7f..5d2397f6148 100755 --- a/addons/portal_event/portal_event_view.xml +++ b/addons/portal_event/portal_event_view.xml @@ -13,7 +13,7 @@ kanban,calendar,tree,form,graph {"search_default_upcoming":1} - No public events. + There are no public events. Date: Mon, 29 Oct 2012 11:59:03 +0530 Subject: [PATCH 06/40] [IMP]when sale order is cancelled,now it can be reset as draft bzr revid: kbh@tinyerp.com-20121029062903-13oxndmzs3r7ti2p --- addons/sale/sale.py | 5 +++++ addons/sale/sale_view.xml | 1 + 2 files changed, 6 insertions(+) diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 7c77e239abb..ffd56b54218 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -580,6 +580,11 @@ class sale_order(osv.osv): self.write(cr, uid, ids, {'state': 'cancel'}) return True + def action_draft(self, cr, uid, ids, context=None): + """Resets Sale Order as draft. + """ + return self.write(cr, uid, ids, {'state':'draft'}, context=context) + def action_button_confirm(self, cr, uid, ids, context=None): assert len(ids) == 1, 'This option should only be used for a single id at a time.' wf_service = netsvc.LocalService('workflow') diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 3d1c84659a3..e6d974d670a 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -164,6 +164,7 @@
+