From 5860907e8ed39c5a18634cfde1f51fc2315803d2 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Thu, 3 Mar 2011 18:57:14 +0530 Subject: [PATCH 001/121] [FIX] : stock: use string formatting instead of concatenation lp bug: https://launchpad.net/bugs/684741 fixed bzr revid: rha@tinyerp.com-20110303132714-xbng87llhw9knrfq --- addons/stock/stock.py | 6 +- .../stock/wizard/stock_change_product_qty.py | 2 +- addons/stock_planning/stock_planning.py | 82 ++++++++++--------- 3 files changed, 47 insertions(+), 43 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 0d4df7afc63..2c9d360af1e 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -1312,7 +1312,7 @@ class stock_picking(osv.osv): if pick.min_date: msg= _(' for the ')+ datetime.strptime(pick.min_date, '%Y-%m-%d %H:%M:%S').strftime('%m/%d/%Y') state_list = { - 'confirmed': _("is scheduled") + msg +'.', + 'confirmed': _('is scheduled %s.') % msg, 'assigned': _('is ready to process.'), 'cancel': _('is cancelled.'), 'done': _('is done.'), @@ -2383,7 +2383,7 @@ class stock_move(osv.osv): product_obj = self.pool.get('product.product') for new_move in self.browse(cr, uid, res, context=context): for (id, name) in product_obj.name_get(cr, uid, [new_move.product_id.id]): - message = _('Product ') + " '" + name + "' "+ _("is consumed with") + " '" + str(new_move.product_qty) + "' "+ _("quantity.") + message = _("Product '%s' is consumed with '%s' quantity.") %(name, new_move.product_qty) self.log(cr, uid, new_move.id, message) self.action_done(cr, uid, res) @@ -2592,7 +2592,7 @@ class stock_inventory(osv.osv): 'product_qty': line.product_qty }) move_ids.append(self._inventory_line_hook(cr, uid, line, value)) - message = _('Inventory') + " '" + inv.name + "' "+ _("is done.") + message = _("Inventory '%s' is done.") %(inv.name) self.log(cr, uid, inv.id, message) self.write(cr, uid, [inv.id], {'state': 'confirm', 'move_ids': [(6, 0, move_ids)]}) return True diff --git a/addons/stock/wizard/stock_change_product_qty.py b/addons/stock/wizard/stock_change_product_qty.py index f93cd9b8dbc..f9ae8e2b642 100644 --- a/addons/stock/wizard/stock_change_product_qty.py +++ b/addons/stock/wizard/stock_change_product_qty.py @@ -85,7 +85,7 @@ class stock_change_product_qty(osv.osv_memory): res_original = prod_obj_pool.browse(cr, uid, rec_id, context=context) for data in self.browse(cr, uid, ids, context=context): - inventory_id = inventry_obj.create(cr , uid, {'name': _('INV: ') + tools.ustr(res_original.name)}, context=context) + inventory_id = inventry_obj.create(cr , uid, {'name': _('INV: %s') % tools.ustr(res_original.name)}, context=context) line_data ={ 'inventory_id' : inventory_id, 'product_qty' : data.new_quantity, diff --git a/addons/stock_planning/stock_planning.py b/addons/stock_planning/stock_planning.py index 9fdd94c909d..160ce6a3c20 100644 --- a/addons/stock_planning/stock_planning.py +++ b/addons/stock_planning/stock_planning.py @@ -623,8 +623,8 @@ class stock_planning(osv.osv): user = self.pool.get('res.users').browse(cr, uid, uid, context=context) proc_id = self.pool.get('procurement.order').create(cr, uid, { 'company_id' : obj.company_id.id, - 'name': _('Manual planning for ') + obj.period_id.name, - 'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name, + 'name': _('Manual planning for %s') %(obj.period_id.name), + 'origin': _('MPS(%s) %s') %(user.login, obj.period_id.name), 'date_planned': obj.period_id.date_start, 'product_id': obj.product_id.id, 'product_qty': uom_qty, @@ -633,28 +633,30 @@ class stock_planning(osv.osv): 'product_uos': uos, 'location_id': obj.procure_to_stock and obj.warehouse_id.lot_stock_id.id or obj.warehouse_id.lot_input_id.id, 'procure_method': 'make_to_order', - 'note' : _("Procurement created in MPS by user: ") + str(user.login) + _(" Creation Date: ") + \ - time.strftime('%Y-%m-%d %H:%M:%S') + \ - _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \ - _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \ - _("\n Initial Stock: ") + str(obj.stock_start) + \ - _("\n Planned Out: ") + str(obj.planned_outgoing) + _(" Planned In: ") + str(obj.to_procure) + \ - _("\n Already Out: ") + str(obj.already_out) + _(" Already In: ") + str(obj.already_in) + \ - _("\n Confirmed Out: ") + str(obj.outgoing) + _(" Confirmed In: ") + str(obj.incoming) + \ - _("\n Planned Out Before: ") + str(obj.outgoing_before) + _(" Confirmed In Before: ") + \ - str(obj.incoming_before) + \ - _("\n Expected Out: ") + str(obj.outgoing_left) + _(" Incoming Left: ") + str(obj.incoming_left) + \ - _("\n Stock Simulation: ") + str(obj.stock_simulation) + _(" Minimum stock: ") + str(obj.minimum_op), - + 'note' : _(' Procurement created in MPS by user: %s Creation Date: %s \ + \n For period: %s \ + \n according to state: \ + \n Warehouse Forecast: %s \ + \n Initial Stock: %s \ + \n Planned Out: %s Planned In: %s \ + \n Already Out: %s Already In: %s \ + \n Confirmed Out: %s Confirmed In: %s \ + \n Planned Out Before: %s Confirmed In Before: %s \ + \n Expected Out: %s Incoming Left: %s \ + \n Stock Simulation: %s Minimum stock: %s') %(user.login, time.strftime('%Y-%m-%d %H:%M:%S'), + obj.period_id.name, obj.warehouse_forecast, obj.planned_outgoing, obj.stock_start, obj.to_procure, + obj.already_out, obj.already_in, obj.outgoing, obj.incoming, obj.outgoing_before, obj.incoming_before, + obj.outgoing_left, obj.incoming_left, obj.stock_simulation, obj.minimum_op) }, context=context) wf_service = netsvc.LocalService("workflow") wf_service.trg_validate(uid, 'procurement.order', proc_id, 'button_confirm', cr) self.calculate_planning(cr, uid, ids, context) prev_text = obj.history or "" self.write(cr, uid, ids, { - 'history': prev_text + _('Requisition (') + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') + str(obj.incoming_left) + \ - " " + obj.product_uom.name + "\n", + 'history': _('%s Requisition (%s, %s) %s %s \n') % (prev_text, user.login, time.strftime('%Y.%m.%d %H:%M'), + obj.incoming_left, obj.product_uom.name) }) + return True def internal_supply(self, cr, uid, ids, context, *args): @@ -668,29 +670,31 @@ class stock_planning(osv.osv): uom_qty, uom, uos_qty, uos = self._qty_to_standard(cr, uid, obj, context) user = self.pool.get('res.users').browse(cr, uid, uid, context) picking_id = self.pool.get('stock.picking').create(cr, uid, { - 'origin': _('MPS(') + str(user.login) +') '+ obj.period_id.name, - 'type': 'internal', - 'state': 'auto', - 'date': obj.period_id.date_start, - 'move_type': 'direct', - 'invoice_state': 'none', - 'company_id': obj.company_id.id, - 'note': _("Pick created from MPS by user: ") + str(user.login) + _(" Creation Date: ") + \ - time.strftime('%Y-%m-%d %H:%M:%S') + \ - _("\nFor period: ") + obj.period_id.name + _(" according to state:") + \ - _("\n Warehouse Forecast: ") + str(obj.warehouse_forecast) + \ - _("\n Initial Stock: ") + str(obj.stock_start) + \ - _("\n Planned Out: ") + str(obj.planned_outgoing) + _(" Planned In: ") + str(obj.to_procure) + \ - _("\n Already Out: ") + str(obj.already_out) + _(" Already In: ") + str(obj.already_in) + \ - _("\n Confirmed Out: ") + str(obj.outgoing) + _(" Confirmed In: ") + str(obj.incoming) + \ - _("\n Planned Out Before: ") + str(obj.outgoing_before) + _(" Confirmed In Before: ") + \ - str(obj.incoming_before) + \ - _("\n Expected Out: ") + str(obj.outgoing_left) + _(" Incoming Left: ") + str(obj.incoming_left) + \ - _("\n Stock Simulation: ") + str(obj.stock_simulation) + _(" Minimum stock: ") + str(obj.minimum_op), + 'origin': _('MPS(%s) %s') %(user.login, obj.period_id.name), + 'type': 'internal', + 'state': 'auto', + 'date': obj.period_id.date_start, + 'move_type': 'direct', + 'invoice_state': 'none', + 'company_id': obj.company_id.id, + 'note': _('Pick created from MPS by user: %s Creation Date: %s \ + \nFor period: %s according to state: \ + \n Warehouse Forecast: %s \ + \n Initial Stock: %s \ + \n Planned Out: %s Planned In: %s \ + \n Already Out: %s Already In: %s \ + \n Confirmed Out: %s Confirmed In: %s \ + \n Planned Out Before: %s Confirmed In Before: %s \ + \n Expected Out: %s Incoming Left: %s \ + \n Stock Simulation: %s Minimum stock: %s ') + % (user.login, time.strftime('%Y-%m-%d %H:%M:%S'), obj.period_id.name, obj.warehouse_forecast, + obj.stock_start, obj.planned_outgoing, obj.to_procure, obj.already_out, obj.already_in, + obj.outgoing, obj.incoming, obj.outgoing_before, obj.incoming_before, + obj.outgoing_left, obj.incoming_left, obj.stock_simulation, obj.minimum_op) }) move_id = self.pool.get('stock.move').create(cr, uid, { - 'name': _('MPS(') + str(user.login) +') '+ obj.period_id.name, + 'name': _('MPS(%s) %s') %(user.login, obj.period_id.name), 'picking_id': picking_id, 'product_id': obj.product_id.id, 'date': obj.period_id.date_start, @@ -712,8 +716,8 @@ class stock_planning(osv.osv): prev_text = obj.history or "" pick_name = self.pool.get('stock.picking').browse(cr, uid, picking_id).name self.write(cr, uid, ids, { - 'history' : prev_text + _('Pick List ')+ pick_name + " (" + str(user.login) + ", " + time.strftime('%Y.%m.%d %H:%M) ') \ - + str(obj.incoming_left) +" " + obj.product_uom.name + "\n", + 'history': _('%s Pick List %s (%s, %s) %s %s \n') % (prev_text, pick_name, user.login, time.strftime('%Y.%m.%d %H:%M'), + obj.incoming_left, obj.product_uom.name) }) return True From 285ef6b2c122f725489e695a47344ab3f7687527 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Tue, 8 Mar 2011 12:02:08 +0530 Subject: [PATCH 002/121] [IMP] : stock, stock_planning: changes in pot file bzr revid: rha@tinyerp.com-20110308063208-xnjsoli41w9vvxcb --- addons/stock/i18n/stock.pot | 38 ++++++-------- addons/stock_planning/i18n/stock_planning.pot | 49 ++++++++++++++++--- 2 files changed, 59 insertions(+), 28 deletions(-) diff --git a/addons/stock/i18n/stock.pot b/addons/stock/i18n/stock.pot index 4af2dea7948..b09b739c04e 100644 --- a/addons/stock/i18n/stock.pot +++ b/addons/stock/i18n/stock.pot @@ -685,12 +685,6 @@ msgstr "" msgid "Location Address" msgstr "" -#. module: stock -#: code:addons/stock/stock.py:2348 -#, python-format -msgid "is consumed with" -msgstr "" - #. module: stock #: help:stock.move,prodlot_id:0 msgid "Production lot is used to put a serial number on the production" @@ -812,6 +806,12 @@ msgstr "" msgid "Journal" msgstr "" +#. module: stock +#: code:addons/stock/stock.py:1315 +#, python-format +msgid "is scheduled %s." +msgstr "" + #. module: stock #: help:stock.picking,location_id:0 msgid "Keep empty if you produce at the location where the finished products are needed.Set a location if you produce at a fixed location. This can be a partner location if you subcontract the manufacturing operations." @@ -1848,12 +1848,6 @@ msgstr "" msgid "Automatic No Step Added" msgstr "" -#. module: stock -#: code:addons/stock/stock.py:2348 -#, python-format -msgid "Product " -msgstr "" - #. module: stock #: view:stock.location.product:0 msgid "Stock Location Analysis" @@ -3081,9 +3075,9 @@ msgid "Product Category" msgstr "" #. module: stock -#: code:addons/stock/wizard/stock_change_product_qty.py:74 +#: code:addons/stock/wizard/stock_change_product_qty.py:88 #, python-format -msgid "INV: " +msgid "INV: %s" msgstr "" #. module: stock @@ -3367,12 +3361,6 @@ msgstr "" msgid "Unplanned Qty" msgstr "" -#. module: stock -#: code:addons/stock/stock.py:1318 -#, python-format -msgid "is scheduled" -msgstr "" - #. module: stock #: field:stock.location,chained_company_id:0 msgid "Chained Company" @@ -3506,9 +3494,15 @@ msgid "It specifies attributes of packaging like type, quantity of packaging,etc msgstr "" #. module: stock -#: code:addons/stock/stock.py:2348 +#: code:addons/stock/stock.py:2386 #, python-format -msgid "quantity." +msgid "Product '%s' is consumed with '%s' quantity." +msgstr "" + +#. module: stock +#: code:addons/stock/stock.py:2595 +#, python-format +msgid "Inventory '%s' is done." msgstr "" #. module: stock diff --git a/addons/stock_planning/i18n/stock_planning.pot b/addons/stock_planning/i18n/stock_planning.pot index 5e08c46255c..66dca6a5ac3 100644 --- a/addons/stock_planning/i18n/stock_planning.pot +++ b/addons/stock_planning/i18n/stock_planning.pot @@ -294,10 +294,12 @@ msgid " Incoming Left: " msgstr "" #. module: stock_planning -#: code:addons/stock_planning/stock_planning.py:715 +#: code:addons/stock_planning/stock_planning.py:719 #, python-format -msgid "Pick List " +msgid "%s Pick List %s (%s, %s) %s %s \n" +"" msgstr "" +"" #. module: stock_planning #: view:stock.planning.createlines:0 @@ -408,7 +410,7 @@ msgstr "" #. module: stock_planning #: code:addons/stock_planning/stock_planning.py:626 #, python-format -msgid "Manual planning for " +msgid "Manual planning for %s" msgstr "" #. module: stock_planning @@ -442,7 +444,17 @@ msgstr "" #. module: stock_planning #: code:addons/stock_planning/stock_planning.py:636 #, python-format -msgid "Procurement created in MPS by user: " +msgid " Procurement created in MPS by user: %s Creation Date: %s \n" +" For period: %s \n" +" according to state: \n" +" Warehouse Forecast: %s \n" +" Initial Stock: %s \n" +" Planned Out: %s Planned In: %s \n" +" Already Out: %s Already In: %s \n" +" Confirmed Out: %s Confirmed In: %s \n" +" Planned Out Before: %s Confirmed In Before: %s \n" +" Expected Out: %s Incoming Left: %s \n" +" Stock Simulation: %s Minimum stock: %s" msgstr "" #. module: stock_planning @@ -775,6 +787,14 @@ msgstr "" msgid "Creates forecast lines for selected warehouse and period." msgstr "" +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:656 +#, python-format +msgid "%s Requisition (%s, %s) %s %s \n" +"" +msgstr "" +"" + #. module: stock_planning #: code:addons/stock_planning/stock_planning.py:655 #, python-format @@ -1204,6 +1224,14 @@ msgstr "" msgid "Product UoM" msgstr "" +#. module: stock_planning +#: code:addons/stock_planning/stock_planning.py:627 +#: code:addons/stock_planning/stock_planning.py:673 +#: code:addons/stock_planning/stock_planning.py:697 +#, python-format +msgid "MPS(%s) %s" +msgstr "" + #. module: stock_planning #: code:addons/stock_planning/stock_planning.py:627 #: code:addons/stock_planning/stock_planning.py:671 @@ -1213,9 +1241,18 @@ msgid "MPS(" msgstr "" #. module: stock_planning -#: code:addons/stock_planning/stock_planning.py:678 +#: code:addons/stock_planning/stock_planning.py:680 #, python-format -msgid "Pick created from MPS by user: " +msgid "Pick created from MPS by user: %s Creation Date: %s \n" +"For period: %s according to state: \n" +" Warehouse Forecast: %s \n" +" Initial Stock: %s \n" +" Planned Out: %s Planned In: %s \n" +" Already Out: %s Already In: %s \n" +" Confirmed Out: %s Confirmed In: %s \n" +" Planned Out Before: %s Confirmed In Before: %s \n" +" Expected Out: %s Incoming Left: %s \n" +" Stock Simulation: %s Minimum stock: %s " msgstr "" #. module: stock_planning From 64f9d7e94f5e3418320a1610540fec6ddd5de574 Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Tue, 8 Mar 2011 16:52:08 +0530 Subject: [PATCH 003/121] [IMP] : base_module_quality, crm, email_template, mail_gateway, sale_crm, share: string formatting bzr revid: rha@tinyerp.com-20110308112208-40jbv5er9w21xiw0 --- addons/base_module_quality/i18n/base_module_quality.pot | 3 +-- addons/base_module_quality/speed_test/speed_test.py | 2 +- addons/crm/crm_lead.py | 2 +- addons/crm/i18n/crm.pot | 6 ++++++ addons/email_template/email_template.py | 4 ++-- addons/email_template/i18n/email_template.pot | 2 +- addons/mail_gateway/i18n/mail_gateway.pot | 8 ++++---- addons/mail_gateway/mail_gateway.py | 8 ++++---- addons/sale_crm/i18n/sale_crm.pot | 9 ++------- addons/sale_crm/wizard/crm_make_sale.py | 2 +- addons/share/i18n/share.pot | 8 +++++--- addons/share/wizard/share_wizard.py | 4 ++-- 12 files changed, 30 insertions(+), 28 deletions(-) diff --git a/addons/base_module_quality/i18n/base_module_quality.pot b/addons/base_module_quality/i18n/base_module_quality.pot index f96e2828f60..94113a8a457 100644 --- a/addons/base_module_quality/i18n/base_module_quality.pot +++ b/addons/base_module_quality/i18n/base_module_quality.pot @@ -351,10 +351,9 @@ msgid "Error! Module is not properly loaded/installed" msgstr "" #. module: base_module_quality -#: code:addons/base_module_quality/speed_test/speed_test.py:115 #: code:addons/base_module_quality/speed_test/speed_test.py:116 #, python-format -msgid "Error in Read method" +msgid "Error in Read method: %s" msgstr "" #. module: base_module_quality diff --git a/addons/base_module_quality/speed_test/speed_test.py b/addons/base_module_quality/speed_test/speed_test.py index 611ada2c13e..21ddee92ea1 100644 --- a/addons/base_module_quality/speed_test/speed_test.py +++ b/addons/base_module_quality/speed_test/speed_test.py @@ -113,7 +113,7 @@ This test checks the speed of the module. Note that at least 5 demo data is need except Exception, e: self.log.warning('Error in read method', exc_info=True) list2 = [obj, _("Error in Read method")] - speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method") + ": %s " % e] + speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Error in Read method: %s") % e] else: if size < 5: speed_list = [obj, size, code_base_complexity, code_half_complexity, code_size_complexity, _("Warning! Not enough demo data")] diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 4507baad2f7..47b811963dc 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -279,7 +279,7 @@ class crm_lead(crm_case, osv.osv): if 'stage_id' in vals and vals['stage_id']: stage_obj = self.pool.get('crm.case.stage').browse(cr, uid, vals['stage_id'], context=context) - self.history(cr, uid, ids, _("Changed Stage to: ") + stage_obj.name, details=_("Changed Stage to: ") + stage_obj.name) + self.history(cr, uid, ids, _("Changed Stage to: %s") % stage_obj.name, details=_("Changed Stage to: %s") % stage_obj.name) message='' for case in self.browse(cr, uid, ids, context=context): if case.type == 'lead' or context.get('stage_type',False)=='lead': diff --git a/addons/crm/i18n/crm.pot b/addons/crm/i18n/crm.pot index 8757c33f9f7..860a11217da 100644 --- a/addons/crm/i18n/crm.pot +++ b/addons/crm/i18n/crm.pot @@ -2267,6 +2267,12 @@ msgstr "" msgid "The stage of opportunity '%s' has been changed to '%s'." msgstr "" +#. module: crm +#: code:addons/crm/crm_lead.py:282 +#, python-format +msgid "Changed Stage to: %s" +msgstr "" + #. module: crm #: selection:crm.segmentation.line,operator:0 msgid "Mandatory Expression" diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index ee94b4c7c37..bb0a1f94708 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -36,7 +36,7 @@ try: TEMPLATE_ENGINES.append(('mako', 'Mako Templates')) except ImportError: logging.getLogger('init').warning("module email_template: Mako templates not installed") - + try: from django.template import Context, Template as DjangoTemplate #Workaround for bug: @@ -316,7 +316,7 @@ This is useful for CRM leads for example"), default = {} default = default.copy() old = self.read(cr, uid, id, ['name'], context=context) - new_name = _("Copy of template ") + old.get('name', 'No Name') + new_name = _("Copy of template %s") % old.get('name', 'No Name') check = self.search(cr, uid, [('name', '=', new_name)], context=context) if check: new_name = new_name + '_' + random.choice('abcdefghij') + random.choice('lmnopqrs') + random.choice('tuvwzyz') diff --git a/addons/email_template/i18n/email_template.pot b/addons/email_template/i18n/email_template.pot index 54a559dcb89..09b9d459a2f 100644 --- a/addons/email_template/i18n/email_template.pot +++ b/addons/email_template/i18n/email_template.pot @@ -856,7 +856,7 @@ msgstr "" #. module: email_template #: code:addons/email_template/email_template.py:319 #, python-format -msgid "Copy of template " +msgid "Copy of template %s" msgstr "" #. module: email_template diff --git a/addons/mail_gateway/i18n/mail_gateway.pot b/addons/mail_gateway/i18n/mail_gateway.pot index 42cb1443822..2f951863a93 100644 --- a/addons/mail_gateway/i18n/mail_gateway.pot +++ b/addons/mail_gateway/i18n/mail_gateway.pot @@ -113,9 +113,9 @@ msgid "Partner" msgstr "" #. module: mail_gateway -#: code:addons/mail_gateway/mail_gateway.py:242 +#: code:addons/mail_gateway/mail_gateway.py:250 #, python-format -msgid " wrote on " +msgid " wrote on %s:\n" msgstr "" #. module: mail_gateway @@ -286,9 +286,9 @@ msgid "Cc" msgstr "" #. module: mail_gateway -#: code:addons/mail_gateway/mail_gateway.py:246 +#: code:addons/mail_gateway/mail_gateway.py:254 #, python-format -msgid " on " +msgid " on %s:\n" msgstr "" #. module: mail_gateway diff --git a/addons/mail_gateway/mail_gateway.py b/addons/mail_gateway/mail_gateway.py index 5dae3d3bb16..213d2376def 100644 --- a/addons/mail_gateway/mail_gateway.py +++ b/addons/mail_gateway/mail_gateway.py @@ -169,7 +169,7 @@ class mailgate_thread(osv.osv): 'message_id': message_id, 'attachment_ids': [(6, 0, attachments)] } - + obj.create(cr, uid, data, context=context) return True mailgate_thread() @@ -221,7 +221,7 @@ class mailgate_message(osv.osv): action_data = False action_pool = self.pool.get('ir.actions.act_window') message_pool = self.browse(cr ,uid, ids, context=context)[0] - att_ids = [x.id for x in message_pool.attachment_ids] + att_ids = [x.id for x in message_pool.attachment_ids] action_ids = action_pool.search(cr, uid, [('res_model', '=', 'ir.attachment')]) if action_ids: action_data = action_pool.read(cr, uid, action_ids[0], context=context) @@ -247,11 +247,11 @@ class mailgate_message(osv.osv): for message in self.browse(cr, uid, ids, context=context): msg_txt = '' if message.history: - msg_txt += (message.email_from or '/') + _(' wrote on ') + format_date_tz(message.date, tz) + ':\n\t' + msg_txt += (message.email_from or '/') + _(' wrote on %s:\n\t') % format_date_tz(message.date, tz) if message.description: msg_txt += self.truncate_data(cr, uid, message.description, context=context) else: - msg_txt = (message.user_id.name or '/') + _(' on ') + format_date_tz(message.date, tz) + ':\n\t' + msg_txt = (message.user_id.name or '/') + _(' on %s:\n\t') % format_date_tz(message.date, tz) msg_txt += message.name result[message.id] = msg_txt return result diff --git a/addons/sale_crm/i18n/sale_crm.pot b/addons/sale_crm/i18n/sale_crm.pot index 1903c196ce7..cbd1428243c 100644 --- a/addons/sale_crm/i18n/sale_crm.pot +++ b/addons/sale_crm/i18n/sale_crm.pot @@ -28,9 +28,10 @@ msgstr "" #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:108 #, python-format -msgid "is converted to Quotation." +msgid "Opportunity '%s' is converted to Quotation." msgstr "" + #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:89 #, python-format @@ -94,12 +95,6 @@ msgstr "" msgid "Converted to Sales Quotation(id: %s)." msgstr "" -#. module: sale_crm -#: code:addons/sale_crm/wizard/crm_make_sale.py:108 -#, python-format -msgid "Opportunity " -msgstr "" - #. module: sale_crm #: code:addons/sale_crm/wizard/crm_make_sale.py:92 #, python-format diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 3c17f278e16..50fbbc4dea3 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -105,7 +105,7 @@ class crm_make_sale(osv.osv_memory): new_id = sale_obj.create(cr, uid, vals) case_obj.write(cr, uid, [case.id], {'ref': 'sale.order,%s' % new_id}) new_ids.append(new_id) - message = _('Opportunity ') + " '" + case.name + "' "+ _("is converted to Quotation.") + message = _("Opportunity '%s' is converted to Quotation.") % (case.name) self.log(cr, uid, case.id, message) case_obj._history(cr, uid, [case], _("Converted to Sales Quotation(id: %s).") % (new_id)) diff --git a/addons/share/i18n/share.pot b/addons/share/i18n/share.pot index 2d90d0ba8ca..5fecafdfce3 100644 --- a/addons/share/i18n/share.pot +++ b/addons/share/i18n/share.pot @@ -61,10 +61,12 @@ msgid "Share Access Rules" msgstr "" #. module: share -#: code:addons/share/wizard/share_wizard.py:425 +#: code:addons/share/wizard/share_wizard.py:453 #, python-format msgid "Dear,\n" "\n" +"%s\n" +"\n" "" msgstr "" @@ -116,9 +118,9 @@ msgid "Generic Share Access URL" msgstr "" #. module: share -#: code:addons/share/wizard/share_wizard.py:429 +#: code:addons/share/wizard/share_wizard.py:457 #, python-format -msgid "You may use the following login and password to get access to this protected area:" +msgid "You may use the following login and password to get access to this protected area:\n" msgstr "" #. module: share diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py index 48243c57dda..6eda2360d2b 100644 --- a/addons/share/wizard/share_wizard.py +++ b/addons/share/wizard/share_wizard.py @@ -450,11 +450,11 @@ class share_create(osv.osv_memory): for result_line in wizard_data.result_line_ids: email_to = result_line.login subject = _('%s has shared OpenERP %s information with you') % (user.name, wizard_data.action_id.name) - body = _("Dear,\n\n") + subject + "\n\n" + body = _("Dear,\n\n%s\n\n") % subject body += _("To access it, you can go to the following URL:\n %s") % result_line.share_url body += "\n\n" if result_line.newly_created: - body += _("You may use the following login and password to get access to this protected area:") + "\n" + body += _("You may use the following login and password to get access to this protected area:\n") body += "%s: %s" % (_("Username"), result_line.login) + "\n" body += "%s: %s" % (_("Password"), result_line.password) + "\n" body += "%s: %s" % (_("Database"), cr.dbname) + "\n" From 5cd5e83cbf42201dfa58914eb067fac047edaf8b Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 9 Mar 2011 10:28:22 +0530 Subject: [PATCH 004/121] [IMP] : account,account_followup,project,project_scrum: string formatting bzr revid: rha@tinyerp.com-20110309045822-pcvetf2a2nd0o8kv --- addons/account/account.py | 2 +- addons/account/account_bank_statement.py | 3 +- addons/account/i18n/account.pot | 28 ++++---- addons/account/invoice.py | 2 +- .../i18n/account_followup.pot | 12 ++-- .../wizard/account_followup_print.py | 6 +- addons/project/i18n/project.pot | 6 ++ .../project/wizard/project_task_delegate.py | 2 +- addons/project_scrum/i18n/project_scrum.pot | 66 ++++++++----------- addons/project_scrum/project_scrum.py | 6 +- .../wizard/project_scrum_backlog_sprint.py | 4 +- 11 files changed, 64 insertions(+), 73 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index a2b8d228b1c..8289ca4f77c 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2947,7 +2947,7 @@ class wizard_multi_charts_accounts(osv.osv_memory): analitical_journal_bank = analitical_bank_ids and analitical_bank_ids[0] or False vals_journal['name']= vals['name'] - vals_journal['code']= _('BNK') + str(current_num) + vals_journal['code']= _('BNK%s') % str(current_num) vals_journal['sequence_id'] = seq_id vals_journal['type'] = line.account_type == 'cash' and 'cash' or 'bank' vals_journal['company_id'] = company_id diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 3e738d5e516..76ccad9e68a 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -303,8 +303,7 @@ class account_bank_statement(osv.osv): st = self.browse(cr, uid, st_id, context=context) if not (abs((st.balance_end or 0.0) - st.balance_end_real) < 0.0001): raise osv.except_osv(_('Error !'), - _('The statement balance is incorrect !\n') + - _('The expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end)) + _('The statement balance is incorrect !\nThe expected balance (%.2f) is different than the computed one. (%.2f)') % (st.balance_end_real, st.balance_end)) return True def statement_close(self, cr, uid, ids, journal_type='bank', context=None): diff --git a/addons/account/i18n/account.pot b/addons/account/i18n/account.pot index d8dbcb92c58..382fabf09fa 100644 --- a/addons/account/i18n/account.pot +++ b/addons/account/i18n/account.pot @@ -674,13 +674,6 @@ msgstr "" msgid "Partners Reconciled Today" msgstr "" -#. module: account -#: code:addons/account/account_bank_statement.py:306 -#, python-format -msgid "The statement balance is incorrect !\n" -"" -msgstr "" - #. module: account #: selection:account.payment.term.line,value:0 #: selection:account.tax.template,type:0 @@ -2459,9 +2452,10 @@ msgid "August" msgstr "" #. module: account -#: code:addons/account/account_bank_statement.py:307 +#: code:addons/account/account_bank_statement.py:306 #, python-format -msgid "The expected balance (%.2f) is different than the computed one. (%.2f)" +msgid "The statement balance is incorrect !\n" +"The expected balance (%.2f) is different than the computed one. (%.2f)" msgstr "" #. module: account @@ -2681,6 +2675,12 @@ msgstr "" msgid "View" msgstr "" +#. module: account +#: code:addons/account/account.py:2951 +#, python-format +msgid "BNK%s" +msgstr "" + #. module: account #: code:addons/account/account.py:2906 #: code:addons/account/installer.py:296 @@ -3997,12 +3997,6 @@ msgstr "" msgid "Account Balance -" msgstr "" -#. module: account -#: code:addons/account/invoice.py:989 -#, python-format -msgid "Invoice " -msgstr "" - #. module: account #: field:account.automatic.reconcile,date1:0 msgid "Starting Date" @@ -5238,9 +5232,9 @@ msgid "As soon as the reconciliation is done, the invoice's state turns to “do msgstr "" #. module: account -#: code:addons/account/invoice.py:989 +#: code:addons/account/invoice.py:997 #, python-format -msgid "is validated." +msgid "Invoice '%s' is validated." msgstr "" #. module: account diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 48e635aee53..2ce95b553fb 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -994,7 +994,7 @@ class account_invoice(osv.osv): ctx = context.copy() if obj_inv.type in ('out_invoice', 'out_refund'): ctx = self.get_log_context(cr, uid, context=ctx) - message = _('Invoice ') + " '" + name + "' "+ _("is validated.") + message = _("Invoice '%s' is validated.") % name self.log(cr, uid, inv_id, message, context=ctx) return True diff --git a/addons/account_followup/i18n/account_followup.pot b/addons/account_followup/i18n/account_followup.pot index b6af6aad958..ea2f84c6ed3 100644 --- a/addons/account_followup/i18n/account_followup.pot +++ b/addons/account_followup/i18n/account_followup.pot @@ -54,13 +54,13 @@ msgid "Group By..." msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:287 +#: code:addons/account_followup/wizard/account_followup_print.py:290 #, python-format msgid "\n" "\n" "E-Mail sent to following Partners successfully. !\n" "\n" -"" +"%s" msgstr "" #. module: account_followup @@ -430,11 +430,11 @@ msgid "Send email confirmation" msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:284 +#: code:addons/account_followup/wizard/account_followup_print.py:287 #, python-format msgid "All E-mails have been successfully sent to Partners:.\n" "\n" -"" +"%s" msgstr "" #. module: account_followup @@ -615,11 +615,11 @@ msgid "Maturity" msgstr "" #. module: account_followup -#: code:addons/account_followup/wizard/account_followup_print.py:286 +#: code:addons/account_followup/wizard/account_followup_print.py:289 #, python-format msgid "E-Mail not sent to following Partners, Email not available !\n" "\n" -"" +"%s" msgstr "" #. module: account_followup diff --git a/addons/account_followup/wizard/account_followup_print.py b/addons/account_followup/wizard/account_followup_print.py index 5d9c2da860f..483925add3a 100644 --- a/addons/account_followup/wizard/account_followup_print.py +++ b/addons/account_followup/wizard/account_followup_print.py @@ -284,10 +284,10 @@ class account_followup_print_all(osv.osv_memory): msg += partner.name + '\n' msg_unsent += msg if not msg_unsent: - summary = _("All E-mails have been successfully sent to Partners:.\n\n") + msg_sent + summary = _("All E-mails have been successfully sent to Partners:.\n\n%s") % msg_sent else: - msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n") + msg_unsent - msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n") + msg_sent + msg_unsent = _("E-Mail not sent to following Partners, Email not available !\n\n%s") % msg_unsent + msg_sent = msg_sent and _("\n\nE-Mail sent to following Partners successfully. !\n\n%s") % msg_sent line = '==========================================================================' summary = msg_unsent + line + msg_sent context.update({'summary': summary}) diff --git a/addons/project/i18n/project.pot b/addons/project/i18n/project.pot index 83049c55241..3566e54b5aa 100644 --- a/addons/project/i18n/project.pot +++ b/addons/project/i18n/project.pot @@ -58,6 +58,12 @@ msgstr "" msgid "Operation Not Permitted !" msgstr "" +#. module: project +#: code:addons/project/wizard/project_task_delegate.py:67 +#, python-format +msgid "CHECK: %s" +msgstr "" + #. module: project #: code:addons/project/wizard/project_task_delegate.py:55 #: code:addons/project/wizard/project_task_delegate.py:56 diff --git a/addons/project/wizard/project_task_delegate.py b/addons/project/wizard/project_task_delegate.py index 99dfa3b4d5a..2b47df9bca0 100644 --- a/addons/project/wizard/project_task_delegate.py +++ b/addons/project/wizard/project_task_delegate.py @@ -64,7 +64,7 @@ class project_task_delegate(osv.osv_memory): newname = tools.ustr(task_name).replace(_('CHECK: '), '') else: newname = tools.ustr(task_name or '') - prefix = _('CHECK: ') + newname + prefix = _('CHECK: %s') % newname res.update({'prefix': prefix}) if 'new_task_description' in fields: res.update({'new_task_description': task.description}) diff --git a/addons/project_scrum/i18n/project_scrum.pot b/addons/project_scrum/i18n/project_scrum.pot index 07a922fd2e9..9cf44c0dc89 100644 --- a/addons/project_scrum/i18n/project_scrum.pot +++ b/addons/project_scrum/i18n/project_scrum.pot @@ -219,6 +219,18 @@ msgstr "" msgid "Scrum Meeting of %s" msgstr "" +#. module: project_scrum +#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57 +#, python-format +msgid "Product Backlog '%s' is converted into Task %d." +msgstr "" + +#. module: project_scrum +#: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62 +#, python-format +msgid "Product Backlog '%s' is assigned sprint:%s" +msgstr "" + #. module: project_scrum #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:57 #: code:addons/project_scrum/wizard/project_scrum_backlog_sprint.py:62 @@ -253,12 +265,6 @@ msgstr "" msgid "None" msgstr "" -#. module: project_scrum -#: code:addons/project_scrum/project_scrum.py:325 -#, python-format -msgid "*Blocks encountered:" -msgstr "" - #. module: project_scrum #: view:project.scrum.product.backlog:0 msgid "Change Stage" @@ -390,12 +396,6 @@ msgstr "" msgid "Daily Scrum" msgstr "" -#. module: project_scrum -#: code:addons/project_scrum/project_scrum.py:324 -#, python-format -msgid "for the Sprint" -msgstr "" - #. module: project_scrum #: view:project.scrum.backlog.create.task:0 msgid "C_onvert" @@ -433,12 +433,6 @@ msgstr "" msgid "Scrum" msgstr "" -#. module: project_scrum -#: code:addons/project_scrum/project_scrum.py:324 -#, python-format -msgid "Hello " -msgstr "" - #. module: project_scrum #: field:project.scrum.meeting,question_today:0 msgid "Tasks for today" @@ -601,12 +595,6 @@ msgstr "" msgid "The person who is responsible for the product" msgstr "" -#. module: project_scrum -#: code:addons/project_scrum/project_scrum.py:325 -#, python-format -msgid "*Tasks since yesterday:" -msgstr "" - #. module: project_scrum #: view:project.scrum.meeting:0 #: view:project.scrum.sprint:0 @@ -745,12 +733,6 @@ msgstr "" msgid "View sprint backlog" msgstr "" -#. module: project_scrum -#: code:addons/project_scrum/project_scrum.py:325 -#, python-format -msgid "No Blocks" -msgstr "" - #. module: project_scrum #: field:project.scrum.meeting,question_backlog:0 msgid "Backlog Accurate" @@ -922,7 +904,23 @@ msgstr "" #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:324 #, python-format -msgid "I am sending you Daily Meeting Details of date" +msgid "Hello %s,\n" +" \n" +"I am sending you Daily Meeting Details of date %s for the Sprint %s\n" +"" +msgstr "" + +#. module: project_scrum +#: code:addons/project_scrum/project_scrum.py:325 +#, python-format +msgid "\n" +"*Tasks since yesterday:\n" +"_______________________%s\n" +"*Task for Today:\n" +"_______________________ %s\n" +"\n" +"*Blocks encountered:\n" +"_______________________ %s" msgstr "" #. module: project_scrum @@ -970,12 +968,6 @@ msgstr "" msgid "This wizard merge backlogs and create one new backlog with draft state (Old backlogs Will be deleted). And it also merge old tasks from backlogs" msgstr "" -#. module: project_scrum -#: code:addons/project_scrum/project_scrum.py:325 -#, python-format -msgid "*Task for Today:" -msgstr "" - #. module: project_scrum #: code:addons/project_scrum/project_scrum.py:303 #, python-format diff --git a/addons/project_scrum/project_scrum.py b/addons/project_scrum/project_scrum.py index 7d1d071a7c3..4d67b875c04 100644 --- a/addons/project_scrum/project_scrum.py +++ b/addons/project_scrum/project_scrum.py @@ -321,9 +321,9 @@ class project_scrum_meeting(osv.osv): meeting_id = self.browse(cr, uid, ids, context=context)[0] user = self.pool.get('res.users').browse(cr, uid, uid, context=context) user_email = email_from or user.address_id.email or email_from - body = _('Hello ') + meeting_id.sprint_id.scrum_master_id.name + ",\n" + " \n" +_('I am sending you Daily Meeting Details of date')+ ' %s ' % (meeting_id.date)+ _('for the Sprint')+ ' %s\n' % (meeting_id.sprint_id.name) - body += "\n"+ _('*Tasks since yesterday:')+ '\n_______________________%s' % (meeting_id.question_yesterday) + '\n' +_("*Task for Today:")+ '\n_______________________ %s\n' % (meeting_id.question_today )+ '\n' +_('*Blocks encountered:') +'\n_______________________ %s' % (meeting_id.question_blocks or _('No Blocks')) - body += "\n\n"+_('Thank you')+",\n"+ user.name + body = _("Hello %s,\n \nI am sending you Daily Meeting Details of date %s for the Sprint %s\n") %(meeting_id.sprint_id.scrum_master_id.name, meeting_id.date, meeting_id.sprint_id.name) + body += _('\n*Tasks since yesterday:\n_______________________%s\n*Task for Today:\n_______________________ %s\n\n*Blocks encountered:\n_______________________ %s') %(meeting_id.question_yesterday,meeting_id.question_today, meeting_id.question_blocks or _('No Blocks')) + body += _("\n\nThank you,\n%s") % user.name sub_name = meeting_id.name or _('Scrum Meeting of %s') % meeting_id.date flag = tools.email_send(user_email , [email], sub_name, body, reply_to=None, openobject_id=str(meeting_id.id)) if not flag: diff --git a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py index 591e1d5da62..a95a8f56c4a 100644 --- a/addons/project_scrum/wizard/project_scrum_backlog_sprint.py +++ b/addons/project_scrum/wizard/project_scrum_backlog_sprint.py @@ -54,12 +54,12 @@ class backlog_sprint_assign(osv.osv_memory): 'planned_hours':backlog.expected_hours, 'remaining_hours':backlog.expected_hours, }) - message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is converted into Task %d."%(task_id,)) + message = _("Product Backlog '%s' is converted into Task %d.") %(backlog.name, task_id) self.log(cr, uid, backlog.id, message) if data['state_open'] and backlog.state == "draft": backlog_obj.write(cr, uid, backlog.id, {'state':'open'}) sprint = sprint_obj.browse(cr, uid, data['sprint_id'], context=context) - message = _('Product Backlog') + " '" + backlog.name + "' "+ _("is assigned sprint:%s"%(sprint.name)) + message = _("Product Backlog '%s' is assigned sprint:%s") %(backlog.name, sprint.name) self.log(cr, uid, backlog.id, message) backlog_obj.write(cr, uid, backlog_ids, {'sprint_id': data['sprint_id']}, context=context) return {'type': 'ir.actions.act_window_close'} From 0ec541f6f46f52eb700ade3dd03c98f34277bbfc Mon Sep 17 00:00:00 2001 From: "Rifakat Haradwala (Open ERP)" Date: Wed, 9 Mar 2011 11:30:25 +0530 Subject: [PATCH 005/121] [IMP] : mrp: string formatting bzr revid: rha@tinyerp.com-20110309060025-7klq1juri4ho2f1z --- addons/mrp/report/price.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/addons/mrp/report/price.py b/addons/mrp/report/price.py index 85063c1a335..393797e43cb 100644 --- a/addons/mrp/report/price.py +++ b/addons/mrp/report/price.py @@ -147,12 +147,14 @@ class report_custom(report_rml): - """ xml += """ - """ + _('Total Cost of ') + str(number) +' '+ product.uom_id.name + """: + Total Cost of %d %s: - """+ rml_obj.formatLang(total_strd, digits=purchase_price_digits) +' '+ company_currency.symbol + """ - """+ rml_obj.formatLang(total, digits=purchase_price_digits) +' '+ company_currency.symbol + """ - '""" + %s %s + %s %s + '""" %(number, product.uom_id.name, rml_obj.formatLang(total_strd, digits=purchase_price_digits), + company_currency.symbol, rml_obj.formatLang(total, digits=purchase_price_digits),company_currency.symbol) + else: bom = bom_pool.browse(cr, uid, bom_id, context=context) factor = number * product.uom_id.factor / bom.product_uom.factor @@ -191,19 +193,22 @@ class report_custom(report_rml): xml += workcenter_header xml += "" + xml_tmp + '' xml += """ - """ + _('Work Cost of ') + str(number) +' '+ product.uom_id.name +""": + Work Cost of %d "%s: - """+ rml_obj.formatLang(total2, digits=purchase_price_digits) +' '+ company_currency.symbol +""" - '""" + %s %s + '""" %(number, product.uom_id.name, rml_obj.formatLang(total2, digits=purchase_price_digits), + company_currency.symbol) + xml += """ - """ + _('Total Cost of ') + str(number) +' '+ product.uom_id.name + """: + Total Cost of %d %s: - """+ rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits) +' '+ company_currency.symbol + """ + %s %s - '""" + '""" %(number, product.uom_id.name, rml_obj.formatLang(total_strd+total2, digits=purchase_price_digits), + company_currency.symbol) xml = '' + config_start + config_stop + xml + '' From 05e1ad923497620cf368304904bde76cca23665f Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Fri, 11 Mar 2011 15:29:39 +0530 Subject: [PATCH 006/121] [IMP]: images for purchase module. bzr revid: rch@tinyerp.com-20110311095939-1bkr276bn1osye1g --- addons/purchase/__openerp__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 58b049e130e..de09a96b028 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -26,15 +26,17 @@ 'category': 'Generic Modules/Sales & Purchases', 'description': """ Purchase module is for generating a purchase order for purchase of goods from a supplier. - A supplier invoice is created for the particular order placed + ----------------------------------------------------------------------------------------- + A supplier invoice is created for the particular purchase order. Dashboard for purchase management that includes: * Current Purchase Orders * Draft Purchase Orders - * Graph for quantity and amount per month + * Graph for quantity and amount per month """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['purchase_order.jpeg', 'purchase_analysis.jpeg', 'request_for_quotation.jpeg'], 'depends': ['base', 'account', 'stock', 'process', 'procurement'], 'data': [ 'security/purchase_security.xml', From 08741bacf456c911136b9f7152877f026ee10c3b Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Fri, 11 Mar 2011 17:02:59 +0530 Subject: [PATCH 007/121] [IMP]: purchase_requisition, purchase_analytic_plans and purchase_double_validation. bzr revid: rch@tinyerp.com-20110311113259-ozol9tf37lbk1bq0 --- addons/purchase_analytic_plans/__openerp__.py | 1 + addons/purchase_double_validation/__openerp__.py | 2 +- addons/purchase_requisition/__openerp__.py | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py index 743dce1006a..ebf829667a2 100644 --- a/addons/purchase_analytic_plans/__openerp__.py +++ b/addons/purchase_analytic_plans/__openerp__.py @@ -29,6 +29,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['purchase_analytic_distribution.jpeg'], 'depends': ['purchase', 'account_analytic_plans'], 'init_xml': [], 'update_xml': ['purchase_analytic_plans_view.xml'], diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py index ec482e0bab1..e0defbf4dc9 100644 --- a/addons/purchase_double_validation/__openerp__.py +++ b/addons/purchase_double_validation/__openerp__.py @@ -20,7 +20,7 @@ ############################################################################## { - "name" : "purchase_double_validation", + "name" : "Double Validation for Purchase", "version" : "1.1", "category": 'Generic Modules/Sales & Purchases', "depends" : ["base","purchase"], diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py index c63995a649a..ee46eaeb1bf 100644 --- a/addons/purchase_requisition/__openerp__.py +++ b/addons/purchase_requisition/__openerp__.py @@ -22,9 +22,11 @@ "version" : "0.1", "author" : "OpenERP SA", "category" : "Generic Modules/Sales & Purchases", + 'images': ['purchase_requisitions.jpeg'], "website" : "http://www.openerp.com", "description": """ This module allows you to manage your Purchase Requisition. + ----------------------------------------------------------- When a purchase order is created, you now have the opportunity to save the related requisition. This new object will regroup and will allow you to easily keep track and order all your purchase orders. """, From cb168e18b6873506d608e68fd19bebb485b48471 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 10:27:21 +0530 Subject: [PATCH 008/121] [ADD]: stock module. bzr revid: rch@tinyerp.com-20110314045721-18sk67itoou5srvl --- addons/purchase/__openerp__.py | 2 +- addons/purchase_analytic_plans/__openerp__.py | 2 +- addons/purchase_requisition/__openerp__.py | 2 +- addons/stock/__openerp__.py | 12 ++++++++---- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index de09a96b028..57356d81c79 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -36,7 +36,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'images': ['purchase_order.jpeg', 'purchase_analysis.jpeg', 'request_for_quotation.jpeg'], + 'images' : ['purchase_order.jpeg', 'purchase_analysis.jpeg', 'request_for_quotation.jpeg'], 'depends': ['base', 'account', 'stock', 'process', 'procurement'], 'data': [ 'security/purchase_security.xml', diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py index ebf829667a2..cf4928c9b87 100644 --- a/addons/purchase_analytic_plans/__openerp__.py +++ b/addons/purchase_analytic_plans/__openerp__.py @@ -29,7 +29,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'images': ['purchase_analytic_distribution.jpeg'], + 'images' : ['purchase_analytic_distribution.jpeg'], 'depends': ['purchase', 'account_analytic_plans'], 'init_xml': [], 'update_xml': ['purchase_analytic_plans_view.xml'], diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py index ee46eaeb1bf..a3eeb66b893 100644 --- a/addons/purchase_requisition/__openerp__.py +++ b/addons/purchase_requisition/__openerp__.py @@ -22,7 +22,7 @@ "version" : "0.1", "author" : "OpenERP SA", "category" : "Generic Modules/Sales & Purchases", - 'images': ['purchase_requisitions.jpeg'], + "images" : ['purchase_requisitions.jpeg'], "website" : "http://www.openerp.com", "description": """ This module allows you to manage your Purchase Requisition. diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 987a0e12493..7ab467e6ca1 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -23,7 +23,9 @@ "name" : "Inventory Management", "version" : "1.1", "author" : "OpenERP SA", - "description" : """OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations. + "description" : """ + OpenERP Inventory Management module can manage multi-warehouses, multi and structured stock locations. + ------------------------------------------------------------------------------------------------------ Thanks to the double entry management, the inventory controlling is powerful and flexible: * Moves history and planning, * Different inventory methods (FIFO, LIFO, ...) @@ -34,12 +36,14 @@ Thanks to the double entry management, the inventory controlling is powerful and * Rapid detection of mistakes through double entry system * Traceability (upstream/downstream, production lots, serial number, ...) * Dashboard for warehouse that includes: - * Products to receive in delay (date < = today) * Procurement in exception - * Graph : Number of Receive products vs planned (bar graph on week par day) - * Graph : Number of Delivery products vs planned (bar graph on week par day) + * List of Incoming Products + * List of Outgoing Products + * Graph : Products to receive in delay (date < = today) + * Graph : Products to send in delay (date < = today) """, "website" : "http://www.openerp.com", + "images" : ["delivery_orders.jpeg", "inventory_analysis.jpeg","location.jpeg","moves_analysis.jpeg","physical_inventories.jpeg","warehouse_dashboard.jpeg"], "depends" : ["product", "account"], "category" : "Generic Modules/Inventory Control", "init_xml" : [], From e6332012c2b563734a23edadc74038ed149bc27f Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 10:55:22 +0530 Subject: [PATCH 009/121] [ADD]: Images of stock_location module. bzr revid: rch@tinyerp.com-20110314052522-mc7uaf8g2207wclw --- addons/purchase/__openerp__.py | 2 +- addons/purchase_analytic_plans/__openerp__.py | 2 +- addons/purchase_requisition/__openerp__.py | 2 +- addons/stock/__openerp__.py | 2 +- addons/stock_location/__openerp__.py | 16 ++++++++-------- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py index 57356d81c79..f9a28c6b0da 100644 --- a/addons/purchase/__openerp__.py +++ b/addons/purchase/__openerp__.py @@ -36,7 +36,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'images' : ['purchase_order.jpeg', 'purchase_analysis.jpeg', 'request_for_quotation.jpeg'], + 'images' : ['images/purchase_order.jpeg', 'images/purchase_analysis.jpeg', 'images/request_for_quotation.jpeg'], 'depends': ['base', 'account', 'stock', 'process', 'procurement'], 'data': [ 'security/purchase_security.xml', diff --git a/addons/purchase_analytic_plans/__openerp__.py b/addons/purchase_analytic_plans/__openerp__.py index cf4928c9b87..b6727f136d4 100644 --- a/addons/purchase_analytic_plans/__openerp__.py +++ b/addons/purchase_analytic_plans/__openerp__.py @@ -29,7 +29,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'images' : ['purchase_analytic_distribution.jpeg'], + 'images' : ['images/purchase_analytic_distribution.jpeg'], 'depends': ['purchase', 'account_analytic_plans'], 'init_xml': [], 'update_xml': ['purchase_analytic_plans_view.xml'], diff --git a/addons/purchase_requisition/__openerp__.py b/addons/purchase_requisition/__openerp__.py index a3eeb66b893..8e1e76d5ad0 100644 --- a/addons/purchase_requisition/__openerp__.py +++ b/addons/purchase_requisition/__openerp__.py @@ -22,7 +22,7 @@ "version" : "0.1", "author" : "OpenERP SA", "category" : "Generic Modules/Sales & Purchases", - "images" : ['purchase_requisitions.jpeg'], + "images" : ['images/purchase_requisitions.jpeg'], "website" : "http://www.openerp.com", "description": """ This module allows you to manage your Purchase Requisition. diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py index 7ab467e6ca1..4ad162e02dd 100644 --- a/addons/stock/__openerp__.py +++ b/addons/stock/__openerp__.py @@ -43,7 +43,7 @@ Thanks to the double entry management, the inventory controlling is powerful and * Graph : Products to send in delay (date < = today) """, "website" : "http://www.openerp.com", - "images" : ["delivery_orders.jpeg", "inventory_analysis.jpeg","location.jpeg","moves_analysis.jpeg","physical_inventories.jpeg","warehouse_dashboard.jpeg"], + "images" : ["images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"], "depends" : ["product", "account"], "category" : "Generic Modules/Inventory Control", "init_xml" : [], diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py index 64dfb4c8078..3b07bf6e70d 100644 --- a/addons/stock_location/__openerp__.py +++ b/addons/stock_location/__openerp__.py @@ -25,9 +25,8 @@ 'version': '1.0', 'category': 'Generic Modules/Inventory Control', 'description': """ -This module supplements the Warehouse application by adding support for per-product -location paths, effectively implementing Push and Pull inventory flows. - +This module supplements the Warehouse application by adding support for per-product location paths, effectively implementing Push and Pull inventory flows. +----------------------------------------------------------------------------------------------------------------------------------------------------------- Typically this could be used to: * Manage product manufacturing chains * Manage default locations per product @@ -38,7 +37,7 @@ Typically this could be used to: * Help rental management, by generating automated return moves for rented products Once this module is installed, an additional tab appear on the product form, where you can add -Push and Pull flow specifications. The demo data of CPU1 product for that push/pull : +Push and Pull flow specifications. The demo data of CPU1 product for that push/pull : Push flows ---------- @@ -55,19 +54,19 @@ processed, or require a manual confirmation, depending on the parameters. Pull flows ---------- -Pull flows are a bit different from Pull flows, in the sense that they are not related to +Pull flows are a bit different from Push flows, in the sense that they are not related to the processing of product moves, but rather to the processing of procurement orders. What is being pulled is a need, not directly products. -A classical example of Push flow is when you have an Outlet company, with a parent Company +A classical example of Pull flow is when you have an Outlet company, with a parent Company that is responsible for the supplies of the Outlet. [ Customer ] <- A - [ Outlet ] <- B - [ Holding ] <~ C ~ [ Supplier ] When a new procurement order (A, coming from the confirmation of a Sale Order for example) arrives -in the Outlet, it is converted into another procurement (B, via a Push flow of type 'move') +in the Outlet, it is converted into another procurement (B, via a Pull flow of type 'move') requested from the Holding. When procurement order B is processed by the Holding company, and if the product is out of stock, it can be converted into a Purchase Order (C) from the Supplier -(Push flow of type Purchase). The result is that the procurement order, the need, is pushed +(Pull flow of type Purchase). The result is that the procurement order, the need, is pushed all the way between the Customer and Supplier. Technically, Pull flows allow to process procurement orders differently, not only depending on @@ -85,6 +84,7 @@ You can use the demo data as follow: - When delivering the customer: Pick List -> Packing -> Delivery Order from Gate A """, 'author': 'OpenERP SA', + 'images': ['images/pulled_flow.jpeg','images/pushed_flow.jpeg'], 'depends': ['procurement','stock','sale'], 'init_xml': [], 'update_xml': ['stock_location_view.xml', 'security/ir.model.access.csv', 'procurement_pull_workflow.xml'], From 26d2a7ffcf83f08927228da8d55ed89e6b2550bc Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 11:32:53 +0530 Subject: [PATCH 010/121] [ADD]: Images for stock_no_autopicking module. bzr revid: rch@tinyerp.com-20110314060253-3q2vgacanjmc89wl --- addons/stock_no_autopicking/__openerp__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/stock_no_autopicking/__openerp__.py b/addons/stock_no_autopicking/__openerp__.py index 7c4e32baa40..f92dbadc604 100644 --- a/addons/stock_no_autopicking/__openerp__.py +++ b/addons/stock_no_autopicking/__openerp__.py @@ -25,8 +25,8 @@ 'version': '1.0', 'category': 'Generic Modules/Production', 'description': """ - This module allows an intermediate picking process to provide raw materials - to production orders. + This module allows an intermediate picking process to provide raw materials to production orders. + ------------------------------------------------------------------------------------------------- One example of usage of this module is to manage production made by your suppliers (sub-contracting). To achieve this, set the assembled product @@ -35,6 +35,7 @@ """, 'author': 'OpenERP SA', 'depends': ['mrp'], + 'images': ['images/auto_picking.jpeg'], 'update_xml': ['stock_no_autopicking_view.xml'], 'demo_xml': [], 'test': ['test/stock_no_autopicking.yml'], From 7d4ca2596bba6c1ae46b8be3699ed4e3037e09be Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 12:31:04 +0530 Subject: [PATCH 011/121] [ADD]: Images of stock_planning modules. bzr revid: rch@tinyerp.com-20110314070104-rqjo5nglhwkvmald --- addons/stock_location/__openerp__.py | 3 +- addons/stock_planning/__openerp__.py | 50 ++++++++++++++-------------- 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py index 3b07bf6e70d..59d7b612525 100644 --- a/addons/stock_location/__openerp__.py +++ b/addons/stock_location/__openerp__.py @@ -26,7 +26,8 @@ 'category': 'Generic Modules/Inventory Control', 'description': """ This module supplements the Warehouse application by adding support for per-product location paths, effectively implementing Push and Pull inventory flows. ------------------------------------------------------------------------------------------------------------------------------------------------------------ +=========================================================================================================================================================== + Typically this could be used to: * Manage product manufacturing chains * Manage default locations per product diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py index e422b36b593..604c32f83bf 100644 --- a/addons/stock_planning/__openerp__.py +++ b/addons/stock_planning/__openerp__.py @@ -24,18 +24,18 @@ "version":"1.1", "author":["OpenERP SA", "Grzegorz Grzelak (Cirrus)"], "category":"Custom", + "images":["images/master_procurement_schedule.jpeg","images/sales_forecast.jpeg","images/stock_planning_line.jpeg","images/stock_sales_period.jpeg"], "depends":["hr","stock","sale"], "description": """ -This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule. - Purpose of MPS is to allow create a manual procurement (requisition) apart of MRP scheduler (which works automatically on minimum stock rules). - +=============================================================================================================================================== +This module is based on original OpenERP SA module stock_planning version 1.0 of the same name Master Procurement Schedule. Terms used in the module: -- Stock and Sales Period - is the time (between Start Date and End Date) for which you plan Stock and Sales Forecast and make Procurement Planning. +- Stock and Sales Period - is the time (between Start Date and End Date) for which you plan Stock and Sales Forecast and make Procurement Planning. - Stock and Sales Forecast - is the quantity of products you plan to sell in the Period. - Stock Planning - is the quantity of products you plan to purchase or produce for the Period. -Because we have another module sale_forecast which uses terms "Sales Forecast" and "Planning" as amount values we will use terms "Stock and Sales Forecast" and "Stock Planning" to emphasize that we use quantity values. +Because we have another module sale_forecast which uses terms "Sales Forecast" and "Planning" as amount values we will use terms "Stock and Sales Forecast" and "Stock Planning" to emphasize that we use quantity values. Activity with this module is divided to three steps: - Creating Periods. Mandatory step. @@ -43,7 +43,7 @@ Activity with this module is divided to three steps: - Creating Planning lines, entering quantities to them and making Procurement. Making procurement is the final step for the Period. Periods -======= +------- You have two menu items for Periods in "Sales Management - Configuration". There are: - "Create Sales Periods" - Which automates creating daily, weekly or monthly periods. - "Stock and sales Periods" - Which allows to create any type of periods, change the dates and change the State of period. @@ -53,12 +53,12 @@ Creating periods is the first step you have to do to use modules features. You c Remarks: - These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system. - Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods. -- When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. +- When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. - If you use overlapping periods for the same product, warehouse and company results can be unpredictable. - If current date doesn't belong to any period or you have holes between periods results can be unpredictable. Sales Forecasts -=============== +--------------- You have few menus for Sales forecast in "Sales Management - Sales Forecasts". - "Create Sales Forecasts for Sales Periods" - which automates creating forecasts lines according to some parameters. - "Sales Forecasts" - few menus for working with forecasts lists and forms. @@ -67,7 +67,7 @@ Menu "Create Sales Forecasts for Sales Periods" creates Forecasts for products f Remarks: - This tool doesn't create lines, if relevant lines (for the same Product, Period, Warehouse and validated or created by you) already exists. If you wish to create another forecast, if relevant lines exists you have to do it manually using menus described bellow. -- When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse. +- When created lines are validated by someone else you can use this tool to create another lines for the same Period, Product and Warehouse. - When you choose "Copy Last Forecast" created line takes quantity and some settings from your (validated by you or created by you if not validated yet) forecast which is for last period before period of created forecast. If there are few your forecasts for period before this one (it is possible) system takes one of them (no rule which of them). @@ -84,7 +84,7 @@ Remarks: Procurement Planning -==================== +-------------------- Menu for Planning you can find in "Warehouse - Stock Planning". - "Create Stock Planning Lines" - allows you to automate creating planning lines according to some parameters. - "Master Procurement Scheduler" - is the most important menu of the module which allows to create procurement. @@ -93,13 +93,13 @@ As Sales forecast is phase of planning sales. The Procurement Planning (Planning Menu "Create Stock Planning Lines" allows you to create quickly Planning lines for products from selected Category, for selected Period, and for selected Warehouse. When you check option "All Products with Forecast" system creates lines for all products having forecast for selected Period and Warehouse. Selected Category will be ignored in this case. -Under menu "Master Procurement Scheduler" you can generally change the values "Planned Out" and "Planned In" to observe the field "Stock Simulation" and decide if this value would be accurate for end of the Period. -"Planned Out" can be based on "Warehouse Forecast" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast. +Under menu "Master Procurement Scheduler" you can generally change the values "Planned Out" and "Planned In" to observe the field "Stock Simulation" and decide if this value would be accurate for end of the Period. +"Planned Out" can be based on "Warehouse Forecast" which is the sum of all forecasts for Period and Warehouse. But your planning can be based on any other information you have. It is not necessary to have any forecast. "Planned In" quantity is used to calculate field "Incoming Left" which is the quantity to be procured to make stock as indicated in "Stock Simulation" at the end of Period. You can compare "Stock Simulation" quantity to minimum stock rules visible on the form. But you can plan different quantity than in Minimum Stock Rules. Calculation is made for whole Warehouse by default. But if you want to see values for Stock location of calculated warehouse you can use check box "Stock Location Only". -If after few tries you decide that you found correct quantities for "Planned Out" and "Planned In" and you are satisfied with end of period stock calculated in "Stock Simulation" you can click "Procure Incoming Left" button to procure quantity of field "Incoming Left" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse. +If after few tries you decide that you found correct quantities for "Planned Out" and "Planned In" and you are satisfied with end of period stock calculated in "Stock Simulation" you can click "Procure Incoming Left" button to procure quantity of field "Incoming Left" into the Warehouse. System creates appropriate Procurement Order. You can decide if procurement will be made to Stock or Input location of calculated Warehouse. -If you don't want to Produce or Buy the product but just pick calculated quantity from another warehouse you can click "Supply from Another Warehouse" (instead of "Procure Incoming Left"). System creates pick list with move from selected source Warehouse to calculated Warehouse (as destination). You can also decide if this pick should be done from Stock or Output location of source warehouse. Destination location (Stock or Input) of destination warehouse will be used as set for "Procure Incoming Left". +If you don't want to Produce or Buy the product but just pick calculated quantity from another warehouse you can click "Supply from Another Warehouse" (instead of "Procure Incoming Left"). System creates pick list with move from selected source Warehouse to calculated Warehouse (as destination). You can also decide if this pick should be done from Stock or Output location of source warehouse. Destination location (Stock or Input) of destination warehouse will be used as set for "Procure Incoming Left". To see proper quantities in fields "Confirmed In", "Confirmed Out", "Confirmed In Before", "Planned Out Before" and "Stock Simulation" you have to click button "Calculate Planning". @@ -108,27 +108,27 @@ All values on the form are expressed in unit of measure selected on form. You ca How Stock Simulation field is calculated: Generally Stock Simulation shows the stock for end of the calculated period according to some planned or confirmed stock moves. Calculation always starts with quantity of real stock of beginning of current period. Then calculation adds or subtracts quantities of calculated period or periods before calculated. When you are in the same period (current period is the same as calculated) Stock Simulation is calculated as follows: -Stock Simulation = +Stock Simulation = Stock of beginning of current Period - - Planned Out + - Planned Out + Planned In When you calculate period next to current: -Stock Simulation = +Stock Simulation = Stock of beginning of current Period - - Planned Out of current Period + - Planned Out of current Period + Confirmed In of current Period (incl. Already In) - - Planned Out of calculated Period + - Planned Out of calculated Period + Planned In of calculated Period . -As you see calculated Period is taken the same way like in case above. But calculation of current Period are made a little bit different. First you should note that system takes for current Period only Confirmed In moves. It means that you have to make planning and procurement for current Period before this calculation (for Period next to current). +As you see calculated Period is taken the same way like in case above. But calculation of current Period are made a little bit different. First you should note that system takes for current Period only Confirmed In moves. It means that you have to make planning and procurement for current Period before this calculation (for Period next to current). When you calculate Period ahead: -Stock Simulation = - Stock of beginning of current Period - - Sum of Planned Out of Periods before calculated - + Sum of Confirmed In of Periods before calculated (incl. Already In) - - Planned Out of calculated Period +Stock Simulation = + Stock of beginning of current Period + - Sum of Planned Out of Periods before calculated + + Sum of Confirmed In of Periods before calculated (incl. Already In) + - Planned Out of calculated Period + Planned In of calculated Period. Periods before calculated means periods starting from current till period before calculated. From 29ddf8890e7525071968cbabda91daff68185272 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 13:06:21 +0530 Subject: [PATCH 012/121] [ADD]: Images of mrp module. bzr revid: rch@tinyerp.com-20110314073621-ynguwhexxplzguuk --- addons/mrp/__openerp__.py | 16 +++++++++++----- addons/stock_planning/__openerp__.py | 4 ++-- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py index b7a6466bbaf..b2f9ea8a777 100644 --- a/addons/mrp/__openerp__.py +++ b/addons/mrp/__openerp__.py @@ -26,11 +26,14 @@ "author" : "OpenERP SA", "website" : "http://www.openerp.com", "category" : "Generic Modules/Production", + "images" : ["images/bill_of_materials.jpeg", "images/manufacturing_order.jpeg", "images/planning_manufacturing_order.jpeg", "images/production_analysis.jpeg", "images/production_dashboard.jpeg","images/routings.jpeg","images/work_centers.jpeg"], "depends" : ["procurement", "stock", "resource", "purchase", "product","process"], "description": """ This is the base module to manage the manufacturing process in OpenERP. + ======================================================================= Features: + --------- * Make to Stock / Make to Order (by line) * Multi-level BoMs, no limit * Multi-level routing, no limit @@ -41,23 +44,26 @@ * Cost method by product: standard price, average price * Easy analysis of troubles or needs * Very flexible - * Allows to browse Bill of Materials in complete structure - that include child and phantom BoMs + * Allows to browse Bill of Materials in complete structure that include child and phantom BoMs + It supports complete integration and planification of stockable goods, consumable of services. Services are completely integrated with the rest of the software. For instance, you can set up a sub-contracting service in a BoM to automatically purchase on order the assembly of your production. Reports provided by this module: + -------------------------------- * Bill of Material structure and components * Load forecast on workcenters * Print a production order * Stock forecasts - Dashboard provided by this module:: + + Dashboard provided by this module: + ---------------------------------- * List of next production orders - * List of deliveries (out picking) + * List of procurements in exception * Graph of work center load - * List of procurement in exception + * Graph of stock value variation """, 'init_xml': [], 'update_xml': [ diff --git a/addons/stock_planning/__openerp__.py b/addons/stock_planning/__openerp__.py index 604c32f83bf..36eb35324c6 100644 --- a/addons/stock_planning/__openerp__.py +++ b/addons/stock_planning/__openerp__.py @@ -53,7 +53,7 @@ Creating periods is the first step you have to do to use modules features. You c Remarks: - These periods (officially Stock and Sales Periods) are separated of Financial or other periods in the system. - Periods are not assigned to companies (when you use multicompany feature at all). Module suppose that you use the same periods across companies. If you wish to use different periods for different companies define them as you wish (they can overlap). Later on in this text will be indications how to use such periods. -- When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. Fe. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. +- When periods are created automatically their start and finish dates are with start hour 00:00:00 and end hour 23:59:00. when you create daily periods they will have start date 31.01.2010 00:00:00 and end date 31.01.2010 23:59:00. It works only in automatic creation of periods. When you create periods manually you have to take care about hours because you can have incorrect values form sales or stock. - If you use overlapping periods for the same product, warehouse and company results can be unpredictable. - If current date doesn't belong to any period or you have holes between periods results can be unpredictable. @@ -78,7 +78,7 @@ Instead of forecast quantity you can enter amount of forecast sales in field "Pr All values on the form are expressed in unit of measure selected on form. You can select one of unit of measure from default category or from second category. When you change unit of measure the quanities will be recalculated according to new UoM: editable values (blue fields) immediately, non edited fields after clicking of "Calculate Planning" button. -To find proper value for Sale Forecast you can use "Sales History" table for this product. You have to enter parameters to the top and left of this table and system will count sale quantities according to these parameters. So you can select fe. your department (at the top) then (to the left): last period, period before last and period year ago. +To find proper value for Sale Forecast you can use "Sales History" table for this product. You have to enter parameters to the top and left of this table and system will count sale quantities according to these parameters. So you can select your department (at the top) then (to the left): last period, period before last and period year ago. Remarks: From d8c123a0df97b0a9aa495817e49584a63b9452bc Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 14:17:24 +0530 Subject: [PATCH 013/121] [ADD]: Images of mrp_operations module. bzr revid: rch@tinyerp.com-20110314084724-ypwalpz95c8wrm2m --- addons/mrp_jit/__openerp__.py | 14 +++++++------- addons/mrp_operations/__openerp__.py | 12 ++++++------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addons/mrp_jit/__openerp__.py b/addons/mrp_jit/__openerp__.py index 0cf11110ef2..eee374019a7 100644 --- a/addons/mrp_jit/__openerp__.py +++ b/addons/mrp_jit/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## @@ -26,18 +26,18 @@ 'category': 'Generic Modules/Production', 'description': """ This module allows Just In Time computation of procurement orders. + ================================================================== - If you install this module, you will not have to run the regular procurement - scheduler anymore (but you still need to run the minimum order point rule + If you install this module, you will not have to run the regular procurement + scheduler anymore (but you still need to run the minimum order point rule scheduler, or for example let it run daily.) All procurement orders will be processed immediately, which could in some cases entail a small performance impact. It may also increase your stock size because products are reserved as soon - as possible and the scheduler time range is not taken into account anymore. + as possible and the scheduler time range is not taken into account anymore. In that case, you can not use priorities any more on the different picking. - - + """, 'author': 'OpenERP SA', 'depends': ['procurement'], diff --git a/addons/mrp_operations/__openerp__.py b/addons/mrp_operations/__openerp__.py index 2b75c24229f..32e9374e52d 100644 --- a/addons/mrp_operations/__openerp__.py +++ b/addons/mrp_operations/__openerp__.py @@ -25,15 +25,14 @@ 'version': '1.0', 'category': 'Generic Modules/Production', 'description': """ - This module adds state, date_start,date_stop in production order operation lines - (in the "Work Centers" tab) + This module adds state, date_start,date_stop in production order operation lines (in the "Work Centers" tab). + ============================================================================================================= + State: draft, confirm, done, cancel When finishing/confirming,cancelling production orders set all state lines to the according state Create menus: - Production Management > All Operations - Production Management > All Operations > Operations To Do (state="confirm") - Which is a view on "Work Centers" lines in production order, - editable tree + Manufacturing > Manufacturing > Work Orders + Which is a view on "Work Centers" lines in production order. Add buttons in the form view of production order under workcenter tab: * start (set state to confirm), set date_start @@ -51,6 +50,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/work_order_analysis.jpeg','images/work_order_planning.jpeg','images/work_order.jpeg'], 'depends': ['mrp'], 'init_xml': [], 'update_xml': [ From 55334f78ed15975b35366a9ac68bd1794d578a13 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 14:40:28 +0530 Subject: [PATCH 014/121] [ADD]: Images of mrp_repair and mrp_subproduct modules. bzr revid: rch@tinyerp.com-20110314091028-h9lyahjkf6t8d281 --- addons/mrp_repair/__openerp__.py | 3 +++ addons/mrp_subproduct/__openerp__.py | 3 +++ 2 files changed, 6 insertions(+) diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py index 4313ae1a062..527aa3ebb37 100644 --- a/addons/mrp_repair/__openerp__.py +++ b/addons/mrp_repair/__openerp__.py @@ -26,6 +26,8 @@ 'category': 'Custom', 'description': """ The aim is to have a complete module to manage all products repairs. The following topics should be covered by this module: + =========================================================================================================================== + * Add/remove products in the reparation * Impact for stocks * Invoicing (products and/or services) @@ -34,6 +36,7 @@ * Notes for the technician and for the final customer """, 'author': 'OpenERP SA', + 'images': ['images/repair_order.jpeg'], 'depends': ['mrp', 'sale', 'account'], 'update_xml': [ 'security/ir.model.access.csv', diff --git a/addons/mrp_subproduct/__openerp__.py b/addons/mrp_subproduct/__openerp__.py index 9e27fa91b19..14ff8dd746d 100644 --- a/addons/mrp_subproduct/__openerp__.py +++ b/addons/mrp_subproduct/__openerp__.py @@ -26,6 +26,8 @@ 'category': 'Generic Modules/Production', 'description': """ This module allows you to produce several products from one production order. +============================================================================= + You can configure sub-products in the bill of material. Without this module: A + B + C -> D @@ -34,6 +36,7 @@ With this module: """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/bom_subproduct.jpeg'], 'depends': ['base', 'mrp'], 'init_xml': [], 'update_xml': [ From 721d40f606e29faf8da519b35e5519823441eed0 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 16:50:13 +0530 Subject: [PATCH 015/121] [ADD]: Images of hr, hr_attendance and hr_contract modules. bzr revid: rch@tinyerp.com-20110314112013-zwazl3oanlsh7fz5 --- addons/hr/__openerp__.py | 5 ++++- addons/hr_attendance/__openerp__.py | 2 ++ addons/hr_contract/__openerp__.py | 4 +++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py index 0aa26987aa5..ed3c634bfd7 100644 --- a/addons/hr/__openerp__.py +++ b/addons/hr/__openerp__.py @@ -26,13 +26,16 @@ "category": "Generic Modules/Human Resources", "website": "http://www.openerp.com", "description": """ - Module for human resource management. You can manage: + Module for human resource management. + ===================================== + You can manage: * Employees and hierarchies : You can define your employee with User and display hierarchies * HR Departments * HR Jobs """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/hr_department.jpeg', 'images/hr_employee.jpeg','images/hr_job_position.jpeg'], 'depends': ['resource', 'board'], 'init_xml': [], 'update_xml': [ diff --git a/addons/hr_attendance/__openerp__.py b/addons/hr_attendance/__openerp__.py index d38c0fcebf3..d68fdb3a556 100644 --- a/addons/hr_attendance/__openerp__.py +++ b/addons/hr_attendance/__openerp__.py @@ -26,10 +26,12 @@ 'category': 'Generic Modules/Human Resources', 'description': """ This module aims to manage employee's attendances. + ================================================== Keeps account of the attendances of the employees on the basis of the actions(Sign in/Sign out) performed by them. """, 'author': 'OpenERP SA', + 'images': ['images/hr_attendances.jpeg'], 'depends': ['hr'], 'update_xml': [ 'security/ir.model.access.csv', diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py index aea686e4279..0e6ee14e02e 100644 --- a/addons/hr_contract/__openerp__.py +++ b/addons/hr_contract/__openerp__.py @@ -25,7 +25,8 @@ 'version': '1.0', 'category': 'Generic Modules/Human Resources', 'description': """ - Add all information on the employee form to manage contracts: + Add all information on the employee form to manage contracts. + ============================================================= * Marital status, * Security number, * Place of birth, birth date, ... @@ -33,6 +34,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/hr_contract.jpeg'], 'depends': ['hr'], 'init_xml': ['hr_contract_data.xml'], 'update_xml': [ From d5dbf3c1f070bf16a1a0b40bc9725dc5f97f5b72 Mon Sep 17 00:00:00 2001 From: vro Date: Mon, 14 Mar 2011 17:25:31 +0530 Subject: [PATCH 016/121] [ADD]: Images: anonymization, association, auction, auditrail bzr revid: vro@tinyerp.com-20110314115531-mqsc31bn9h4u4ccm --- addons/anonymization/__openerp__.py | 6 ++++-- addons/association/__openerp__.py | 6 +++++- addons/auction/__openerp__.py | 16 +++++++++------- addons/audittrail/__openerp__.py | 8 ++++---- 4 files changed, 22 insertions(+), 14 deletions(-) diff --git a/addons/anonymization/__openerp__.py b/addons/anonymization/__openerp__.py index aeebe060d1d..8f3310d587f 100644 --- a/addons/anonymization/__openerp__.py +++ b/addons/anonymization/__openerp__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -22,11 +22,12 @@ { - 'name': 'Database anonymization module', + 'name': 'Database Anonymization', 'version': '1.0', 'category': 'Tools', 'description': """ This module allows you to anonymize a database. +=============================================== """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', @@ -44,5 +45,6 @@ This module allows you to anonymize a database. 'installable': True, 'active': False, 'certificate': '00719010980872226045', + 'images': ['images/anonymization1.jpeg','images/anonymization2.jpeg','images/anonymization3.jpeg'], } diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py index ff7eef35255..cb7a398f6b2 100644 --- a/addons/association/__openerp__.py +++ b/addons/association/__openerp__.py @@ -24,7 +24,10 @@ 'name': 'Association profile', 'version': '0.1', 'category': 'Profile', - 'description': """This module is to create Profile for Associates""", + 'description': """ + This module is to configure modules related to an association. + ============================================================== + """, 'author': 'OpenERP SA', 'depends': ['membership', 'event'], 'update_xml': ['security/ir.model.access.csv', 'profile_association.xml'], @@ -32,5 +35,6 @@ 'installable': True, 'active': False, 'certificate': '0078696047261', + 'images': ['images/association1.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py index c26a1f1bbfb..173bc878a0f 100644 --- a/addons/auction/__openerp__.py +++ b/addons/auction/__openerp__.py @@ -25,18 +25,19 @@ 'version': '1.0', 'category': 'Generic Modules/Auction', 'description': """ - This module manages the records of the artists, - the articles to be put up for auction,the buyers and - sellers. + This module manages the records of artists, auction articles, buyers and sellers. + ================================================================================= It completely manages an auction such as managing bids, keeping track of the sold articles along with the paid and unpaid objects including delivery of the articles. - Dashboards for auction that includes: - * My Latest Objects (list) - * My Latest Deposits (list) + The dashboard for auction includes: + * Latest Objects (list) + * Latest Deposits (list) * Objects Statistics (list) - * My Objects By Day (list) + * Total Adjudications (graph) + * Min/Adj/Max (graph) + * Objects By Day (graph) """, 'author': 'OpenERP SA', 'depends': ['base', 'account', 'hr_attendance'], @@ -67,5 +68,6 @@ 'installable': True, 'active': False, 'certificate': '0039333102717', + 'images': ['images/auction1.jpeg','images/auction2.jpeg','images/auction3.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/audittrail/__openerp__.py b/addons/audittrail/__openerp__.py index c9164bfd839..167b341124a 100644 --- a/addons/audittrail/__openerp__.py +++ b/addons/audittrail/__openerp__.py @@ -25,11 +25,10 @@ 'version': '1.0', 'category': 'Generic Modules/Others', 'description': """ - This module gives the administrator the rights - to track every user operation on all the objects - of the system. + This module lets administrator track every user operation on all the objects of the system. + =========================================================================================== - Administrator can subscribe rules for read,write and + The administrator can subscribe to rules for read, write and delete on objects and can check logs. """, 'author': 'OpenERP SA', @@ -46,5 +45,6 @@ 'installable': True, 'active': False, 'certificate': '0062572348749', + 'images': ['images/audittrail1.jpeg','images/audittrail2.jpeg','images/audittrail3.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 3e6ec6f67975c595d8a60a8d7b6a4ae445ac6823 Mon Sep 17 00:00:00 2001 From: vro Date: Mon, 14 Mar 2011 17:47:08 +0530 Subject: [PATCH 017/121] [ADD]: Images: base_action_rule, base_calendar, base_contact, base crypt bzr revid: vro@tinyerp.com-20110314121708-xzia08gel40uvygp --- addons/base_action_rule/__openerp__.py | 12 ++++++++---- addons/base_calendar/__openerp__.py | 13 +++++++++---- addons/base_contact/__openerp__.py | 12 +++++++----- addons/base_crypt/__openerp__.py | 9 ++++++--- 4 files changed, 30 insertions(+), 16 deletions(-) diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py index 7717890afba..296f6b4f7e3 100644 --- a/addons/base_action_rule/__openerp__.py +++ b/addons/base_action_rule/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## @@ -23,7 +23,10 @@ 'name': 'Action Rule', 'version': '1.0', 'category': 'Generic Modules/Others', - 'description': "This module allows to implement action rules for any object.", + 'description': """ + This module allows to implement action rules for any object. + ============================================================ + """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], @@ -31,12 +34,13 @@ 'base_action_rule_data.xml' ], 'update_xml': [ - 'base_action_rule_view.xml', + 'base_action_rule_view.xml', 'security/ir.model.access.csv', ], 'demo_xml': [], 'installable': True, 'active': False, 'certificate' : '001017908446466333429', + 'images': ['images/base_action_rule1.jpeg','images/base_action_rule2.jpeg','images/base_action_rule3.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 6a52e30de27..24626d75efd 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -20,10 +20,14 @@ ############################################################################## { - "name" : "Basic Calendar Functionality", - "version" : "1.0", - "depends" : ["base"], - 'description': """Full featured calendar system that supports: + "name" : "Basic Calendar Functionality", + "version" : "1.0", + "depends" : ["base"], + 'description': """ + This is a full-featured calendar system. + ======================================== + + It supports: - Calendar of events - Alerts (create requests) - Recurring events @@ -46,6 +50,7 @@ "installable" : True, "active" : False, "certificate" : "00694071962960352821", + 'images': ['images/base_calendar1.jpeg','images/base_calendar2.jpeg','images/base_calendar3.jpeg','images/base_calendar4.jpeg',], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_contact/__openerp__.py b/addons/base_contact/__openerp__.py index 30fd52ee26f..4f7d30100e8 100644 --- a/addons/base_contact/__openerp__.py +++ b/addons/base_contact/__openerp__.py @@ -25,7 +25,8 @@ 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ - This module allows you to manage your contacts entirely. + This module allows you to manage your contacts entirely. + ======================================================== It lets you define *contacts unrelated to a partner, @@ -33,8 +34,8 @@ *contacts with possibly different functions for each of its job's addresses It also adds new menu items located in - Partners \ Contacts - Partners \ Functions + Purchases / Address Book / Contacts + Sales / Address Book / Contacts Pay attention that this module converts the existing addresses into "addresses + contacts". It means that some fields of the addresses will be missing (like the contact name), since these are supposed to be defined in an other object. """, @@ -46,15 +47,16 @@ 'security/base_contact_security.xml', 'security/ir.model.access.csv', 'base_contact_view.xml', - 'base_contact_installer_view.xml', + 'base_contact_installer_view.xml', 'process/base_contact_process.xml' ], - 'demo_xml': ['base_contact_demo.xml'], + 'demo_xml': ['base_contact_demo.xml'], 'test': [ 'test/base_contact00.yml', ], 'installable': True, 'active': False, 'certificate': '0031287885469', + 'images': ['images/base_contact1.jpeg','images/base_contact2.jpeg','images/base_contact3.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_crypt/__openerp__.py b/addons/base_crypt/__openerp__.py index 620aa19b09c..652645ec74f 100644 --- a/addons/base_crypt/__openerp__.py +++ b/addons/base_crypt/__openerp__.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -25,8 +25,11 @@ "maintainer" : "OpenERP SA", "website" : "http://www.openerp.com", "category" : "Generic Modules/Base", - "description": """This module replaces the cleartext password in the database with a password hash, -preventing anyone from reading the original password. + "description": """ + This module replaces the cleartext password in the database with a password hash. + ================================================================================= + +It prevents anyone from reading the original password. For your existing user base, the removal of the cleartext passwords occurs the first time a user logs into the database, after installing base_crypt. After installing this module it won't be possible to recover a forgotten password for your From a60130602171796a62ebcc88daffb6e143cf491c Mon Sep 17 00:00:00 2001 From: vro Date: Mon, 14 Mar 2011 18:02:14 +0530 Subject: [PATCH 018/121] [ADD]: Images: base_iban, base_module_doc_rst, base_module_quality, base_module_record bzr revid: vro@tinyerp.com-20110314123214-4ru227u881my7ok4 --- addons/base_iban/__openerp__.py | 4 +++- addons/base_module_doc_rst/__openerp__.py | 5 ++++- addons/base_module_quality/__openerp__.py | 2 ++ addons/base_module_record/__openerp__.py | 7 +++++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/addons/base_iban/__openerp__.py b/addons/base_iban/__openerp__.py index 9ed0b1171bb..a4d29ddba4e 100644 --- a/addons/base_iban/__openerp__.py +++ b/addons/base_iban/__openerp__.py @@ -23,7 +23,8 @@ 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ -This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity. + This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for its validity. + ===================================================================================================================== """, 'author': 'OpenERP SA', @@ -34,5 +35,6 @@ This module installs the base for IBAN (International Bank Account Number) bank 'installable': True, 'active': False, 'certificate': '0050014379549', + 'images': ['images/base_iban1.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_module_doc_rst/__openerp__.py b/addons/base_module_doc_rst/__openerp__.py index a8b54d12abd..6d08a8a5ab2 100644 --- a/addons/base_module_doc_rst/__openerp__.py +++ b/addons/base_module_doc_rst/__openerp__.py @@ -24,7 +24,9 @@ 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ - * This module generates the Technical Guides of selected modules in Restructured Text format (RST) + This module generates the Technical Guides of selected modules in Restructured Text format (RST). + ================================================================================================= + * It uses the Sphinx (http://sphinx.pocoo.org) implementation of RST * It creates a tarball (.tgz file suffix) containing an index file and one file per module * Generates Relationship Graph @@ -37,5 +39,6 @@ 'demo_xml': [], 'installable': True, 'certificate': '001288481437217734509', + 'images': ['images/base_module_doc_rst1.jpeg'], } diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py index a53dde3afe3..c5185b089a7 100644 --- a/addons/base_module_quality/__openerp__.py +++ b/addons/base_module_quality/__openerp__.py @@ -26,6 +26,7 @@ 'category': 'OpenERP SA Specific Modules/Base module quality', 'description': """ The aim of this module is to check the quality of other modules. +================================================================ It defines a wizard on the list of modules in OpenERP, which allows you to evaluate them on different criteria such as: the respect of OpenERP coding @@ -46,5 +47,6 @@ using it, otherwise it may crash. 'installable': True, 'active': False, 'certificate': '0175119475677', + 'images': ['images/base_module_quality1.jpeg','images/base_module_quality2.jpeg','images/base_module_quality3.jpeg'] } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_module_record/__openerp__.py b/addons/base_module_record/__openerp__.py index 4d3256dc44d..24a2b12ebb0 100644 --- a/addons/base_module_record/__openerp__.py +++ b/addons/base_module_record/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## @@ -26,6 +26,8 @@ 'category': 'Generic Modules/Base', 'description': """ This module allows you to create a new module without any development. +====================================================================== + It records all operations on objects during the recording session and produce a .ZIP module. So you can create your own module directly from the OpenERP client. @@ -49,5 +51,6 @@ Select datetime criteria of recording and objects to be recorded and Record modu 'demo_xml': [], 'installable': True, 'certificate': '0083134865813', + 'images': ['images/base_module_record1.jpeg','images/base_module_record2.jpeg','images/base_module_record3.jpeg',] } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 1f67347d3ebf6c26c44b77f5d81d5406ededa61c Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 18:25:43 +0530 Subject: [PATCH 019/121] [ADD]: Images of hr_holidays, hr_expense and hr_evaluation modules. bzr revid: rch@tinyerp.com-20110314125543-yi6bzkmmqzcmtcrn --- addons/hr_evaluation/__openerp__.py | 4 +++- addons/hr_expense/__openerp__.py | 2 ++ addons/hr_holidays/__openerp__.py | 19 +++++++++---------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/addons/hr_evaluation/__openerp__.py b/addons/hr_evaluation/__openerp__.py index 0232911d9ef..bb5025fefe8 100644 --- a/addons/hr_evaluation/__openerp__.py +++ b/addons/hr_evaluation/__openerp__.py @@ -25,15 +25,17 @@ "author": "OpenERP SA", "category": "Generic Modules/Human Resources", "website": "http://www.openerp.com", + "images": ["images/hr_evaluation_analysis.jpeg","images/hr_evaluation.jpeg"], "depends": ["hr",'hr_recruitment','survey'], "description": """ Ability to create employees evaluation. + ======================================= An evaluation can be created by employee for subordinates, juniors as well as his manager.The evaluation is done under a plan in which various surveys can be created and it can be defined which level of employee hierarchy fills what and final review and evaluation is done by the manager.Every evaluation filled by the employees can be viewed - in the form of.Implements a dashboard for My Current Evaluations + in the form of pdf file. Implements a dashboard for My Current Evaluations """, "init_xml": [], "demo_xml": ["hr_evaluation_demo.xml", diff --git a/addons/hr_expense/__openerp__.py b/addons/hr_expense/__openerp__.py index 75d79d4bfc6..58887e63cce 100644 --- a/addons/hr_expense/__openerp__.py +++ b/addons/hr_expense/__openerp__.py @@ -26,6 +26,7 @@ 'category': 'Generic Modules/Human Resources', 'description': """ This module aims to manage employee's expenses. + =============================================== The whole workflow is implemented: * Draft expense @@ -40,6 +41,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/hr_expenses_analysis.jpeg', 'images/hr_expenses.jpeg'], 'depends': ['hr', 'account'], 'init_xml': [], 'update_xml': [ diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py index 2baa20d201f..a6390aa2d2a 100644 --- a/addons/hr_holidays/__openerp__.py +++ b/addons/hr_holidays/__openerp__.py @@ -26,28 +26,27 @@ "author": ['OpenERP SA', 'Axelor'], "category": "Generic Modules/Human Resources", "website": "http://www.openerp.com", - "description": """Human Resources: Holidays tracking and workflow - + "description": """ This module allows you to manage leaves and leaves' requests. + ============================================================= Implements a dashboard for human resource management that includes. - * My Leaves - * My Expenses + * Leaves Note that: - A synchronisation with an internal agenda (use of the CRM module) is possible: in order to automatically create a case when an holiday request is accepted, you have to link the holidays status to a case section. You can set up this info and your colour preferences in - HR / Configuration / Holidays Status + Human Resources/Configuration/Holidays/Leave Type - An employee can make an ask for more off-days by making a new Allocation It will increase his total of that leave type available (if the request is accepted). - There are two ways to print the employee's holidays: * The first will allow to choose employees by department and is used by clicking the menu item located in - HR / Holidays Request / Print Summary of Holidays + Human Resources/Reporting/Holidays/Leaves by Department * The second will allow you to choose the holidays report for specific employees. Go on the list - HR / Employees / Employees + Human Resources/Human Resources/Employees then select the ones you want to choose, click on the print icon and select the option - 'Print Summary of Employee's Holidays' + 'Employee's Holidays' - The wizard allows you to choose if you want to print either the Confirmed & Validated holidays or only the Validated ones. These states must be set up by a user from the group 'HR'. You can define these features in the security tab from the user data in Administration / Users / Users - for example, you maybe will do it for the user 'admin' - . + 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'], 'init_xml': [], 'update_xml': [ From eadf090b70d9256bd9c65dac8c60726ef2de01a1 Mon Sep 17 00:00:00 2001 From: vro Date: Mon, 14 Mar 2011 18:36:15 +0530 Subject: [PATCH 020/121] [ADD]: Images: base_report_creator, base_report_designer, base_setup bzr revid: vro@tinyerp.com-20110314130615-9x0u8b40k0anavn7 --- addons/base_module_quality/__openerp__.py | 2 +- addons/base_report_creator/__openerp__.py | 16 ++++++++++------ addons/base_report_designer/__openerp__.py | 10 +++++----- addons/base_setup/__openerp__.py | 14 +++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/addons/base_module_quality/__openerp__.py b/addons/base_module_quality/__openerp__.py index c5185b089a7..33e07668ce8 100644 --- a/addons/base_module_quality/__openerp__.py +++ b/addons/base_module_quality/__openerp__.py @@ -35,7 +35,7 @@ standards, the speed efficiency... This module also provides generic framework to define your own quality test. For further info, coders may take a look into base_module_quality\README.txt -WARNING: This module can not work as a ZIP file, you must unzip it before +WARNING: This module cannot work as a ZIP file, you must unzip it before using it, otherwise it may crash. """, 'author': 'OpenERP SA', diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py index d009f00950e..d642b42ac29 100644 --- a/addons/base_report_creator/__openerp__.py +++ b/addons/base_report_creator/__openerp__.py @@ -21,15 +21,18 @@ { - 'name': 'Report Creator', + 'name': 'Statistical Report Creator', 'version': '1.0', 'category': 'Generic Modules/Base', - 'description': """This module allows you to create any statistic -report on several objects. It's a SQL query builder and browser -for and users. + 'description': """ + This module allows you to create any statistic report on several objects. + ========================================================================= -After installing the module, it adds a menu to define custom report in -the "Dashboard" menu. +It's an SQL query builder and browser +for end-users. + +After installing the module, it adds a menu to define a custom report in +the Administration / Customization / Reporting menu. """, 'author': ['OpenERP SA', 'Axelor'], 'website': '', @@ -45,5 +48,6 @@ the "Dashboard" menu. 'installable': True, 'active': False, 'certificate': '0031285794149', + 'images': ['images/base_report_creator1.jpeg','images/base_report_creator2.jpeg','images/base_report_creator3.jpeg',], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py index 88f4d9d5a81..4e9e2974703 100644 --- a/addons/base_report_designer/__openerp__.py +++ b/addons/base_report_designer/__openerp__.py @@ -21,16 +21,15 @@ { - 'name': 'Report designer interface module', + 'name': 'OpenOffice Report Designer Interface', 'version': '0.1', 'category': 'Generic Modules/Base', 'description': """ -This module is used along with OpenERP OpenOffice plugin. -You have to first install the plugin which is available at -http://www.openerp.com +This module is used along with OpenERP OpenOffice Plugin. +========================================================= This module adds wizards to Import/Export .sxw report that -you can modify in OpenOffice.Once you have modified it you can +you can modify in OpenOffice. Once you have modified it you can upload the report using the same wizard. """, 'author': 'OpenERP SA', @@ -42,5 +41,6 @@ upload the report using the same wizard. 'installable': True, 'active': False, 'certificate': '0056379010493', + 'images': ['images/base_report_designer1.jpeg','images/base_report_designer2.jpeg',], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_setup/__openerp__.py b/addons/base_setup/__openerp__.py index 236a62c9eb4..67e77d6e3bd 100644 --- a/addons/base_setup/__openerp__.py +++ b/addons/base_setup/__openerp__.py @@ -25,17 +25,12 @@ 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ - This module implements a configuration system that helps user - to configure the system at the installation of a new database. + This module helps to configure the system at the installation of a new database. + ================================================================================ - It allows you to select between a list of profiles to install: - * Minimal profile - * Accounting only - * Services companies - * Manufacturing companies + It allows you to choose the type of interface and select from a list of applications to install. - It also asks screens to help easily configure your company, the header and - footer, the account chart to install and the language. + It also helps to easily configure your company. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', @@ -49,5 +44,6 @@ 'installable': True, 'active': True, 'certificate': '0086711085869', + 'images': ['images/base_setup1.jpeg','images/base_setup2.jpeg','images/base_setup3.jpeg','images/base_setup4.jpeg',], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 9cdde2b26c35021b5d6e7f5004e29cdf9e58a157 Mon Sep 17 00:00:00 2001 From: "ron@tinyerp.com" <> Date: Mon, 14 Mar 2011 18:42:54 +0530 Subject: [PATCH 021/121] [FIX]mrp:raw material units should always be rounded up lp bug: https://launchpad.net/bugs/718722 fixed bzr revid: ron@tinyerp.com-20110314131254-inohohq5tfgw32ey --- addons/mrp/mrp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 2fa72d6ded0..976325f3bed 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -386,9 +386,10 @@ class mrp_bom_revision(osv.osv): mrp_bom_revision() def rounding(f, r): + import math if not r: return f - return round(f / r) * r + return math.ceil(f / r) * r class mrp_production(osv.osv): """ From 5c345cedda8c2d8c8021d674a84442023af6fbe7 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Mon, 14 Mar 2011 18:55:25 +0530 Subject: [PATCH 022/121] [ADD]: Images of hr_payroll, hr_payroll_account and hr_recruitment modules. bzr revid: rch@tinyerp.com-20110314132525-md6dssmphbvh82iu --- addons/hr_payroll/__openerp__.py | 5 ++++- addons/hr_payroll_account/__openerp__.py | 7 +++++-- addons/hr_recruitment/__openerp__.py | 6 ++++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py index f15456c5888..96ea217d5da 100644 --- a/addons/hr_payroll/__openerp__.py +++ b/addons/hr_payroll/__openerp__.py @@ -23,7 +23,9 @@ 'name': 'Human Resource Payroll', 'version': '1.0', 'category': 'Generic Modules/Human Resources', - 'description': """Generic Payroll system + 'description': """ + Generic Payroll system. + ======================= * Employee Details * Employee Contracts * Passport based Contract @@ -35,6 +37,7 @@ """, 'author':'OpenERP SA', 'website':'http://www.openerp.com', + 'images': ['images/hr_employee_payslip.jpeg','images/hr_payment_advice.jpeg','images/hr_payroll_register.jpeg'], 'depends': [ 'hr', 'hr_contract', diff --git a/addons/hr_payroll_account/__openerp__.py b/addons/hr_payroll_account/__openerp__.py index 2d3b56eb964..7bf539911e2 100644 --- a/addons/hr_payroll_account/__openerp__.py +++ b/addons/hr_payroll_account/__openerp__.py @@ -23,13 +23,16 @@ 'name': 'Human Resource Payroll Accounting', 'version': '1.0', 'category': 'Generic Modules/Human Resources', - 'description': """Generic Payroll system Integrated with Accountings + 'description': """ + Generic Payroll system Integrated with Accountings. + =================================================== * Expense Encoding * Payment Encoding * Company Contribution Management """, 'author':'OpenERP SA', 'website':'http://www.openerp.com', + 'images': ['images/hr_employee_payslip.jpeg'], 'depends': [ 'hr_payroll', 'account', @@ -38,7 +41,7 @@ 'init_xml': [ ], 'update_xml': [ - "security/ir.model.access.csv", + "security/ir.model.access.csv", "hr_payroll_account_view.xml", ], 'demo_xml': [ diff --git a/addons/hr_recruitment/__openerp__.py b/addons/hr_recruitment/__openerp__.py index 320d0c47b6d..205d94e861d 100644 --- a/addons/hr_recruitment/__openerp__.py +++ b/addons/hr_recruitment/__openerp__.py @@ -24,8 +24,9 @@ 'version': '1.0', 'category': 'Generic Modules/Human Resources', 'description': """ -Manages job positions and the recruitement process. It's integrated with the -survey module to allow you to define interview for different jobs. +Manages job positions and the recruitement process. +=================================================== +It's integrated with the survey module to allow you to define interview for different jobs. This module is integrated with the mail gateway to automatically tracks email sent to jobs@YOURCOMPANY.com. It's also integrated with the document management @@ -33,6 +34,7 @@ system to store and search in your CV base. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/hr_recruitment_analysis.jpeg','images/hr_recruitment_applicants.jpeg'], 'depends': ['decimal_precision', 'hr', 'survey', 'crm'], 'update_xml': [ 'wizard/hr_recruitment_phonecall_view.xml', From 24381f640df4ebb09d9bad383a2025dc8454f79b Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 15 Mar 2011 10:04:48 +0530 Subject: [PATCH 023/121] [ADD]: Images: base_synchro, base_tools, base_vat, board bzr revid: vro@tinyerp.com-20110315043448-lnzt8ne3mfsovfiv --- addons/base_synchro/__openerp__.py | 8 ++++++-- addons/base_tools/__openerp__.py | 4 +++- addons/base_vat/__openerp__.py | 6 ++++-- addons/board/__openerp__.py | 12 ++++++++++-- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/addons/base_synchro/__openerp__.py b/addons/base_synchro/__openerp__.py index 20b468bdc92..901973f7e23 100644 --- a/addons/base_synchro/__openerp__.py +++ b/addons/base_synchro/__openerp__.py @@ -20,11 +20,14 @@ ############################################################################## { - "name":"Base Synchro", + "name":"Server Object Synchronization", "version":"0.1", "author":"OpenERP SA", "category":"Generic Modules/Base", - "description": """Synchronization with all objects.""", + "description": """ + Synchronization with all objects. + ================================= + """, "depends":["base"], "demo_xml":[], "update_xml":[ "wizard/base_synchro_view.xml", @@ -33,5 +36,6 @@ "active":False, "installable":True, "certificate" : "00925429283944551453", + 'images': ['images/1_servers_synchro.jpeg','images/2_synchronize.jpeg','images/3_objects_synchro.jpeg',], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_tools/__openerp__.py b/addons/base_tools/__openerp__.py index 9731d95d03c..7b38a38f6f1 100644 --- a/addons/base_tools/__openerp__.py +++ b/addons/base_tools/__openerp__.py @@ -1,11 +1,13 @@ # -*- encoding: utf-8 -*- { - "name": "Common base for tools modules", + "name": "Base Tools", "author": "OpenERP SA", "version": "1.0", "depends": ["base"], "category" : "Tools", 'description': """ + Common base for tools modules. + ============================== """, "init_xml": [], "update_xml": [ diff --git a/addons/base_vat/__openerp__.py b/addons/base_vat/__openerp__.py index 0dbeac6e806..32ceefe6c91 100644 --- a/addons/base_vat/__openerp__.py +++ b/addons/base_vat/__openerp__.py @@ -19,11 +19,12 @@ # ############################################################################## { - 'name': 'Base VAT - To check VAT number validity', + 'name': 'Base VAT', 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ - Enable the VAT Number for the partner. Check the validity of that VAT Number. + Enable VAT Number for a partner and check its validity. + ======================================================= This module follows the methods stated at http://sima-pc.com/nif.php for checking the validity of VAT Number assigned to partners in European countries. @@ -35,5 +36,6 @@ 'installable': True, 'active': False, 'certificate': '0084849360989', + 'images': ['images/1_partner_vat.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py index 770fc71777b..0e9c043460f 100644 --- a/addons/board/__openerp__.py +++ b/addons/board/__openerp__.py @@ -20,10 +20,17 @@ ############################################################################## { - 'name': 'Dashboard main module', + 'name': 'Dashboard Creator', 'version': '1.0', 'category': 'Board/Base', - 'description': """Base module for all dashboards.""", + 'description': """ + Lets the user create a custom dashboard. + ======================================== + + This module also creates the Administration Dashboard. + + The user can also publish notes. + """, 'author': 'OpenERP SA', 'depends': ['base'], 'update_xml': ['security/board_security.xml','security/ir.model.access.csv', 'wizard/board_menu_create_view.xml', 'board_view.xml','board_administration_view.xml'], @@ -31,5 +38,6 @@ 'installable': True, 'active': False, 'certificate': '0076912305725', + 'images': ['images/1_dashboard_definition.jpeg','images/2_publish_note.jpeg','images/3_admin_dashboard.jpeg',], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From d4a24a415c3e1dd62e10b7513d4b4cba7b1b6169 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Tue, 15 Mar 2011 14:01:48 +0530 Subject: [PATCH 024/121] [ADD]: Images of hr_timesheet,hr_timesheet_sheet and hr_timesheet_invoice. bzr revid: rch@tinyerp.com-20110315083148-p16kdyfik5wryjhs --- addons/hr_timesheet/__openerp__.py | 8 +++++--- addons/hr_timesheet_invoice/__openerp__.py | 2 ++ addons/hr_timesheet_sheet/__openerp__.py | 8 +++++--- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/addons/hr_timesheet/__openerp__.py b/addons/hr_timesheet/__openerp__.py index 90ddc25fff6..b15f847d5b9 100644 --- a/addons/hr_timesheet/__openerp__.py +++ b/addons/hr_timesheet/__openerp__.py @@ -25,9 +25,10 @@ 'version': '1.0', 'category': 'Generic Modules/Human Resources', 'description': """ -This module implements a timesheet system. Each employee can encode and -track their time spent on the different projects. A project is an -analytic account and the time spent on a project generates costs on +This module implements a timesheet system. +========================================== +Each employee can encode and track their time spent on the different projects. +A project is an analytic account and the time spent on a project generates costs on the analytic account. Lots of reporting on time and employee tracking are provided. @@ -37,6 +38,7 @@ to set up a management by affair. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/hr_timesheet_lines.jpeg'], 'depends': ['account', 'hr', 'base', 'hr_attendance', 'process'], 'init_xml': ['hr_timesheet_data.xml'], 'update_xml': [ diff --git a/addons/hr_timesheet_invoice/__openerp__.py b/addons/hr_timesheet_invoice/__openerp__.py index dfcda5ec534..6f7c84e769f 100644 --- a/addons/hr_timesheet_invoice/__openerp__.py +++ b/addons/hr_timesheet_invoice/__openerp__.py @@ -26,10 +26,12 @@ 'category': 'Generic Modules/Accounting', 'description': """ Module to generate invoices based on costs (human resources, expenses, ...). +============================================================================ You can define price lists in analytic account, make some theoretical revenue reports, eso.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/hr_bill_task_work.jpeg','images/hr_type_of_invoicing.jpeg'], 'depends': ['account', 'hr_timesheet'], 'data': [ 'security/ir.model.access.csv', diff --git a/addons/hr_timesheet_sheet/__openerp__.py b/addons/hr_timesheet_sheet/__openerp__.py index 383521b399d..11d5f4ae588 100644 --- a/addons/hr_timesheet_sheet/__openerp__.py +++ b/addons/hr_timesheet_sheet/__openerp__.py @@ -25,9 +25,10 @@ 'version': '1.0', 'category': 'Generic Modules/Human Resources', 'description': """ -This module helps you to easily encode and validate timesheet and attendances -within the same view. The upper part of the view is for attendances and -track (sign in/sign out) events. The lower part is for timesheet. +This module helps you to easily encode and validate timesheet and attendances within the same view. +=================================================================================================== +The upper part of the view is for attendances and track (sign in/sign out) events. +The lower part is for timesheet. Other tabs contains statistics views to help you analyse your time or the time of your team: @@ -45,6 +46,7 @@ The validation can be configured in the company: """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/hr_my_timesheet.jpeg','images/hr_timesheet_analysis.jpeg','images/hr_timesheet_sheet_analysis.jpeg','images/hr_timesheets.jpeg'], 'depends': ['hr_timesheet', 'hr_timesheet_invoice', 'process'], 'init_xml': [], 'update_xml': [ From 8f15a8ced72837f538db88ddf3c322a17beaa73d Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Tue, 15 Mar 2011 14:44:25 +0530 Subject: [PATCH 025/121] [ADD]: Images of account module. bzr revid: rch@tinyerp.com-20110315091425-fd1f48eb1mlkmqk9 --- addons/account/__openerp__.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index 06c3ed15a93..cee1f92b81f 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -23,7 +23,12 @@ "version" : "1.1", "author" : "OpenERP SA", "category": 'Generic Modules/Accounting', - "description": """Financial and accounting module that covers: + "description": """ + Accounting and Financial Management + =================================== + + Financial and accounting module that covers: + -------------------------------------------- General accountings Cost / Analytic accounting Third party accounting @@ -32,16 +37,20 @@ Customer and Supplier Invoices Bank statements Reconciliation process by partner + Creates a dashboard for accountants that includes: - * List of uninvoiced quotations - * Graph of aged receivables - * Graph of aged incomes + -------------------------------------------------- + * List of Customer Invoice to Approve + * Company Analysis + * Graph of Aged Receivables + * Graph of Treasury The processes like maintaining of general ledger is done through the defined financial Journals (entry move line or grouping is maintained through journal) for a particular financial year and for preparation of vouchers there is a module named account_voucher. """, 'website': 'http://www.openerp.com', + 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg','images/payment_order.jpeg','images/supplier_voucher.jpeg'], 'init_xml': [], "depends" : ["product", "analytic", "process","board"], 'update_xml': [ @@ -133,7 +142,7 @@ module named account_voucher. 'test/account_bank_statement.yml', 'test/account_cash_statement.yml', 'test/account_report.yml', - + ], 'installable': True, From b45b6cd5d9a177bce43969441a3db48844138625 Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 15 Mar 2011 15:12:15 +0530 Subject: [PATCH 026/121] [ADD]: Images: claim_from_delivery, decimal_precision, delivery, document bzr revid: vro@tinyerp.com-20110315094215-usuqjhal254dgy64 --- addons/claim_from_delivery/__openerp__.py | 9 +++++++-- addons/decimal_precision/__openerp__.py | 5 +++-- addons/delivery/__openerp__.py | 8 ++++++-- addons/document/__openerp__.py | 10 +++++++--- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/addons/claim_from_delivery/__openerp__.py b/addons/claim_from_delivery/__openerp__.py index 73914abe203..6c8e0de1429 100644 --- a/addons/claim_from_delivery/__openerp__.py +++ b/addons/claim_from_delivery/__openerp__.py @@ -18,19 +18,24 @@ # ############################################################################## { - "name" : "Claim from delivery", + "name" : "Claim from Delivery", "version" : "1.0", "author" : "OpenERP SA", "category" : "Generic Modules/Inventory Control", "depends" : ["base", "crm_claim", "stock"], "init_xml" : [], "demo_xml" : [], - "description": '''Create Claim from delivery order: + "description": ''' + Create a claim from a delivery order. + ===================================== + + Adds a Claim link to the delivery order. ''', "update_xml" : ["claim_delivery_view.xml"], "active": False, "installable": True, "certificate" : "001101649349223746957", + 'images': ['images/1_claim_link_delivery_order.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/decimal_precision/__openerp__.py b/addons/decimal_precision/__openerp__.py index 67ba4916114..5beb1177a35 100644 --- a/addons/decimal_precision/__openerp__.py +++ b/addons/decimal_precision/__openerp__.py @@ -22,8 +22,8 @@ { "name": "Decimal Precision Configuration", "description": """ -This module allows to configure the price accuracy you need for different kind -of usage: accounting, sales, purchases, ... +Configure the price accuracy you need for different kinds of usage: accounting, sales, purchases, etc. +====================================================================================================== The decimal precision is configured per company. """, @@ -39,6 +39,7 @@ The decimal precision is configured per company. "demo_xml": [], "installable": True, "certificate" : "001307317809612974621", + 'images': ['images/1_decimal_accuracy_form.jpeg','images/1_decimal_accuracy_list.jpeg'], } diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py index baca1113190..9f054b38dd8 100644 --- a/addons/delivery/__openerp__.py +++ b/addons/delivery/__openerp__.py @@ -21,10 +21,13 @@ { - 'name': 'Carriers and deliveries', + 'name': 'Carriers and Deliveries', 'version': '1.0', 'category': 'Generic Modules/Sales & Purchases', - 'description': """Allows you to add delivery methods in sale orders and picking. + 'description': """ + Allows you to add delivery methods in sale orders and picking. + ============================================================== + You can define your own carrier and delivery grids for prices. When creating invoices from picking, OpenERP is able to add and compute the shipping line. @@ -44,5 +47,6 @@ 'installable': True, 'active': False, 'certificate': '0033981912253', + 'images': ['images/1_delivery_method.jpeg','images/2_delivery_pricelist.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py index 8a2a6677cc0..ac1d3be314a 100644 --- a/addons/document/__openerp__.py +++ b/addons/document/__openerp__.py @@ -24,14 +24,17 @@ 'name': 'Integrated Document Management System', 'version': '2.1', 'category': 'Generic Modules/Others', - 'description': """This is a complete document management system: + 'description': """ + This is a complete document management system. + ============================================== + * User Authentication - * Document Indexation :- .pptx and .docx files are not support in windows platform. + * Document Indexation :- .pptx and .docx files are not supported in Windows platform. * Dashboard for Document that includes: * New Files (list) * Files by Resource Type (graph) * Files by Partner (graph) - * Files by Month (graph) + * Files Size by Month (graph) ATTENTION: - When you install this module in a running company that have already PDF files stored into the database, you will lose them all. @@ -58,6 +61,7 @@ 'installable': True, 'active': False, 'certificate': '0070515416461', + 'images': ['images/1_directories.jpeg','images/2_storage_media.jpeg','images/3_directories_structure.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 196bbb99d8a9384adcc35ae95c1b323c837d6327 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Tue, 15 Mar 2011 16:20:43 +0530 Subject: [PATCH 027/121] [ADD]: Images of account_analytic_analysis, account_analytic_default, account_analytic_plans, account_anglo_saxon and account_budge modules. bzr revid: rch@tinyerp.com-20110315105043-5e8me1cjse6picy2 --- addons/account_analytic_analysis/__openerp__.py | 10 +++++----- addons/account_analytic_default/__openerp__.py | 2 ++ addons/account_analytic_plans/__openerp__.py | 1 + addons/account_anglo_saxon/__openerp__.py | 1 + addons/account_budget/__openerp__.py | 6 ++++-- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/addons/account_analytic_analysis/__openerp__.py b/addons/account_analytic_analysis/__openerp__.py index f6c1854bc3d..da9e9951d71 100644 --- a/addons/account_analytic_analysis/__openerp__.py +++ b/addons/account_analytic_analysis/__openerp__.py @@ -21,19 +21,19 @@ { - 'name' : 'report_account_analytic', + 'name' : 'Analysis of Analytic Account ', 'version' : '1.1', 'category' : 'Generic Modules/Accounting', 'description': """ -This module is for modifying account analytic view to show -important data to project manager of services companies. -Adds menu to show relevant information to each manager.. - +This module is for modifying account analytic view to show important data to project manager of services companies. +=================================================================================================================== +Adds menu to show relevant information to each manager. You can also view the report of account analytic summary user-wise as well as month wise. """, "author" : "Camptocamp", "website" : "http://www.camptocamp.com/", + "images" : ["images/bill_tasks_works.jpeg","images/overpassed_accounts.jpeg"], "depends" : ["hr_timesheet_invoice"], "init_xml" : [], "update_xml": [ diff --git a/addons/account_analytic_default/__openerp__.py b/addons/account_analytic_default/__openerp__.py index b529a92e6f1..e023f39bae8 100644 --- a/addons/account_analytic_default/__openerp__.py +++ b/addons/account_analytic_default/__openerp__.py @@ -25,6 +25,7 @@ 'category' : 'Generic Modules/Accounting', 'description': """ Allows to automatically select analytic accounts based on criterions: +===================================================================== * Product * Partner * User @@ -33,6 +34,7 @@ Allows to automatically select analytic accounts based on criterions: """, 'author' : 'OpenERP SA', 'website' : 'http://www.openerp.com', + 'images' : ['images/analytic_defaults.jpeg'], 'depends' : ['sale'], 'init_xml' : [], 'update_xml': ['security/ir.model.access.csv', 'account_analytic_default_view.xml'], diff --git a/addons/account_analytic_plans/__openerp__.py b/addons/account_analytic_plans/__openerp__.py index 5a021d4d104..fcf4ae1a7cd 100644 --- a/addons/account_analytic_plans/__openerp__.py +++ b/addons/account_analytic_plans/__openerp__.py @@ -56,6 +56,7 @@ of distribution models. """, 'author' : 'OpenERP SA', 'website' : 'http://www.openerp.com', + 'images' : ['images/analytic_plan.jpeg'], 'depends' : ['account', 'account_analytic_default'], 'init_xml' : [], 'update_xml': [ diff --git a/addons/account_anglo_saxon/__openerp__.py b/addons/account_anglo_saxon/__openerp__.py index 7dec56f8766..4f70ca50858 100644 --- a/addons/account_anglo_saxon/__openerp__.py +++ b/addons/account_anglo_saxon/__openerp__.py @@ -30,6 +30,7 @@ This module will add this functionality by using a interim account, to store the value of shipped goods and will contra book this interim account when the invoice is created to transfer this amount to the debtor or creditor account. Secondly, price differences between actual purchase price and fixed product standard price are booked on a separate account""", + "images" : ["images/account_anglo_saxon.jpeg"], "depends" : ["product", "purchase"], "category" : "Generic Modules/Inventory Control", "init_xml" : [], diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py index d73efdce399..e002393804f 100644 --- a/addons/account_budget/__openerp__.py +++ b/addons/account_budget/__openerp__.py @@ -24,8 +24,9 @@ 'name': 'Budget Management', 'version': '1.0', 'category': 'Generic Modules/Accounting', - 'description': """This module allows accountants to manage analytic and crossovered budgets. - + 'description': """ +This module allows accountants to manage analytic and crossovered budgets. +========================================================================== Once the Master Budgets and the Budgets are defined (in Accounting/Budgets/), the Project Managers can set the planned amount on each Analytic Account. @@ -44,6 +45,7 @@ Three reports are available: """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/budget.jpeg','images/budgetary_position.jpeg'], 'depends': ['account'], 'init_xml': [], 'update_xml': [ From 96d704dd5b594ec36e7d0033b826294d41f5f554 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Tue, 15 Mar 2011 16:56:45 +0530 Subject: [PATCH 028/121] [FIX] account: legal reports - Display accounts dropdown lp bug: https://launchpad.net/bugs/706287 fixed bzr revid: ara@tinyerp.com-20110315112645-3stqj1l8j3gdpkwt --- addons/account/report/account_balance.py | 2 +- addons/account/report/account_balance_sheet.py | 2 +- addons/account/report/account_profit_loss.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 5d9cfac5699..80508ede44b 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -89,7 +89,7 @@ class account_balance(report_sxw.rml_parse, common_report_header): self.sum_debit += account_rec['debit'] self.sum_credit += account_rec['credit'] if disp_acc == 'bal_movement': - if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): + if not currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) or not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): self.result_acc.append(res) elif disp_acc == 'bal_solde': if not currency_obj.is_zero(self.cr, self.uid, currency, res['balance']): diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index e13fa43fac5..fa80ad96f3c 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -144,7 +144,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) if typ == 'asset' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += account.balance if data['form']['display_account'] == 'bal_movement': - if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): + if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account_dict) elif data['form']['display_account'] == 'bal_solde': if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index 6f16048d3a8..b672c930f95 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -114,7 +114,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): if typ == 'income' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_cr += abs(account.debit - account.credit) if data['form']['display_account'] == 'bal_movement': - if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): + if not currency_pool.is_zero(self.cr, self.uid, currency, account.credit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.debit) or not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): accounts_temp.append(account) elif data['form']['display_account'] == 'bal_solde': if not currency_pool.is_zero(self.cr, self.uid, currency, account.balance): From f872742018d01cf033a51c6a922ea7c8f5917261 Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 15 Mar 2011 17:02:52 +0530 Subject: [PATCH 029/121] [ADD]: Images: document_ftp, document_ics, email_template, event bzr revid: vro@tinyerp.com-20110315113252-vwkvqm06wb28zgjv --- addons/document_ftp/__openerp__.py | 6 +++++- addons/document_ics/__openerp__.py | 6 +++++- addons/email_template/__openerp__.py | 4 +++- addons/event/__openerp__.py | 12 ++++++------ 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/addons/document_ftp/__openerp__.py b/addons/document_ftp/__openerp__.py index d7d087f234e..3beb34c9fb7 100644 --- a/addons/document_ftp/__openerp__.py +++ b/addons/document_ftp/__openerp__.py @@ -24,7 +24,10 @@ 'name': 'Integrated FTP Server with Document Management System', 'version': '1.99', 'category': 'Generic Modules/Others', - 'description': """This is a support FTP Interface with document management system. + 'description': """ + This is a support FTP Interface with document management system. + ================================================================ + With this module you would not only be able to access documents through OpenERP but you would also be able to connect with them through the file system using the FTP client. @@ -46,6 +49,7 @@ 'installable': True, 'active': False, 'certificate': '00934787762705016005', + 'images': ['images/1_configure_ftp.jpeg','images/2_document_browse.jpeg','images/3_document_ftp.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_ics/__openerp__.py b/addons/document_ics/__openerp__.py index 1ef049f9833..22d20905466 100644 --- a/addons/document_ics/__openerp__.py +++ b/addons/document_ics/__openerp__.py @@ -24,7 +24,10 @@ 'name': 'Support for iCal based on Document Management System', 'version': '1.0', 'category': 'Generic Modules/Others', - 'description': """Allows to synchronise calendars with others applications.""", + 'description': """ + Allows to synchronise calendars with others applications. + ========================================================= + """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['document', 'crm'], @@ -34,5 +37,6 @@ 'installable': True, 'active': False, 'certificate': '0071242387229', + 'images': ['images/1_config_calendars.jpeg','images/2_doc_type_ics.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index 520109663dc..420fc0366a7 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -28,7 +28,8 @@ "category" : "Added functionality", "depends" : ['marketing', 'base_tools'], "description": """ - Email Template is extraction of Power Email basically just to send the emails. + Email Template is extraction of Power Email basically just to send emails. + ========================================================================== """, "init_xml": ['email_template_scheduler_data.xml'], "update_xml": [ @@ -43,6 +44,7 @@ "installable": True, "active": False, "certificate" : "00817073628967384349", + 'images': ['images/1_email_account.jpeg','images/2_email_template.jpeg','images/3_emails.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index a45eeac0dae..0a4fa3d7066 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -24,19 +24,18 @@ 'name': 'Event', 'version': '0.1', 'category': 'Generic Modules/Association', - 'description': """Organization and management of Event. + 'description': """ + Organization and management of Events. + ====================================== This module allow you * to manage your events and their registrations * to use emails to automatically confirm and send acknowledgements for any registration to an event * ... - A dashboard for associations that includes: - * Registration by Events (graph) + Note that: - You can define new types of events in - Events / Configuration / Types of Events - - You can access predefined reports about number of registration per event or per event category in: - Events / Reporting + Association / Configuration / Types of Events """, 'author': 'OpenERP SA', 'depends': ['crm', 'base_contact', 'account', 'marketing'], @@ -58,5 +57,6 @@ 'installable': True, 'active': False, 'certificate': '0083059161581', + 'images': ['images/1_event_type_list.jpeg','images/2_events.jpeg','images/3_registrations.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 2decd59a6520453696313c5241bae711a04c096f Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 15 Mar 2011 17:27:24 +0530 Subject: [PATCH 030/121] [ADD]: Images: fetchmail, idea, knowledge, l10n_be, l10n_br bzr revid: vro@tinyerp.com-20110315115724-jg6wr6e6p1q4az3v --- addons/fetchmail/__openerp__.py | 17 ++++++++++------- addons/idea/__openerp__.py | 7 +++++-- addons/knowledge/__openerp__.py | 5 ++++- addons/l10n_be/__openerp__.py | 15 ++++++++------- addons/l10n_br/__openerp__.py | 6 +++++- 5 files changed, 32 insertions(+), 18 deletions(-) diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index 6d72f6ea917..534900930b4 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -2,7 +2,7 @@ #-*- coding:utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). All Rights Reserved # mga@tinyerp.com # @@ -26,12 +26,14 @@ "version" : "1.0", "depends" : ["base", 'mail_gateway'], "author" : "OpenERP SA", - "description": """Fetchmail: - * Fetch email from Pop / IMAP server - * Support SSL - * Integrated with all Modules - * Automatic Email Receive - * Email based Records (Add, Update) + "description": """ + Fetch email from POP / IMAP servers. + ==================================== + + * Supports SSL + * Integrated with all modules + * Automatically receive email + * Email-based record operations (Add, Update) """, 'website': 'http://www.openerp.com', 'init_xml': [], @@ -46,4 +48,5 @@ 'installable': True, 'active': False, 'certificate' : '00692978332890137453', + 'images': ['images/1_email_servers.jpeg'], } diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py index 7bb35a07fd4..630b9b86754 100644 --- a/addons/idea/__openerp__.py +++ b/addons/idea/__openerp__.py @@ -25,11 +25,13 @@ 'version': '0.1', 'category': 'Tools', 'description': """ - This module allows your user to easily and efficiently participate in the innovation of the enterprise. + This module allows your user to easily and efficiently participate in enterprise innovation. + ============================================================================================ + It allows everybody to express ideas about different subjects. Then, other users can comment on these ideas and vote for particular ideas. Each idea has a score based on the different votes. - The managers can obtain an easy view on best ideas from all the users. + The managers can obtain an easy view of best ideas from all the users. Once installed, check the menu 'Ideas' in the 'Tools' main menu.""", 'author': 'OpenERP SA', 'website': 'http://openerp.com', @@ -51,5 +53,6 @@ ], 'installable': True, 'certificate': '0071515601309', + 'images': ['images/1_ideas.jpeg','images/2_idea_categories.jpeg','images/3_vote_idea.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py index de7a54e0d19..03122dfeb3e 100644 --- a/addons/knowledge/__openerp__.py +++ b/addons/knowledge/__openerp__.py @@ -25,7 +25,9 @@ "version" : "1.0", "depends" : ["base"], "author" : "OpenERP SA", - "description": """Installer for knowledge-based tools + "description": """ + Installer for knowledge-based tools. + ==================================== """, 'website': 'http://www.openerp.com', 'init_xml': [], @@ -39,5 +41,6 @@ 'installable': True, 'active': False, 'certificate' : '001278773815843749581', + 'images': ['images/1_config_knowledge.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py index bbc56b91ebb..2559476b686 100644 --- a/addons/l10n_be/__openerp__.py +++ b/addons/l10n_be/__openerp__.py @@ -23,20 +23,20 @@ 'category': 'Localisation/Account Charts', 'description': """ This is the base module to manage the accounting chart for Belgium in OpenERP. + ============================================================================== - After Installing this module,The Configuration wizard for accounting is launched. + After installing this module, the Configuration wizard for accounting is launched. * We have the account templates which can be helpful to generate Charts of Accounts. - * On that particular wizard,You will be asked to pass the name of the company,the chart template to follow,the no. of digits to generate the code for your account and Bank account,currency to create Journals. - Thus,the pure copy of Chart Template is generated. - * This is the same wizard that runs from Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. + * On that particular wizard, you will be asked to pass the name of the company, the chart template to follow, the no. of digits to generate, the code for your account and bank account, currency to create journals. + Thus,the pure copy of Chart Template is generated. Wizards provided by this module: * Partner VAT Intra: Enlist the partners with their related VAT and invoiced amounts.Prepares an XML file format. - Path to access : Financial Management/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing + Path to access : Accounting/Reporting//Legal Statements/Belgium Statements/Partner VAT Listing * Periodical VAT Declaration: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in. - Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Periodical VAT Declaration + Path to access : Accounting/Reporting/Legal Statements/Belgium Statements/Periodical VAT Declaration * Annual Listing Of VAT-Subjected Customers: Prepares an XML file for Vat Declaration of the Main company of the User currently Logged in.Based on Fiscal year - Path to access : Financial Management/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers + Path to access : Accounting/Reporting/Legal Statements/Belgium Statements/Annual Listing Of VAT-Subjected Customers """, 'author': 'OpenERP SA', @@ -61,5 +61,6 @@ 'demo_xml': [], 'installable': True, 'certificate': '0031977724637', + 'images': ['images/1_config_chart_l10n_be.jpeg','images/2_l10n_be_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py index 44ba69b9a1e..f77b7a4dfc3 100644 --- a/addons/l10n_br/__openerp__.py +++ b/addons/l10n_br/__openerp__.py @@ -20,7 +20,10 @@ { 'name': 'Brazilian Localization', - 'description': 'Brazilian Localization', + 'description': """ + This is the base module to manage the accounting chart for Brazil in OpenERP. + ============================================================================== + """, 'category': 'Localisation/Account Charts', 'author': 'OpenERP Brasil', 'website': 'http://openerpbrasil.org', @@ -36,6 +39,7 @@ ], 'installable': True, 'certificate' : '001280994939126801405', + 'images': ['images/1_config_chart_l10n_br.jpeg','images/2_l10n_br_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 696f3d25d8d3b867941dc7034dea6e62039f2fb4 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Tue, 15 Mar 2011 17:32:51 +0530 Subject: [PATCH 031/121] [ADD]: Images of account_cancel, account_coda, account_followup, account_invoice_layout and account_payment modules. bzr revid: rch@tinyerp.com-20110315120251-2fbqce700h205c4i --- addons/account/__openerp__.py | 2 +- addons/account_cancel/__openerp__.py | 1 + addons/account_coda/__openerp__.py | 1 + addons/account_followup/__openerp__.py | 6 ++++-- addons/account_invoice_layout/__openerp__.py | 5 ++++- addons/account_payment/__openerp__.py | 2 ++ 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index cee1f92b81f..e9a5eef2557 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -50,7 +50,7 @@ grouping is maintained through journal) for a particular financial year and for module named account_voucher. """, 'website': 'http://www.openerp.com', - 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg','images/payment_order.jpeg','images/supplier_voucher.jpeg'], + 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg','images/supplier_voucher.jpeg'], 'init_xml': [], "depends" : ["product", "analytic", "process","board"], 'update_xml': [ diff --git a/addons/account_cancel/__openerp__.py b/addons/account_cancel/__openerp__.py index 6c6cc604299..2189e5a383e 100644 --- a/addons/account_cancel/__openerp__.py +++ b/addons/account_cancel/__openerp__.py @@ -28,6 +28,7 @@ Module adds 'Allow cancelling entries' field on form view of account journal. If set to true it allows user to cancel entries & invoices. """, 'website': 'http://www.openerp.com', + "images" : ["images/account_cancel.jpeg"], "depends" : ["account"], 'init_xml': [], 'update_xml': ['account_cancel_view.xml' ], diff --git a/addons/account_coda/__openerp__.py b/addons/account_coda/__openerp__.py index 74f490d6dfb..cd8bd9eea57 100644 --- a/addons/account_coda/__openerp__.py +++ b/addons/account_coda/__openerp__.py @@ -28,6 +28,7 @@ Module provides functionality to import bank statements from coda files. """, + "images" : ["images/coda_logs.jpeg","images/import_coda_logs.jpeg"], "depends" : ["account_voucher"], "demo_xml" : [], "init_xml" : [], diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index ae6fb8e4fce..63b6c523dd1 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -25,6 +25,7 @@ 'category': 'Generic Modules/Accounting', 'description': """ Modules to automate letters for unpaid invoices, with multi-level recalls. + ========================================================================== You can define your multiple levels of recall through the menu: Accounting/Configuration/Miscellaneous/Follow-Ups @@ -37,12 +38,13 @@ different levels of recall defined. You can define different policies for different companies. You can also send mail to the customer. - Note that if you want to change the followup level for a given partner/account entry, you can do from in the menu: - Accounting/Reporting/Generic Reporting/Partner Accounts/Follow-ups Sent + Note that if you want to check the followup level for a given partner/account entry, you can do from in the menu: + Accounting/Reporting/Generic Reporting/Partners/Follow-ups Sent """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/follow_ups.jpeg','images/send_followups.jpeg'], 'depends': ['account'], 'init_xml': [], 'update_xml': [ diff --git a/addons/account_invoice_layout/__openerp__.py b/addons/account_invoice_layout/__openerp__.py index 36eeb41b137..1878dd06d84 100644 --- a/addons/account_invoice_layout/__openerp__.py +++ b/addons/account_invoice_layout/__openerp__.py @@ -26,17 +26,20 @@ 'category': 'Generic Modules/Projects & Services', 'description': """ This module provides some features to improve the layout of the invoices. + ========================================================================= It gives you the possibility to + -------------------------------- * order all the lines of an invoice * add titles, comment lines, sub total lines * draw horizontal lines and put page breaks - Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions... + Moreover, there is one option which allows you to print all the selected invoices with a given special message at the bottom of it. This feature can be very useful for printing your invoices with end-of-year wishes, special punctual conditions. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/notification_messages.jpeg'], 'depends': ['account'], 'init_xml': [], 'update_xml': [ diff --git a/addons/account_payment/__openerp__.py b/addons/account_payment/__openerp__.py index ec4d7ffba4b..00b8e85c4cc 100644 --- a/addons/account_payment/__openerp__.py +++ b/addons/account_payment/__openerp__.py @@ -26,9 +26,11 @@ "category": "Generic Modules/Payment", "description": """ This module provides : +---------------------- * a more efficient way to manage invoice payment. * a basic mechanism to easily plug various automated payment. """, + 'images': ['images/payment_mode.jpeg','images/payment_order.jpeg'], 'depends': ['account','account_voucher'], 'init_xml': [], 'update_xml': [ From 258328ca443acc52595318227a225859d2a11184 Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 15 Mar 2011 17:43:23 +0530 Subject: [PATCH 032/121] [ADD]: Images: l10n_ca, l10n_ch, l10n_cn, l10n_cr, l10n_de bzr revid: vro@tinyerp.com-20110315121323-7gak84yjaiwyg1zn --- addons/l10n_ca/__openerp__.py | 12 ++++--- addons/l10n_ch/__openerp__.py | 9 +++-- addons/l10n_cn/__openerp__.py | 2 ++ addons/l10n_cr/__openerp__.py | 5 ++- addons/l10n_de/__openerp__.py | 64 +++++++++++++++++++---------------- 5 files changed, 54 insertions(+), 38 deletions(-) diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py index b3edda0a80e..11141664d08 100644 --- a/addons/l10n_ca/__openerp__.py +++ b/addons/l10n_ca/__openerp__.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,16 +15,19 @@ # 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 . +# along with this program. If not, see . # ############################################################################## { - "name" : "Canada - English and French Canadian Chart of Accounts", + "name" : "Canada - English and French - Canadian Chart of Accounts", "version" : "1.0", "author" : "Savoir-faire Linux", "website" : "http://www.savoirfairelinux.com", "category" : "Localisation/Account Charts", - "description": "This is the module to manage the english and french canadian accounting chart in OpenERP.", + "description": """ + This is the module to manage the English and French - Canadian accounting chart in OpenERP. + =========================================================================================== + """, "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'], "init_xml" : [], "update_xml" : [ @@ -45,6 +48,7 @@ "demo_xml" : [], "installable" : True, "certificate" : '00941680933773696173', + 'images': ['images/config_chart_l10n_ca.jpeg','images/l10n_ca_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py index 60b91a06811..79edbbc07c5 100644 --- a/addons/l10n_ch/__openerp__.py +++ b/addons/l10n_ch/__openerp__.py @@ -22,7 +22,9 @@ { "name" : "Switzerland - localization with 2011 taxes", "description" : """ -Swiss localisation : +Swiss localisation. +=================== + - DTA generation for a lot of payment types - BVR management (number generation, report, etc..) - Import account move from the bank file (like v11 etc..) @@ -31,7 +33,7 @@ Swiss localisation : You can also add ZIP and bank completion with: - l10n_ch_zip - l10n_ch_bank - + Author: Camptocamp SA Donors: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA @@ -47,7 +49,7 @@ Par ailleurs, conjointement à ce module, nous proposons la complétion NPA: Vous pouvez ajouter la completion des banques et des NPA avec with: - l10n_ch_zip - l10n_ch_bank - + Auteur: Camptocamp SA Donateurs: Hasa Sàrl, Open Net Sàrl and Prisme Solutions Informatique SA @@ -102,5 +104,6 @@ TODO : "active": False, "installable": True, "certificate" : "001103836064567088989", + 'images': ['images/config_chart_l10n_ch.jpeg','images/l10n_ch_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py index c7d60e67937..128fdfa9920 100644 --- a/addons/l10n_cn/__openerp__.py +++ b/addons/l10n_cn/__openerp__.py @@ -28,6 +28,7 @@ "description": """ 添加中文省份数据 科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿 + ============================================================ """, "depends" : ["base","account"], 'init_xml': [ @@ -42,6 +43,7 @@ "active": False, "installable": True, "certificate": '00925445983542952285', + 'images': ['images/config_chart_l10n_cn.jpeg','images/l10n_cn_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py index dcd6869b83e..190919689d9 100644 --- a/addons/l10n_cr/__openerp__.py +++ b/addons/l10n_cr/__openerp__.py @@ -39,7 +39,9 @@ 'author': 'ClearCorp S.A.', 'website': 'http://clearcorp.co.cr', 'category': 'Localisation/Account Charts', - 'description': """Chart of accounts for Costa Rica + 'description': """ + Chart of accounts for Costa Rica. + ================================= Includes: * account.type * account.account.template @@ -66,6 +68,7 @@ http://translations.launchpad.net/openerp-costa-rica 'installable': True, 'active': False, 'certificate' : '00531476623680631853', + 'images': ['images/config_chart_l10n_cr.jpeg','images/l10n_cr_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py index 9ee56b6536e..4a7f7168113 100644 --- a/addons/l10n_de/__openerp__.py +++ b/addons/l10n_de/__openerp__.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## @@ -25,29 +25,29 @@ # Dieses Modul bietet Ihnen einen deutschen Kontenplan basierend auf dem SKR03. # Gemäss der aktuellen Einstellungen ist die Firma nicht Umsatzsteuerpflichtig. # Diese Grundeinstellung ist sehr einfach zu ändern und bedarf in der Regel -# grundsätzlich eine initiale Zuweisung von Steuerkonten zu Produkten und / oder +# grundsätzlich eine initiale Zuweisung von Steuerkonten zu Produkten und / oder # Sachkonten oder zu Partnern. # Die Umsatzsteuern (voller Steuersatz, reduzierte Steuer und steuerfrei) # sollten bei den Produktstammdaten hinterlegt werden (in Abhängigkeit der # Steuervorschriften). Die Zuordnung erfolgt auf dem Aktenreiter Finanzbuchhaltung # (Kategorie: Umsatzsteuer). # Die Vorsteuern (voller Steuersatz, reduzierte Steuer und steuerfrei) -# sollten ebenso bei den Produktstammdaten hinterlegt werden (in Abhängigkeit -# der Steuervorschriften). Die Zuordnung erfolgt auf dem Aktenreiter +# sollten ebenso bei den Produktstammdaten hinterlegt werden (in Abhängigkeit +# der Steuervorschriften). Die Zuordnung erfolgt auf dem Aktenreiter # Finanzbuchhaltung (Kategorie: Vorsteuer). # Die Zuordnung der Steuern für Ein- und Ausfuhren aus EU Ländern, sowie auch -# für den Ein- und Verkauf aus und in Drittländer sollten beim Partner -# (Lieferant/Kunde)hinterlegt werden (in Anhängigkeit vom Herkunftsland -# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als +# für den Ein- und Verkauf aus und in Drittländer sollten beim Partner +# (Lieferant/Kunde)hinterlegt werden (in Anhängigkeit vom Herkunftsland +# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als # die Zuordnung bei Produkten und überschreibt diese im Einzelfall. # -# Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften +# Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften # erlaubt OpenERP ein generelles Mapping von Steuerausweis und Steuerkonten -# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU") +# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU") # zwecks Zuordnung dieses Mappings zum ausländischen Partner (Kunde/Lieferant). # Die Rechnungsbuchung beim Einkauf bewirkt folgendes: -# Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den +# Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den # jeweiligen Kategorien für den Vorsteuer Steuermessbetrag (z.B. Vorsteuer # Steuermessbetrag Voller Steuersatz 19%). # Der Steuerbetrag erscheint unter der Kategorie "Vorsteuern" (z.B. Vorsteuer @@ -55,11 +55,11 @@ # zusammengefasst werden und dann in Form eines Reports ausgegeben werden. # # Die Rechnungsbuchung beim Verkauf bewirkt folgendes: -# Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den -# jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag +# Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den +# jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag # (z.B. Umsatzsteuer Steuermessbetrag Voller Steuersatz 19%). -# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer" -# (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können +# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer" +# (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können # verschiedene Positionen zusammengefasst werden. # Die zugewiesenen Steuerausweise können auf Ebene der einzelnen # Rechnung (Eingangs- und Ausgangsrechnung) nachvollzogen werden, @@ -76,29 +76,29 @@ # d.h. im Standard existiert keine Zuordnung von Produkten und Sachkonten zu # Steuerschlüsseln. # Diese Grundeinstellung ist sehr einfach zu ändern und bedarf in der Regel -# grundsätzlich eine initiale Zuweisung von Steuerschlüsseln zu Produkten und / oder +# grundsätzlich eine initiale Zuweisung von Steuerschlüsseln zu Produkten und / oder # Sachkonten oder zu Partnern. # Die Umsatzsteuern (voller Steuersatz, reduzierte Steuer und steuerfrei) # sollten bei den Produktstammdaten hinterlegt werden (in Abhängigkeit der # Steuervorschriften). Die Zuordnung erfolgt auf dem Aktenreiter Finanzbuchhaltung # (Kategorie: Umsatzsteuer). # Die Vorsteuern (voller Steuersatz, reduzierte Steuer und steuerfrei) -# sollten ebenso bei den Produktstammdaten hinterlegt werden (in Abhängigkeit -# der Steuervorschriften). Die Zuordnung erfolgt auf dem Aktenreiter +# sollten ebenso bei den Produktstammdaten hinterlegt werden (in Abhängigkeit +# der Steuervorschriften). Die Zuordnung erfolgt auf dem Aktenreiter # Finanzbuchhaltung (Kategorie: Vorsteuer). # Die Zuordnung der Steuern für Ein- und Ausfuhren aus EU Ländern, sowie auch -# für den Ein- und Verkauf aus und in Drittländer sollten beim Partner -# (Lieferant/Kunde) hinterlegt werden (in Anhängigkeit vom Herkunftsland -# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als +# für den Ein- und Verkauf aus und in Drittländer sollten beim Partner +# (Lieferant/Kunde) hinterlegt werden (in Anhängigkeit vom Herkunftsland +# des Lieferanten/Kunden). Die Zuordnung beim Kunden ist "höherwertig" als # die Zuordnung bei Produkten und überschreibt diese im Einzelfall. # -# Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften +# Zur Vereinfachung der Steuerausweise und Buchung bei Auslandsgeschäften # erlaubt OpenERP ein generelles Mapping von Steuerausweis und Steuerkonten -# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU") +# (z.B. Zuordnung "Umsatzsteuer 19%" zu "steuerfreie Einfuhren aus der EU") # zwecks Zuordnung dieses Mappings zum ausländischen Partner (Kunde/Lieferant). # Die Rechnungsbuchung beim Einkauf bewirkt folgendes: -# Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den +# Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den # jeweiligen Kategorien für den Vorsteuer Steuermessbetrag (z.B. Vorsteuer # Steuermessbetrag Voller Steuersatz 19%). # Der Steuerbetrag erscheint unter der Kategorie "Vorsteuern" (z.B. Vorsteuer @@ -106,11 +106,11 @@ # zusammengefasst werden und dann in Form eines Reports ausgegeben werden. # # Die Rechnungsbuchung beim Verkauf bewirkt folgendes: -# Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den -# jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag +# Die Steuerbemessungsgrundlage (exklusive Steuer) wird ausgewiesen bei den +# jeweiligen Kategorien für den Umsatzsteuer Steuermessbetrag # (z.B. Umsatzsteuer Steuermessbetrag Voller Steuersatz 19%). -# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer" -# (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können +# Der Steuerbetrag erscheint unter der Kategorie "Umsatzsteuer" +# (z.B. Umsatzsteuer 19%). Durch multidimensionale Hierachien können # verschiedene Positionen zusammengefasst werden. # Die zugewiesenen Steuerausweise können auf Ebene der einzelnen # Rechnung (Eingangs- und Ausgangsrechnung) nachvollzogen werden, @@ -126,7 +126,10 @@ "author" : "openbig.org", "website" : "http://www.openbig.org", "category" : "Localisation/Account Charts", - "description": """Dieses Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03.""", + "description": """ + Dieses Modul beinhaltet einen deutschen Kontenrahmen basierend auf dem SKR03. + ============================================================================== + """, "depends" : ['base', 'account', 'base_iban', 'base_vat', 'account_chart'], "init_xml" : [ ], "demo_xml" : [ ], @@ -145,4 +148,5 @@ ], "installable": True, "certificate": "00517849017945584893", -} + 'images': ['images/config_chart_l10n_de.jpeg','images/l10n_de_chart.jpeg'], +} From adfff7bdcefba91ba15918b3f3f99c7e4b72b3fa Mon Sep 17 00:00:00 2001 From: "aag (OpenERP)" Date: Tue, 15 Mar 2011 17:54:47 +0530 Subject: [PATCH 033/121] [FIX] base_contact: Now Sales User can enter "Functions and Addresses" lines lp bug: https://launchpad.net/bugs/734944 fixed bzr revid: aag@tinyerp.co.in-20110315122447-pw4hd4xuslwmdy0o --- addons/base_contact/security/ir.model.access.csv | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/base_contact/security/ir.model.access.csv b/addons/base_contact/security/ir.model.access.csv index 6918f7004fd..16cfad100a3 100644 --- a/addons/base_contact/security/ir.model.access.csv +++ b/addons/base_contact/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_res_partner_contact","res.partner.contact","model_res_partner_contact","base.group_partner_manager",1,1,1,1 "access_res_partner_job","res.partner.job","model_res_partner_job","base.group_partner_manager",1,1,1,1 -"access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact",base.group_user,1,0,0,0 -"access_res_partner_job_all","res.partner.job all","model_res_partner_job",base.group_user,1,0,0,0 -"access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact",base.group_sale_salesman,1,1,1,0 +"access_res_partner_contact_all","res.partner.contact all","model_res_partner_contact","base.group_user",1,0,0,0 +"access_res_partner_job_all","res.partner.job all","model_res_partner_job","base.group_user",1,0,0,0 +"access_group_sale_salesman","res.partner.contact.sale.salesman","model_res_partner_contact","base.group_sale_salesman",1,1,1,0 +"access_res_partner_job_salesman","res.partner.job.salesman","model_res_partner_job","base.group_sale_salesman",1,1,1,0 From d2717e3ec5b81333270d90d66e40339dc1b0012f Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 15 Mar 2011 17:58:14 +0530 Subject: [PATCH 034/121] [ADD]: Images: l10n_ec, l10n_es, l10n_fr, l10n_gr, l10n_gt bzr revid: vro@tinyerp.com-20110315122814-yeda2tkxqfk49jru --- addons/l10n_ec/__openerp__.py | 2 ++ addons/l10n_es/__openerp__.py | 5 ++++- addons/l10n_fr/__openerp__.py | 7 +++++-- addons/l10n_gr/__openerp__.py | 8 ++++++-- addons/l10n_gt/__openerp__.py | 7 ++++++- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py index 92e966f148c..4c9998f8b12 100644 --- a/addons/l10n_ec/__openerp__.py +++ b/addons/l10n_ec/__openerp__.py @@ -23,6 +23,7 @@ 'category': 'Localisation/Account Charts', 'description': """ This is the base module to manage the accounting chart for Ecuador in OpenERP. + ============================================================================== """, 'author': 'OpenERP SA', 'depends': [ @@ -42,4 +43,5 @@ 'demo_xml': [], 'installable': True, 'certificate' : '001226484516187330589', + 'images': ['images/config_chart_l10n_ec.jpeg','images/l10n_ec_chart.jpeg'], } diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py index a14f4a90843..438b9ff37f1 100644 --- a/addons/l10n_es/__openerp__.py +++ b/addons/l10n_es/__openerp__.py @@ -27,7 +27,9 @@ "author" : "Spanish Localization Team", 'website' : 'https://launchpad.net/openerp-spain', "category" : "Localisation/Account Charts", - "description": """Spanish Charts of Accounts (PGCE 2008) + "description": """ + Spanish Charts of Accounts (PGCE 2008). + ======================================= * Defines the following chart of account templates: * Spanish General Chart of Accounts 2008. @@ -55,4 +57,5 @@ for yearly account reporting (balance, profit & losses). "active": False, "installable": True, "certificate" : "00408828172062583229", + 'images': ['images/config_chart_l10n_es.jpeg','images/l10n_es_chart.jpeg'], } diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py index 287cdf47227..37a8f21764f 100644 --- a/addons/l10n_fr/__openerp__.py +++ b/addons/l10n_fr/__openerp__.py @@ -31,7 +31,9 @@ "author" : "OpenERP SA", "website": "http://www.openerp.com", "category" : "Localisation/Account Charts", - "description": """This is the module to manage the accounting chart for France in OpenERP. + "description": """ + This is the module to manage the accounting chart for France in OpenERP. + ======================================================================== Credits: Sistheo Zeekom CrysaLEAD """, @@ -53,7 +55,8 @@ Credits: Sistheo Zeekom CrysaLEAD "demo_xml" : [], "certificate" : "00435321693876313629", "active": False, - "installable": True + "installable": True, + 'images': ['images/config_chart_l10n_fr.jpeg','images/l10n_fr_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py index 76a8dbd95cc..ec754506cc1 100644 --- a/addons/l10n_gr/__openerp__.py +++ b/addons/l10n_gr/__openerp__.py @@ -25,18 +25,22 @@ "author" : "P. Christeas, OpenERP SA.", "website": "http://openerp.hellug.gr/", "category" : "Localisation/Account Charts", - "description": "This is the base module to manage the accounting chart for Greece.", + "description": """ + This is the base module to manage the accounting chart for Greece. + ================================================================== + """, "depends" : ["base", "account", "base_iban", "base_vat", "account_chart"], "init_xml" : [], "demo_xml" : [], "update_xml" : [ "account_types.xml", - "account_chart.xml", + "account_chart.xml", "account_full_chart.xml", "account_tax.xml", "account_tax_vat.xml", "l10n_gr_wizard.xml"], "installable": True, 'certificate': '001146244418929008029', + 'images': ['images/config_chart_l10n_gr.jpeg','images/l10n_gr_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py index 8e4e686820c..57afaf595e7 100644 --- a/addons/l10n_gt/__openerp__.py +++ b/addons/l10n_gt/__openerp__.py @@ -36,7 +36,11 @@ 'name': 'Guatemala - Plan contable general', 'version': '3.0', 'category': 'Localisation/Account Charts', - 'description': """Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency""", + 'description': """ + This is the base module to manage the accounting chart for Guatemala. + ===================================================================== + + Agrega una nomenclatura contable para Guatemala. También icluye impuestos y la moneda del Quetzal. -- Adds accounting chart for Guatemala. It also includes taxes and the Quetzal currency""", 'author': 'José Rodrigo Fernández Menegazzo', 'website': 'http://solucionesprisma.com/', 'depends': ['base', 'account', 'account_chart'], @@ -50,5 +54,6 @@ 'demo_xml': [], 'installable': True, 'certificate': '00815146661827601309', + 'images': ['images/config_chart_l10n_gt.jpeg','images/l10n_gt_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From c0ff4935a790c6831d02a1da28a5e1e5eee8b4f6 Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 15 Mar 2011 18:10:30 +0530 Subject: [PATCH 035/121] [ADD]: Images: l10n_in, l10n_it, l10n_lu, l10n_ma, l10n_mx bzr revid: vro@tinyerp.com-20110315124030-juif4qp3xz78xsue --- addons/l10n_in/__openerp__.py | 4 +++- addons/l10n_it/__openerp__.py | 4 +++- addons/l10n_lu/__openerp__.py | 4 +++- addons/l10n_ma/__openerp__.py | 15 ++++++++++----- addons/l10n_mx/__openerp__.py | 8 ++++++-- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py index da72cc3ef20..8fd34e4e7a8 100644 --- a/addons/l10n_in/__openerp__.py +++ b/addons/l10n_in/__openerp__.py @@ -23,7 +23,8 @@ "name": "Indian Chart of Account", "version": "1.0", "description": """ - Indian Accounting : chart of Account + Indian Accounting : Chart of Account. + ===================================== """, "author": ['OpenERP SA', 'Axelor'], "category": "Localisation/Account Charts", @@ -39,5 +40,6 @@ "active": False, "installable": True, "certificate" : "001308250150600713245", + 'images': ['images/config_chart_l10n_in.jpeg','images/l10n_in_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py index 5a5fa0def38..aad8309d958 100644 --- a/addons/l10n_it/__openerp__.py +++ b/addons/l10n_it/__openerp__.py @@ -30,7 +30,8 @@ "depends" : ['base_vat','account_chart','base_iban'], "author" : "OpenERP Italian Community", "description": """ - Piano dei conti italiano di un'impresa generica + Piano dei conti italiano di un'impresa generica. + ================================================ """, "license": "AGPL-3", "category" : "Localisation/Account Charts", @@ -55,4 +56,5 @@ 'installable': True, 'active': False, 'certificate' : '00926677190009155165', + 'images': ['images/config_chart_l10n_it.jpeg','images/l10n_it_chart.jpeg'], } diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py index c7fd50ad037..f79fa4ca92d 100644 --- a/addons/l10n_lu/__openerp__.py +++ b/addons/l10n_lu/__openerp__.py @@ -25,7 +25,8 @@ 'version': '1.0', 'category': 'Localisation/Account Charts', 'description': """ -This module installs: + This is the base module to manage the accounting chart for Luxembourg. + ===================================================================== *the KLUWER Chart of Accounts, *the Tax Code Chart for Luxembourg @@ -46,5 +47,6 @@ This module installs: 'installable': True, 'active': False, 'certificate': '0078164766621', + 'images': ['images/config_chart_l10n_lu.jpeg','images/l10n_lu_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py index b128e7308af..1ea59d31a37 100644 --- a/addons/l10n_ma/__openerp__.py +++ b/addons/l10n_ma/__openerp__.py @@ -1,6 +1,6 @@ # -*- encoding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (c) 2010 kazacube (http://kazacube.com). # @@ -15,7 +15,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## @@ -24,7 +24,11 @@ "version" : "1.0", "author" : "kazacube", "category" : "Localisation/Account Charts", - "description": "Ce Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010", + "description": """ + This is the base module to manage the accounting chart for Maroc. + ================================================================= + + Ce Module charge le modèle du plan de comptes standard Marocain et permet de générer les états comptables aux normes marocaines (Bilan, CPC (comptes de produits et charges), balance générale à 6 colonnes, Grand livre cumulatif...). L'intégration comptable a été validé avec l'aide du Cabinet d'expertise comptable Seddik au cours du troisième trimestre 2010""", "website": "http://www.kazacube.com", "depends" : ["base", "account"], "init_xml" : [], @@ -33,15 +37,16 @@ "security/ir.model.access.csv", "account_type.xml", "account_pcg_morocco.xml", - "l10n_ma_wizard.xml", + "l10n_ma_wizard.xml", "l10n_ma_tax.xml", "l10n_ma_journal.xml", - + ], "demo_xml" : [], "active": False, "installable": True, "certificate" : "00599614652359069981", + 'images': ['images/config_chart_l10n_ma.jpeg','images/l10n_ma_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py index 0ecfa210cc7..8368be8e3a3 100644 --- a/addons/l10n_mx/__openerp__.py +++ b/addons/l10n_mx/__openerp__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # @@ -24,7 +24,10 @@ "version" : "1.0", "author" : "RelTek Mexico", "category" : "Localisation/Account Charts", - "description": "This is the module to manage the accounting chart for Mexico in Open ERP.", + "description": """ + This is the module to manage the accounting chart for Mexico in OpenERP. + ======================================================================== + """, "depends" : ["account", "base_vat", "account_chart"], "demo_xml" : [], "update_xml" : ['account_tax_code.xml',"account_chart.xml", @@ -32,6 +35,7 @@ "active": False, "installable": True, "certificate" : "00858539161332598061", + 'images': ['images/config_chart_l10n_mx.jpeg','images/l10n_mx_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 1da4a23b45826dae2b02e88f67e7c4ba1bc7e9e4 Mon Sep 17 00:00:00 2001 From: vro Date: Tue, 15 Mar 2011 18:23:47 +0530 Subject: [PATCH 036/121] [ADD]: Images: l10n_nl, l10n_pl, l10n_ro, l10n_th, l10n_uk, l10n_ve bzr revid: vro@tinyerp.com-20110315125347-zjj2m262tvk8g5k5 --- addons/l10n_nl/__openerp__.py | 14 +++++++++----- addons/l10n_pl/__openerp__.py | 10 ++++++---- addons/l10n_ro/__openerp__.py | 8 ++++++-- addons/l10n_th/__openerp__.py | 4 +++- addons/l10n_uk/__openerp__.py | 6 +++++- addons/l10n_ve/__openerp__.py | 11 +++++++---- 6 files changed, 36 insertions(+), 17 deletions(-) diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py index 5e61b7fd46e..5ada221dc93 100644 --- a/addons/l10n_nl/__openerp__.py +++ b/addons/l10n_nl/__openerp__.py @@ -90,18 +90,21 @@ "version" : "1.5", "category": "Localisation/Account Charts", "description": """ -Read changelog in file __terp__.py for version information. + This is the module to manage the accounting chart for Netherlands in OpenERP. + ============================================================================= + +Read changelog in file __openerp__.py for version information. Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor Nederlandse bedrijven te installeren in OpenERP versie 5. De BTW rekeningen zijn waar nodig gekoppeld om de juiste rapportage te genereren, denk b.v. aan intracommunautaire verwervingen waarbij u 19% BTW moet opvoeren, maar tegelijkertijd ook 19% als voorheffing weer mag aftrekken. - + Na installatie van deze module word de configuratie wizard voor "Accounting" aangeroepen. * U krijgt een lijst met grootboektemplates aangeboden waarin zich ook het Nederlandse grootboekschema bevind. - + * Als de configuratie wizard start, wordt u gevraagd om de naam van uw bedrijf in te voeren, welke grootboekschema te installeren, uit hoeveel cijfers een grootboekrekening mag bestaan, het rekeningnummer van uw bank en de currency om Journalen te creeren. - + Let op!! -> De template van het Nederlandse rekeningschema is opgebouwd uit 4 cijfers. Dit is het minimale aantal welk u moet invullen, u mag het aantal verhogen. De extra cijfers worden dan achter het rekeningnummer aangevult met "nullen" - + * Dit is dezelfe configuratie wizard welke aangeroepen kan worden via Financial Management/Configuration/Financial Accounting/Financial Accounts/Generate Chart of Accounts from a Chart Template. """, @@ -121,6 +124,7 @@ Dit is een basismodule om een uitgebreid grootboek- en BTW schema voor Nederland "installable": True, 'certificate': '00976041422960053277', + 'images': ['images/config_chart_l10n_nl.jpeg','images/l10n_nl_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py index 3a6b995749b..e410fd48cd8 100644 --- a/addons/l10n_pl/__openerp__.py +++ b/addons/l10n_pl/__openerp__.py @@ -1,8 +1,8 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution -# Copyright (C) 2009 Grzegorz Grzelak grzegorz.grzelak@cirrus.pl +# OpenERP, Open Source Management Solution +# Copyright (C) 2009 Grzegorz Grzelak grzegorz.grzelak@cirrus.pl # All Rights Reserved # $Id$ # @@ -27,8 +27,9 @@ "website": "http://www.cirrus.pl", "category" : "Localisation/Account Charts", "description": """ - This is the module to manage the accounting chart and taxes for Poland in Open ERP. - + This is the module to manage the accounting chart and taxes for Poland in OpenERP. + ================================================================================== + To jest moduł do tworzenia wzorcowego planu kont i podstawowych ustawień do podatków VAT 0%, 7% i 22%. Moduł ustawia też konta do kupna i sprzedaży towarów zakładając, że wszystkie towary są w obrocie hurtowym. @@ -40,6 +41,7 @@ "active": False, "installable": True, "certificate" : "00885794372803776829", + 'images': ['images/config_chart_l10n_pl.jpeg','images/l10n_pl_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py index 187743c3205..f9f765f2aa3 100644 --- a/addons/l10n_ro/__openerp__.py +++ b/addons/l10n_ro/__openerp__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2009 (). All Rights Reserved # $Id$ # @@ -26,12 +26,16 @@ "website": "http://www.filsystem.ro", "category" : "Localisation/Account Charts", "depends" : ["account_chart", 'base_vat'], - "description": "This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in Open ERP.", + "description": """ + This is the module to manage the accounting chart, VAT structure and Registration Number for Romania in OpenERP. + ================================================================================================================ + """, "demo_xml" : [], "update_xml" : ['partner_view.xml','account_tax_code.xml','account_chart.xml','account_tax.xml','l10n_chart_ro_wizard.xml'], "active": False, "installable": True, "certificate" : "001308250150602948125", + 'images': ['images/config_chart_l10n_ro.jpeg','images/l10n_ro_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py index 80b6dc7e6ae..03f27a7ffb9 100644 --- a/addons/l10n_th/__openerp__.py +++ b/addons/l10n_th/__openerp__.py @@ -24,7 +24,8 @@ 'version': '1.0', 'category': 'Localisation/Account Charts', 'description': """ -Chart of accounts for Thailand. + Chart of Accounts for Thailand. + =============================== """, 'author': 'Almacom', 'website': 'http://almacom.co.th/', @@ -33,4 +34,5 @@ Chart of accounts for Thailand. 'update_xml': [ 'account_data.xml' ], 'installable': True, 'certificate' : '00722263103978957725', + 'images': ['images/config_chart_l10n_th.jpeg','images/l10n_th_chart.jpeg'], } diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py index e39f620e1f3..de5b6cbf981 100644 --- a/addons/l10n_uk/__openerp__.py +++ b/addons/l10n_uk/__openerp__.py @@ -61,7 +61,10 @@ 'name': 'United Kingdom - minimal', 'version': '1.1', 'category': 'Localisation/Account Charts', - 'description': """This is the base module to manage the accounting chart for United Kingdom in OpenERP.""", + 'description': """ + This is the base module to manage the accounting chart for United Kingdom in OpenERP. + ===================================================================================== + """, 'author': 'Seath Solutions Ltd', 'website': 'http://www.seathsolutions.com', 'depends': ['base_iban', 'base_vat', 'account_chart'], @@ -76,5 +79,6 @@ 'installable': True, 'active': False, 'certificate': '008956603329629', + 'images': ['images/config_chart_l10n_uk.jpeg','images/l10n_uk_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py index df642ebaf97..20aff8ce29a 100644 --- a/addons/l10n_ve/__openerp__.py +++ b/addons/l10n_ve/__openerp__.py @@ -1,11 +1,11 @@ # -*- encoding: utf-8 -*- ############################################################################## # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Tiny SPRL (). All Rights Reserved # $Id$ # -# OpenERP, Open Source Management Solution +# OpenERP, Open Source Management Solution # Copyright (C) 2004-2008 Netquatro, C.A. (). All Rights Reserved # $Id$ # This program is free software: you can redistribute it and/or modify @@ -27,9 +27,11 @@ "version" : "1.0", "author" : ['OpenERP SA', "Netquatro"], "category" : "Localisation/Account Charts", - "description": + "description": ''' -This is the module to manage the accounting chart for Venezuela in Open ERP. +This is the module to manage the accounting chart for Venezuela in OpenERP. +=========================================================================== + Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela. ''', "depends" : ["account", "base_vat", "account_chart"], @@ -39,6 +41,7 @@ Este módulo es para manejar un catálogo de cuentas ejemplo para Venezuela. "active": False, "installable": True, "certificate" : "00763145921185574557", + 'images': ['images/config_chart_l10n_ve.jpeg','images/l10n_ve_chart.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 2b9e24c407ba45ef17b1bd4a15d3b97e6d97ba3e Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Tue, 15 Mar 2011 18:30:40 +0530 Subject: [PATCH 037/121] [ADD]: Images of account_sequence, account_voucher, analytic_journal_billing_rate and analytic_user_function modules. bzr revid: rch@tinyerp.com-20110315130040-jp2ushf9ymps6fec --- addons/account/__openerp__.py | 2 +- addons/account_sequence/__openerp__.py | 1 + addons/account_voucher/__openerp__.py | 6 ++++-- addons/analytic_journal_billing_rate/__openerp__.py | 5 ++++- addons/analytic_user_function/__openerp__.py | 5 ++++- 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/addons/account/__openerp__.py b/addons/account/__openerp__.py index e9a5eef2557..8a496ddddb3 100644 --- a/addons/account/__openerp__.py +++ b/addons/account/__openerp__.py @@ -50,7 +50,7 @@ grouping is maintained through journal) for a particular financial year and for module named account_voucher. """, 'website': 'http://www.openerp.com', - 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg','images/supplier_voucher.jpeg'], + 'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'], 'init_xml': [], "depends" : ["product", "analytic", "process","board"], 'update_xml': [ diff --git a/addons/account_sequence/__openerp__.py b/addons/account_sequence/__openerp__.py index cc13869b1f2..355ea954dac 100644 --- a/addons/account_sequence/__openerp__.py +++ b/addons/account_sequence/__openerp__.py @@ -28,6 +28,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/internal_sequence_number.jpeg'], 'depends': ['account'], 'init_xml': [], 'update_xml': [ diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py index a9bca5d89ae..c1a00a0dd47 100644 --- a/addons/account_voucher/__openerp__.py +++ b/addons/account_voucher/__openerp__.py @@ -23,14 +23,16 @@ "name" : "Accounting Voucher Entries", "version" : "1.0", "author" : 'OpenERP SA', - "description": """Account Voucher module includes all the basic requirements of - Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc... + "description": """ + Account Voucher module includes all the basic requirements of Voucher Entries for Bank, Cash, Sales, Purchase, Expanse, Contra, etc. + ==================================================================================================================================== * Voucher Entry * Voucher Receipt * Cheque Register """, "category" : "Generic Modules/Accounting", "website" : "http://tinyerp.com", + "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"], "depends" : ["account"], "init_xml" : [], diff --git a/addons/analytic_journal_billing_rate/__openerp__.py b/addons/analytic_journal_billing_rate/__openerp__.py index b422240751c..53ddf583aa3 100644 --- a/addons/analytic_journal_billing_rate/__openerp__.py +++ b/addons/analytic_journal_billing_rate/__openerp__.py @@ -24,14 +24,17 @@ 'version': '1.0', 'category': 'Generic Modules/Others', 'description': """ + This module allows you to define what is the default invoicing rate for a specific journal on a given account. + ============================================================================================================== - This module allows you to define what is the default invoicing rate for a specific journal on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available. + This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available. Obviously if no data has been recorded for the current account, the default value is given as usual by the account data so that this module is perfectly compatible with older configurations. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/analytic_journal_billing_rate.jpeg'], 'depends': ['analytic_user_function', 'account', 'hr_timesheet_invoice'], 'init_xml': [], 'update_xml': ['analytic_journal_billing_rate_view.xml', 'security/ir.model.access.csv'], diff --git a/addons/analytic_user_function/__openerp__.py b/addons/analytic_user_function/__openerp__.py index 8f6af6f84b7..cd054c88f8b 100644 --- a/addons/analytic_user_function/__openerp__.py +++ b/addons/analytic_user_function/__openerp__.py @@ -25,14 +25,17 @@ 'version': '1.0', 'category': 'Generic Modules/Others', 'description': """ + This module allows you to define what is the default function of a specific user on a given account. + ==================================================================================================== - This module allows you to define what is the default function of a specific user on a given account. This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled... but the possibility to change these values is still available. + This is mostly used when a user encodes his timesheet: the values are retrieved and the fields are auto-filled. But the possibility to change these values is still available. Obviously if no data has been recorded for the current account, the default value is given as usual by the employee data so that this module is perfectly compatible with older configurations. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/analytic_user_function.jpeg'], 'depends': ['hr_timesheet_sheet'], 'init_xml': [], 'update_xml': ['analytic_user_function_view.xml', 'security/ir.model.access.csv'], From d4672f80ac983160e3673a66dbd0d2fa276cc4b2 Mon Sep 17 00:00:00 2001 From: vro Date: Wed, 16 Mar 2011 13:17:33 +0530 Subject: [PATCH 038/121] [ADD]: Images: lunch, mail_gateway, marketing, marketing_campaign bzr revid: vro@tinyerp.com-20110316074733-rlpnvdspeguh3fnc --- addons/lunch/__openerp__.py | 7 +++++-- addons/mail_gateway/__openerp__.py | 10 +++++++--- addons/marketing/__openerp__.py | 8 +++++++- addons/marketing_campaign/__openerp__.py | 11 +++++++---- 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py index 119431ef3b8..e5317cd8a94 100644 --- a/addons/lunch/__openerp__.py +++ b/addons/lunch/__openerp__.py @@ -23,8 +23,10 @@ "name": "Lunch Module", "author": "OpenERP SA", "Description": """ - The lunch module is for keeping record of the order placed and payment of the orders. - The products are defined under categories and the payment records are maintained user wise + The lunch module is for keeping a record of the order placed and payment of the orders. + ======================================================================================= + + The products are defined under categories and the payment records are maintained user-wise. Every user has a cashbox which keeps track of the amount paid for a particular order. """, @@ -52,6 +54,7 @@ "test": ['test/test_lunch.yml', 'test/lunch_report.yml'], "installable": True, "certificate" : "001292377792581874189", + 'images': ['images/cash_moves.jpeg','images/lunch_orders.jpeg','images/products.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/mail_gateway/__openerp__.py b/addons/mail_gateway/__openerp__.py index e91257fd148..b950e9c1090 100644 --- a/addons/mail_gateway/__openerp__.py +++ b/addons/mail_gateway/__openerp__.py @@ -23,9 +23,12 @@ 'name': 'Email Gateway System', 'version': '1.0', 'category': 'Generic Modules/Mail Service', - 'description': """The generic email gateway system allows to send and receive emails - * History for Emails - * Easy Integration with any Module""", + 'description': """ + The generic email gateway system allows to send and receive emails. + =================================================================== + + * History of emails + * Easy integration with any module""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', 'depends': ['base'], @@ -40,5 +43,6 @@ 'installable': True, 'active': False, 'certificate': '001056784984222247309', + 'images': ['images/customer_history.jpeg','images/messages_form.jpeg','images/messages_list.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py index 6d7474dd4d7..501c3aa7dcb 100644 --- a/addons/marketing/__openerp__.py +++ b/addons/marketing/__openerp__.py @@ -26,7 +26,12 @@ "depends" : ["base"], "author" : "OpenERP SA", "category": 'Generic Modules/Marketing', - "description": "Menu for Marketing", + "description": """ + Menu for Marketing. + =================== + + Contains the installer for marketing-related modules. + """, 'website': 'http://www.openerp.com', 'init_xml': [], 'update_xml': [ @@ -38,5 +43,6 @@ 'installable': True, 'active': False, 'certificate' : '00598574977629228189', + 'images': ['images/config_marketing.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py index a18002525f4..9b54760a717 100644 --- a/addons/marketing_campaign/__openerp__.py +++ b/addons/marketing_campaign/__openerp__.py @@ -21,7 +21,7 @@ { - "name" : "marketing_campaign", + "name" : "Marketing Campaign", "version" : "1.1", "depends" : ["marketing", "document", @@ -31,15 +31,17 @@ "author" : "OpenERP SA", "category": 'Generic Modules/Marketing', "description": """ -This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads). + This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads). + ========================================================================================================================================= + The campaigns are dynamic and multi-channels. The process is as follows: * Design marketing campaigns like workflows, including email templates to send, reports to print and send by email, custom actions, etc. * Define input segments that will select the items that should enter the campaign (e.g leads from certain countries, etc.) * Run you campaign in simulation mode to test it real-time or accelerated, and fine-tune it * You may also start the real campaign in manual mode, where each action requires manual validation - * Finally launch your campaign live, and watch the statistics as the campaign does everything fully automatically. + * Finally launch your campaign live, and watch the statistics as the campaign does everything fully automatically. While the campaign runs you can of course continue to fine-tune the parameters, input segments, workflow, etc. - + Note: If you need demo data, you can install the marketing_campaign_crm_demo module, but this will also install the CRM application as it depends on CRM Leads. """, 'website': 'http://www.openerp.com', @@ -58,5 +60,6 @@ This module provides leads automation through marketing campaigns (campaigns can 'installable': True, 'active': False, 'certificate' : '00421723279617928365', + 'images': ['images/campaigns.jpeg','images/email_account.jpeg','images/email_templates.jpeg','images/segments.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 9e55914f418d41bbecf9bd09ef1b2dfe7bf76e33 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Wed, 16 Mar 2011 14:08:00 +0530 Subject: [PATCH 039/121] [ADD]: Images of sale and sale_analytic_plans modules. bzr revid: rch@tinyerp.com-20110316083800-yvp8phowods4udlh --- addons/sale/__openerp__.py | 53 +++++++++++++++-------- addons/sale_analytic_plans/__openerp__.py | 1 + 2 files changed, 36 insertions(+), 18 deletions(-) diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index bf7d238790a..de43d4ba9ae 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -25,28 +25,45 @@ 'category': 'Generic Modules/Sales & Purchases', 'description': """ The base module to manage quotations and sales orders. + ====================================================== - * Workflow with validation steps: - - Quotation -> Sales order -> Invoice - * Invoicing methods: - - Invoice on order (before or after shipping) - - Invoice on delivery - - Invoice on timesheets - - Advance invoice - * Partners preferences (shipping, invoicing, incoterm, ...) - * Products stocks and prices - * Delivery methods: - - all at once, multi-parcel - - delivery costs - * Dashboard for salesman that includes: - * Your open quotations - * Top 10 sales of the month - * Cases statistics - * Graph of sales by product - * Graph of cases of the month + Workflow with validation steps: + ------------------------------- + * Quotation -> Sales order -> Invoice + + Invoicing methods: + ------------------ + * Invoice on order (before or after shipping) + * Invoice on delivery + * Invoice on timesheets + * Advance invoice + + Partners preferences: + --------------------- + * shipping + * invoicing + * incoterm + + Products stocks and prices + -------------------------- + + Delivery methods: + ----------------- + * all at once + * multi-parcel + * delivery costs + + Dashboard for Sales Manager that includes: + ------------------------------------- + * Quotations + * Sales by Month + * Graph of Sales by Salesman in last 90 days + * Graph of Sales per Customer in last 90 days + * Graph of Sales by Product's Category in last 90 days """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/deliveries_to_invoice.jpeg','images/sale_dashboard.jpeg','images/Sale_order_line_to_invoice.jpeg','images/sale_order.jpeg','images/sales_analysis.jpeg'], 'depends': ['stock', 'procurement', 'board'], 'init_xml': [], 'update_xml': [ diff --git a/addons/sale_analytic_plans/__openerp__.py b/addons/sale_analytic_plans/__openerp__.py index b4e25d65da3..e5559fb6608 100644 --- a/addons/sale_analytic_plans/__openerp__.py +++ b/addons/sale_analytic_plans/__openerp__.py @@ -28,6 +28,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/sale_order_analytic_account.jpeg', 'images/sales_order_line.jpeg'], 'depends': ['sale', 'account_analytic_plans'], 'init_xml': [], 'update_xml': ['sale_analytic_plans_view.xml'], From 8080d02b1de013ca87df3dca97d015afe03a783d Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Wed, 16 Mar 2011 14:50:24 +0530 Subject: [PATCH 040/121] [ADD]: Images of sale_crm, sale_journal, sale_layout, sale_margin and sale_mrp modules. bzr revid: rch@tinyerp.com-20110316092024-oos3hdegrc71bu66 --- addons/sale/__openerp__.py | 2 +- addons/sale_crm/__openerp__.py | 3 +++ addons/sale_journal/__openerp__.py | 6 ++++-- addons/sale_layout/__openerp__.py | 2 ++ addons/sale_margin/__openerp__.py | 7 ++++--- addons/sale_mrp/__openerp__.py | 9 ++++++--- 6 files changed, 20 insertions(+), 9 deletions(-) diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py index de43d4ba9ae..7c92ff1e528 100644 --- a/addons/sale/__openerp__.py +++ b/addons/sale/__openerp__.py @@ -54,7 +54,7 @@ * delivery costs Dashboard for Sales Manager that includes: - ------------------------------------- + ------------------------------------------ * Quotations * Sales by Month * Graph of Sales by Salesman in last 90 days diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py index 87f2cb774b1..89aa39d163c 100644 --- a/addons/sale_crm/__openerp__.py +++ b/addons/sale_crm/__openerp__.py @@ -25,6 +25,8 @@ 'category': 'Generic Modules/Sales & Purchases', 'description': """ This module adds a shortcut on one or several opportunity cases in the CRM. +=========================================================================== + This shortcut allows you to generate a sales order based on the selected case. If different cases are open (a list), it generates one sale order by case. @@ -35,6 +37,7 @@ crm modules. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/crm_statistics_dashboard.jpeg', 'images/opportunity_to_quote.jpeg'], 'depends': ['sale', 'crm'], 'init_xml': [], 'update_xml': ['wizard/crm_make_sale_view.xml', diff --git a/addons/sale_journal/__openerp__.py b/addons/sale_journal/__openerp__.py index 54a3f7afd95..bdfd38c3dbe 100644 --- a/addons/sale_journal/__openerp__.py +++ b/addons/sale_journal/__openerp__.py @@ -24,8 +24,9 @@ 'version': '1.0', 'category': 'Generic Modules/Sales & Purchases', 'description': """ - The sales journal modules allows you to categorise your - sales and deliveries (picking lists) between different journals. + The sales journal modules allows you to categorise your sales and deliveries (picking lists) between different journals. + ======================================================================================================================== + This module is very helpful for bigger companies that works by departments. @@ -48,6 +49,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/invoice_type.jpeg'], 'depends': ['sale'], 'init_xml': ['sale_journal_data.xml'], 'update_xml': [ diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py index 94530219c38..7ccf03af4d1 100644 --- a/addons/sale_layout/__openerp__.py +++ b/addons/sale_layout/__openerp__.py @@ -21,10 +21,12 @@ { "name" : "Sale Order Layout", "version" : "1.0", + "images" : ["images/sale_layout.jpeg"], "depends" : ["sale", "account_invoice_layout"], "author" : "OpenERP SA", "description": """ This module provides features to improve the layout of the Sales Order. + ======================================================================= It gives you the possibility to * order all the lines of a sales order diff --git a/addons/sale_margin/__openerp__.py b/addons/sale_margin/__openerp__.py index af151eb1adc..2158f99fc26 100644 --- a/addons/sale_margin/__openerp__.py +++ b/addons/sale_margin/__openerp__.py @@ -1,5 +1,5 @@ ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -14,7 +14,7 @@ # 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 . +# along with this program. If not, see . # ############################################################################## @@ -22,11 +22,12 @@ "name":"Margins in Sales Order", "version":"1.0", "category" : "Generic Modules/Sales & Purchases", - "description": """ + "description": """ This module adds the 'Margin' on sales order, which gives the profitability by calculating the difference between the Unit Price and Cost Price """, "author":"OpenERP SA", + "images":["images/sale_margin.jpeg"], "depends":["sale"], "demo_xml":[], 'test': ['test/sale_margin.yml'], diff --git a/addons/sale_mrp/__openerp__.py b/addons/sale_mrp/__openerp__.py index ea6bafae1b2..594255412fd 100644 --- a/addons/sale_mrp/__openerp__.py +++ b/addons/sale_mrp/__openerp__.py @@ -25,13 +25,16 @@ 'version': '1.0', 'category': 'Generic Modules/Sales & MRP', 'description': """ - This module provides facility to the user to install mrp and sales modules - at a time. It is basically used when we want to keep track of production + This module provides facility to the user to install mrp and sales modulesat a time. + ==================================================================================== + + It is basically used when we want to keep track of production orders generated from sales order. - It adds sales name and sales Reference on production order + It adds sales name and sales Reference on production order. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/SO_to_MO.jpeg'], 'depends': ['mrp', 'sale'], 'init_xml': [], 'update_xml': [ From 8af941a41355960940385d10d27ac95b466c2cab Mon Sep 17 00:00:00 2001 From: vro Date: Wed, 16 Mar 2011 15:16:20 +0530 Subject: [PATCH 041/121] [ADD]: Images: marketing_campaign_crm_demo, membership, multi_company, pad bzr revid: vro@tinyerp.com-20110316094620-lstx5v9nyooopo10 --- addons/marketing_campaign_crm_demo/__openerp__.py | 8 ++++++-- addons/membership/__openerp__.py | 5 ++++- addons/multi_company/__openerp__.py | 9 ++++++--- addons/pad/__openerp__.py | 9 ++++++--- 4 files changed, 22 insertions(+), 9 deletions(-) diff --git a/addons/marketing_campaign_crm_demo/__openerp__.py b/addons/marketing_campaign_crm_demo/__openerp__.py index de103129023..f154949eef1 100644 --- a/addons/marketing_campaign_crm_demo/__openerp__.py +++ b/addons/marketing_campaign_crm_demo/__openerp__.py @@ -21,14 +21,17 @@ { - "name" : "marketing_campaign_crm_demo", + "name" : "Demo data for Marketing Campaign", "version" : "1.0", "depends" : ["marketing_campaign", "crm", ], "author" : "OpenERP SA", "category": 'Generic Modules/Marketing', - "description": """Demo data for the module marketing_campaign.""", + "description": """ + Demo data for the module marketing_campaign. + ============================================ + """, 'website': 'http://www.openerp.com', 'init_xml': [], 'update_xml': [], @@ -38,5 +41,6 @@ 'installable': True, 'active': False, 'certificate' : '001005497972871352957', + 'images': ['images/campaigns.jpeg','images/email_templates.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py index 2a6ce2b7eb6..66a1bd75fbb 100644 --- a/addons/membership/__openerp__.py +++ b/addons/membership/__openerp__.py @@ -26,9 +26,11 @@ 'category': 'Generic Modules/Association', 'description': """ This module allows you to manage all operations for managing memberships. +========================================================================= + It supports different kind of members: * Free member -* Associated member (ex: a group subscribe for a membership for all +* Associated member (eg.: a group subscribes to a membership for all subsidiaries) * Paid members, * Special member prices, ... @@ -51,5 +53,6 @@ invoice and send propositions for membership renewal. 'installable': True, 'active': False, 'certificate': '0042907796381', + 'images': ['images/members.jpeg','images/membership_list.jpeg', 'images/membership_products.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/multi_company/__openerp__.py b/addons/multi_company/__openerp__.py index 1e89b7d5d1a..d0b2ba8540e 100644 --- a/addons/multi_company/__openerp__.py +++ b/addons/multi_company/__openerp__.py @@ -21,12 +21,14 @@ { - 'name': 'Multi Company', + 'name': 'Multi-Company', 'version': '1.0', 'category': 'Custom', 'description': """ - Multicompany module is for managing a multicompany environment. - This module is the base module for other multicompany modules. + This module is for managing a multicompany environment. + ======================================================= + + This module is the base module for other multi-company modules. """, 'author': 'OpenERP SA,SYLEAM', 'website': 'http://www.openerp.com/', @@ -45,5 +47,6 @@ 'installable': True, 'active': False, 'certificate' : '001115526094673097933', + 'images': ['images/companies.jpeg','images/default_company_per_object_form.jpeg', 'images/default_company_per_object_list.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 9ed790ceedc..ac8f73c8b02 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -4,9 +4,11 @@ 'version': '1.0.3', 'category': 'Generic Modules/Others', 'description': """ -Adds enhanced support for (Ether)Pad attachments in the web client, lets the -company customize which Pad installation should be used to link to new pads -(by default, pad.openerp.com) +Adds enhanced support for (Ether)Pad attachments in the web client. +=================================================================== + +Lets the company customize which Pad installation should be used to link to new pads +(by default, http://ietherpad.com/). """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', @@ -18,4 +20,5 @@ company customize which Pad installation should be used to link to new pads 'active': False, 'web': True, 'certificate' : '001183545978470526509', + 'images': ['images/pad_link_companies.jpeg'], } From 2d0cae3191e2b9736505f933e317f75d4fe540b4 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Wed, 16 Mar 2011 15:48:05 +0530 Subject: [PATCH 042/121] [ADD]: Images of point_of_sale, sale_order_dates and wiki_sale_faq modules. bzr revid: rch@tinyerp.com-20110316101805-68sauycachq7eot5 --- addons/point_of_sale/__openerp__.py | 15 ++++++++------- addons/sale_order_dates/__openerp__.py | 1 + addons/wiki_sale_faq/__openerp__.py | 3 ++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py index c46d2f2b631..c1943ec9a76 100644 --- a/addons/point_of_sale/__openerp__.py +++ b/addons/point_of_sale/__openerp__.py @@ -26,15 +26,16 @@ 'category': 'Generic Modules/Sales & Purchases', 'description': """ Main features : - - Fast encoding of the sale. - - Allow to choose one payment mode (the quick way) or to split the payment between several payment mode. - - Computation of the amount of money to return. - - Create and confirm picking list automatically. - - Allow the user to create invoice automatically. - - Allow to refund former sales. - +=============== + * Fast encoding of the sale. + * Allow to choose one payment mode (the quick way) or to split the payment between several payment mode. + * Computation of the amount of money to return. + * Create and confirm picking list automatically. + * Allow the user to create invoice automatically. + * Allow to refund former sales. """, 'author': 'OpenERP SA', + 'images': ['images/cash_registers.jpeg', 'images/pos_analysis.jpeg','images/register_analysis.jpeg','images/sale_order_pos.jpeg'], 'depends': ['sale', 'delivery'], 'init_xml': [], diff --git a/addons/sale_order_dates/__openerp__.py b/addons/sale_order_dates/__openerp__.py index 2628879c438..ce50b24842e 100644 --- a/addons/sale_order_dates/__openerp__.py +++ b/addons/sale_order_dates/__openerp__.py @@ -29,6 +29,7 @@ Add commitment, requested and effective dates on the sales order. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ["images/sale_order_dates.jpeg"], 'depends': ["sale"], 'init_xml': [ ], diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py index 6e1242c1ac4..7c47e61d9e1 100644 --- a/addons/wiki_sale_faq/__openerp__.py +++ b/addons/wiki_sale_faq/__openerp__.py @@ -27,6 +27,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', + 'images': ['images/sale_document.jpeg','images/wiki_pages.jpeg'], 'depends': ['wiki_faq','document','crm'], 'init_xml': [ 'wiki_sale_faq_data.xml' @@ -34,7 +35,7 @@ 'update_xml': [ 'wiki_sale_faq_view.xml' ], - 'demo_xml': [ + 'demo_xml': [ ], 'installable': True, 'active': False, From d80215ed61d6d6a2ef531331da37682313b2747c Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Wed, 16 Mar 2011 15:52:56 +0530 Subject: [PATCH 043/121] [FIX] point_of_sale: point of sale without partner lp bug: https://launchpad.net/bugs/735403 fixed bzr revid: ara@tinyerp.com-20110316102256-e1yks7rziiv1xu8x --- addons/point_of_sale/wizard/pos_payment.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py index 8e60acdcae0..3d5fe6b0578 100644 --- a/addons/point_of_sale/wizard/pos_payment.py +++ b/addons/point_of_sale/wizard/pos_payment.py @@ -150,10 +150,7 @@ class pos_make_payment(osv.osv_memory): amount = order.amount_total - order.amount_paid data = self.read(cr, uid, ids, context=context)[0] for m2o_field in ['product_id','pricelist_id','partner_id']: - data[m2o_field] = data[m2o_field][0] - partner = obj_partner.browse(cr, uid, data['partner_id'], context=context) - if not partner.address: - raise osv.except_osv(_('Error!'),_("Customer doesn't have an address to make the invoice")) + data[m2o_field] = data.get(m2o_field, False) and data[m2o_field][0] or False if data['is_acc']: amount = self.pool.get('product.product').browse(cr, uid, data['product_id'], context=context).list_price @@ -163,6 +160,9 @@ class pos_make_payment(osv.osv_memory): if order_obj.test_paid(cr, uid, [active_id]): if data['partner_id'] and data['invoice_wanted']: + partner = obj_partner.browse(cr, uid, data['partner_id'], context=context) + if not partner.address: + raise osv.except_osv(_('Error!'),_("Customer doesn't have an address to make the invoice...")) order_obj.action_invoice(cr, uid, [active_id], context=context) order_obj.create_picking(cr, uid, [active_id], context=context) if context.get('return', False): From bdbc6dff223ef69106fc0383ae14aea519df271b Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Wed, 16 Mar 2011 15:57:06 +0530 Subject: [PATCH 044/121] [FIX] point_of_sale: point of sale without partner bzr revid: ara@tinyerp.com-20110316102706-fvpstppoyl0n0yh4 --- addons/point_of_sale/wizard/pos_payment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/wizard/pos_payment.py b/addons/point_of_sale/wizard/pos_payment.py index 3d5fe6b0578..ea5bd2639d7 100644 --- a/addons/point_of_sale/wizard/pos_payment.py +++ b/addons/point_of_sale/wizard/pos_payment.py @@ -162,7 +162,7 @@ class pos_make_payment(osv.osv_memory): if data['partner_id'] and data['invoice_wanted']: partner = obj_partner.browse(cr, uid, data['partner_id'], context=context) if not partner.address: - raise osv.except_osv(_('Error!'),_("Customer doesn't have an address to make the invoice...")) + raise osv.except_osv(_('Error!'),_("Customer doesn't have an address to make the invoice")) order_obj.action_invoice(cr, uid, [active_id], context=context) order_obj.create_picking(cr, uid, [active_id], context=context) if context.get('return', False): From 1e72896023dec21fa0aa6d93f115f5e99126e77d Mon Sep 17 00:00:00 2001 From: vro Date: Wed, 16 Mar 2011 16:03:37 +0530 Subject: [PATCH 045/121] [ADD]: Images: process, procurement, product, product_expiry bzr revid: vro@tinyerp.com-20110316103337-lgah64dzm3000tw8 --- addons/process/__openerp__.py | 8 ++++---- addons/procurement/__openerp__.py | 2 ++ addons/product/__openerp__.py | 2 ++ addons/product_expiry/__openerp__.py | 13 +++++++++---- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/addons/process/__openerp__.py b/addons/process/__openerp__.py index 9fd4f6b3f73..b3c359d71cd 100644 --- a/addons/process/__openerp__.py +++ b/addons/process/__openerp__.py @@ -25,12 +25,11 @@ 'version': '1.0', 'category': 'Generic Modules/Base', 'description': """ - This module shows the basic processes involved - in the selected modules and in the sequence they - occur + This module shows the basic processes involved in the selected modules and in the sequence they occur. + ====================================================================================================== Note: This applies to the modules containing modulename_process_xml - for e.g product/process/product_process_xml + e.g product/process/product_process_xml """, 'author': 'OpenERP SA', @@ -45,5 +44,6 @@ 'installable': True, 'active': False, 'certificate': '0055447636669', + 'images': ['images/process_nodes.jpeg','images/process_transitions.jpeg', 'images/processes.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/procurement/__openerp__.py b/addons/procurement/__openerp__.py index d30128041f3..fdf9030ae0a 100644 --- a/addons/procurement/__openerp__.py +++ b/addons/procurement/__openerp__.py @@ -29,6 +29,7 @@ "depends" : ["base","process", "product", "stock"], "description": """ This is the module for computing Procurements. + ============================================== """, 'init_xml': [], 'update_xml': [ @@ -49,5 +50,6 @@ 'installable': True, 'active': False, 'certificate': '00954248826881074509', + 'images': ['images/compute_schedulers.jpeg','images/config_companies_sched.jpeg', 'images/minimum_stock_rules.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py index 712e17aebc3..e6d93deb921 100644 --- a/addons/product/__openerp__.py +++ b/addons/product/__openerp__.py @@ -30,6 +30,7 @@ "demo_xml" : ["product_demo.xml"], "description": """ This is the base module for managing products and pricelists in OpenERP. + ======================================================================== Products support variants, different pricing methods, suppliers information, make to stock/order, different unit of measures, @@ -62,5 +63,6 @@ 'installable': True, 'active': False, 'certificate': '0068861431437', + 'images': ['images/product_uom.jpeg','images/product_pricelists.jpeg','images/products_categories.jpeg', 'images/products_form.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py index 0a54ff00dae..a6655bdb9c1 100644 --- a/addons/product_expiry/__openerp__.py +++ b/addons/product_expiry/__openerp__.py @@ -1,5 +1,5 @@ ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (). # @@ -14,18 +14,22 @@ # 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 . +# along with this program. If not, see . # ############################################################################## { - "name" : "Products date of expiry", + "name" : "Products Expiry Date", "version" : "1.0", "author" : "OpenERP SA", "category" : "Enterprise Specific Modules/Food Industries", "depends" : ["stock"], "init_xml" : [], "demo_xml" : ["product_expiry_demo.xml"], - "description": '''Track different dates on products and production lots: + "description": ''' + Track different dates on products and production lots. + ====================================================== + +Following dates can be tracked: - end of life - best before date - removal date @@ -35,6 +39,7 @@ Used, for example, in food industries.''', "active": False, "installable": True, "certificate": "00421222123914960109", + 'images': ['images/production_lots_dates.jpeg','images/products_dates.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From be84b81f7529c83c737f8045503d9130b9cd0ff9 Mon Sep 17 00:00:00 2001 From: vro Date: Wed, 16 Mar 2011 16:25:02 +0530 Subject: [PATCH 046/121] [ADD]: Images: product_manufacturer, product_margin, product_visible_discount, profile_tools, share bzr revid: vro@tinyerp.com-20110316105502-g2433hgwkjppodsp --- addons/product_manufacturer/__openerp__.py | 6 +++++- addons/product_margin/__openerp__.py | 8 +++++--- addons/product_visible_discount/__openerp__.py | 3 +++ addons/profile_tools/__openerp__.py | 6 ++++-- addons/share/__openerp__.py | 8 +++++--- 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/addons/product_manufacturer/__openerp__.py b/addons/product_manufacturer/__openerp__.py index 3c620efb3e5..fc3fbf94539 100644 --- a/addons/product_manufacturer/__openerp__.py +++ b/addons/product_manufacturer/__openerp__.py @@ -25,7 +25,10 @@ "depends" : ["stock"], "init_xml" : [], "demo_xml" : [], - "description": "A module that add manufacturers and attributes on the product form", + "description": """ + A module that add manufacturers and attributes on the product form. + =================================================================== + """, "update_xml" : [ "security/ir.model.access.csv", "product_manufacturer_view.xml" @@ -33,5 +36,6 @@ "active": False, "installable": True, "certificate" : "00720153953662760781", + 'images': ['images/products_manufacturer.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/product_margin/__openerp__.py b/addons/product_margin/__openerp__.py index 9a9a3f1ff55..9968658d989 100644 --- a/addons/product_margin/__openerp__.py +++ b/addons/product_margin/__openerp__.py @@ -25,9 +25,10 @@ 'version': '1.0', 'category': 'Custom', 'description': """ -Adds a reporting menu in products that computes sales, purchases, margins -and other interesting indicators based on invoices. The wizard to launch -the report has several options to help you get the data you need. +Adds a reporting menu in products that computes sales, purchases, margins and other interesting indicators based on invoices. +============================================================================================================================= + +The wizard to launch the report has several options to help you get the data you need. """, 'author': 'OpenERP SA', 'depends': ['account'], @@ -40,5 +41,6 @@ the report has several options to help you get the data you need. 'installable': True, 'active': False, 'certificate': '0064392591773', + 'images': ['images/open_margins.jpeg','images/product_margins_form.jpeg', 'images/product_margins_list.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/product_visible_discount/__openerp__.py b/addons/product_visible_discount/__openerp__.py index 8e59bc395d7..f8bc8e83971 100644 --- a/addons/product_visible_discount/__openerp__.py +++ b/addons/product_visible_discount/__openerp__.py @@ -24,6 +24,8 @@ "category": "Generic Modules/Sales & Purchases", "description": """ This module lets you calculate discounts on Sale Order lines and Invoice lines base on the partner's pricelist. + =============================================================================================================== + To this end, a new check box named "Visible Discount" is added to the pricelist form. Example: For the product PC1 and the partner "Asustek": if listprice=450, and the price calculated using Asustek's pricelist is 225 @@ -36,6 +38,7 @@ "active": False, "installable": True, "certificate" : "001144718884654279901", + 'images': ['images/pricelists_visible_discount.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/profile_tools/__openerp__.py b/addons/profile_tools/__openerp__.py index 2e89465839a..af5dc17db61 100644 --- a/addons/profile_tools/__openerp__.py +++ b/addons/profile_tools/__openerp__.py @@ -26,8 +26,9 @@ "depends" : ["base"], "author" : "OpenERP SA", "category" : "Tools", - "description": """Installs tools for lunch,survey,subscription and audittrail - module + "description": """ + Installer for extra tools like lunch, survey, idea, share, etc. + =============================================================== """, 'website': 'http://www.openerp.com', 'init_xml': [], @@ -38,5 +39,6 @@ 'installable': True, 'active': False, 'certificate' : '00557100228403879621', + 'images': ['images/config_extra_tools.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 7a68936970d..f90d86312f8 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -27,16 +27,17 @@ "author" : "OpenERP SA", "category": 'Generic Modules', "description": """ + This module adds generic sharing tools to your current OpenERP database. + ======================================================================== - This module adds generic sharing tools to your current OpenERP database, - and specifically a 'share' button that is available in the Web client to + It specifically adds a 'share' button that is available in the Web client to share any kind of OpenERP data with colleagues, customers, friends, etc. The system will work by creating new users and groups on the fly, and by combining the appropriate access rights and ir.rules to ensure that the shared users only have access to the data that has been shared with them. - This is extremely useful for collaborative work, knowledge sharing, + This is extremely useful for collaborative work, knowledge sharing, synchronization with other companies, etc. """, @@ -51,6 +52,7 @@ 'installable': True, 'web': True, 'certificate' : '001301246528927038493', + 'images': ['images/share_wizard.jpeg','images/sharing_wizard_step1.jpeg', 'images/sharing_wizard_step2.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 9fb58f5d34e612f4bd3300db112b6c909d5e8426 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Wed, 16 Mar 2011 16:26:07 +0530 Subject: [PATCH 047/121] [ADD]: Images of project module. bzr revid: rch@tinyerp.com-20110316105607-qou589btxfblucdh --- addons/project/__openerp__.py | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index 3177744ea9c..2f8771449bf 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -26,12 +26,20 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Generic Modules/Projects & Services", + "images": ["images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"], "depends": ["product", "analytic", "board"], - "description": """Project management module tracks multi-level projects, tasks, -work done on tasks, eso. It is able to render planning, order tasks, eso. - Dashboard for project members that includes: + "description": """ +Project management module tracks multi-level projects, tasks, work done on tasks, eso. +====================================================================================== + +It is able to render planning, order tasks, eso. + +Dashboard for project members that includes: +-------------------------------------------- * List of my open tasks - * Members list of project + * List of my delegated tasks + * Graph of My Projects: Planned vs Total Hours + * Graph of My Remaining Hours by Project """, "init_xml": [], "update_xml": [ From 2ec3687a540386269f16dec85cea6ff204094e3d Mon Sep 17 00:00:00 2001 From: vro Date: Wed, 16 Mar 2011 16:49:30 +0530 Subject: [PATCH 048/121] [ADD]: Images: subscription, survey, thunderbird, warning bzr revid: vro@tinyerp.com-20110316111930-ft1yispclx6dvuqp --- addons/subscription/__openerp__.py | 6 +++++- addons/survey/__openerp__.py | 8 ++++++-- addons/thunderbird/__openerp__.py | 14 ++++++++------ addons/warning/__openerp__.py | 11 +++++++++-- 4 files changed, 28 insertions(+), 11 deletions(-) diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py index 88b567c2b5e..0ef23f8149c 100644 --- a/addons/subscription/__openerp__.py +++ b/addons/subscription/__openerp__.py @@ -24,7 +24,10 @@ 'name': 'Subscription and recurring operations', 'version': '1.0', 'category': 'Tools', - 'description': """Module allows to create new documents and add subscription on that document.""", + 'description': """ + This module allows to create new documents and add subscription on that document. + ================================================================================= + """, 'author': 'OpenERP SA', 'depends': ['base_tools'], 'init_xml': [], @@ -33,5 +36,6 @@ 'installable': True, 'active': False, 'certificate': '0029454782573', + 'images': ['images/subscription_document_fields.jpeg','images/subscriptions.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py index ab32749b099..b809a640f88 100644 --- a/addons/survey/__openerp__.py +++ b/addons/survey/__openerp__.py @@ -24,9 +24,12 @@ 'version': '1.0', 'category': 'Tools', 'description': """ - This module is used for surveying. It depends on the answers or reviews of some questions by different users. + This module is used for surveying. + ================================== + + It depends on the answers or reviews of some questions by different users. A survey may have multiple pages. Each page may contain multiple questions and each question may have multiple answers. - Different users may give different answers of question and according to that survey is done. + Different users may give different answers of question and according to that survey is done. Partners are also sent mails with user name and password for the invitation of the survey """, 'author': 'OpenERP SA', @@ -51,5 +54,6 @@ 'installable': True, 'active': False, 'certificate' : '001131639736864143245', + 'images': ['images/survey_answers.jpeg','images/survey_pages.jpeg','images/surveys.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py index 2500ea8307a..f5836f5cfa9 100644 --- a/addons/thunderbird/__openerp__.py +++ b/addons/thunderbird/__openerp__.py @@ -27,13 +27,14 @@ "depends" : ["base","mail_gateway"], "category" : "Generic Modules/Thunderbird interface", "description": """ - This module is required for the thuderbird plug-in to work - properly. - The Plugin allows you archive email and its attachments to the selected + This module is required for the Thuderbird Plug-in to work properly. + ==================================================================== + + The plugin allows you archive email and its attachments to the selected OpenERP objects. You can select a partner, a task, a project, an analytical - account,or any other object and attach selected mail as eml file in - attachment of selected record. You can create Documents for crm Lead, - HR Applicant and project issue from selected mails. + account, or any other object and attach the selected mail as a .eml file in + the attachment of a selected record. You can create documents for CRM Lead, + HR Applicant and Project Issue from selected mails. """, "init_xml" : [], @@ -43,4 +44,5 @@ "active": False, "installable": True, "certificate" : "00899858104035139949", + 'images': ['images/config_thunderbird.jpeg','images/config_thunderbird_plugin.jpeg','images/thunderbird_document.jpeg'], } diff --git a/addons/warning/__openerp__.py b/addons/warning/__openerp__.py index af10eb968a5..4220a3564c8 100644 --- a/addons/warning/__openerp__.py +++ b/addons/warning/__openerp__.py @@ -21,10 +21,16 @@ { - 'name': 'Module for Warnings form onchange Event', + 'name': 'Display Warning Messages', 'version': '1.0', 'category': 'Tools', - 'description': """Module for Warnings form onchange Event.""", + 'description': """ + Module to trigger warnings in OpenERP objects. + ============================================== + + Warning messages can be displayed for objects like sale order, purchase order, + picking and invoice. The message is triggered by the form's onchange event. + """, 'author': 'OpenERP SA', 'depends': ['base', 'sale', 'purchase'], 'update_xml': ['warning_view.xml'], @@ -32,5 +38,6 @@ 'installable': True, 'active': False, 'certificate': '0080334018749', + 'images': ['images/customers_warnings.jpeg','images/sale_order_warning.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From e012af7da95f756f276801b71b61f2eae8c9411e Mon Sep 17 00:00:00 2001 From: Mustufa Rangwala Date: Wed, 16 Mar 2011 16:55:22 +0530 Subject: [PATCH 049/121] [FIX] Account: account - sequence_id in journal must be unique lp bug: https://launchpad.net/bugs/734949 fixed bzr revid: mra@mra-laptop-20110316112522-nr1q01gm314vos0b --- addons/account/account.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/account/account.py b/addons/account/account.py index 999bd01d90c..2bdb62b44c0 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -641,6 +641,7 @@ class account_journal(osv.osv): default = default.copy() default['code'] = (journal['code'] or '') + '(copy)' default['name'] = (journal['name'] or '') + '(copy)' + default['sequence_id'] = False return super(account_journal, self).copy(cr, uid, id, default, context=context) def write(self, cr, uid, ids, vals, context=None): From e966e4c0773f0d5096dfa7061a31acc9826d1cc4 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Wed, 16 Mar 2011 17:02:27 +0530 Subject: [PATCH 050/121] [ADD]: Images of project_gtd, project_issue, project_issue_sheet and project_long_term modules. bzr revid: rch@tinyerp.com-20110316113227-ga6t3bfkjytervm4 --- addons/project_gtd/__openerp__.py | 7 +++++-- addons/project_issue/__openerp__.py | 1 + addons/project_issue_sheet/__openerp__.py | 1 + addons/project_long_term/__openerp__.py | 19 +++++++++++-------- 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/addons/project_gtd/__openerp__.py b/addons/project_gtd/__openerp__.py index 61ae07d6a89..29df5db8837 100644 --- a/addons/project_gtd/__openerp__.py +++ b/addons/project_gtd/__openerp__.py @@ -25,8 +25,10 @@ 'version': '1.0', 'category': 'Generic Modules/Projects & Services', 'description': """ -This module implements all concepts defined by the Getting Things Done -methodology. This world-wide used methodology is used for personal +This module implements all concepts defined by the Getting Things Done methodology. +=================================================================================== + +This world-wide used methodology is used for personal time management improvement. Getting Things Done (commonly abbreviated as GTD) is an action management @@ -38,6 +40,7 @@ remembering everything that needs to be done, and can concentrate on actually performing those tasks. """, 'author': 'OpenERP SA', + 'images': ['images/project_gtd.jpeg'], 'depends': ['project'], 'init_xml': [], 'update_xml': [ diff --git a/addons/project_issue/__openerp__.py b/addons/project_issue/__openerp__.py index 2e6b6294557..2e6c7dbaa71 100644 --- a/addons/project_issue/__openerp__.py +++ b/addons/project_issue/__openerp__.py @@ -29,6 +29,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/issue_analysis.jpeg','images/project_issue.jpeg'], 'depends': [ 'crm', 'project', diff --git a/addons/project_issue_sheet/__openerp__.py b/addons/project_issue_sheet/__openerp__.py index f1c595ad15e..cedc7ba1663 100644 --- a/addons/project_issue_sheet/__openerp__.py +++ b/addons/project_issue_sheet/__openerp__.py @@ -29,6 +29,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/project_issue_sheet_worklog.jpeg'], 'depends': [ 'project_issue', 'hr_timesheet_sheet', diff --git a/addons/project_long_term/__openerp__.py b/addons/project_long_term/__openerp__.py index 3a8b1a3fb9b..e32367c6207 100644 --- a/addons/project_long_term/__openerp__.py +++ b/addons/project_long_term/__openerp__.py @@ -25,17 +25,20 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Generic Modules/Projects & Services", + "images": ["images/project_phase_form.jpeg","images/project_phases.jpeg", "images/resources_allocation.jpeg"], "depends": ["resource", "project"], "description": """ Long Term Project management module that tracks planning, scheduling, resources allocation. -Features. - - Manage Big project. - - Define various Phases of Project. - - Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given. - If no project given then all the draft,open and pending state phases will be taken - - Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks - - Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date +=========================================================================================== +Features +-------- + * Manage Big project. + * Define various Phases of Project. + * Compute Phase Scheduling: Compute start date and end date of the phases which are in draft,open and pending state of the project given. + If no project given then all the draft,open and pending state phases will be taken. + * Compute Task Scheduling: This works same as the scheduler button on project.phase. It takes the project as argument and computes all the open,draft and pending tasks. + * Schedule Tasks: All the tasks which are in draft,pending and open state are scheduled with taking the phase's start date """, "init_xml": [], "demo_xml": ["project_long_term_demo.xml"], @@ -47,7 +50,7 @@ Features. 'test/project_schedule_consecutive_day.yml', 'test/project_schedule_without_wroking_hour.yml', 'test/schedule_phase_tasks.yml', - 'test/phase_constraint.yml', + 'test/phase_constraint.yml', 'test/test_schedule_tasks_case1.yml', ], "update_xml": [ From 967a9a9cdf88dbe2ae27c1aabaa74fe876f012d2 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Wed, 16 Mar 2011 18:26:20 +0530 Subject: [PATCH 051/121] [ADD]: Images of project_mailgate, project_messages, project_mrp and project_planning modules. bzr revid: rch@tinyerp.com-20110316125620-2oti5lnwck6190s0 --- addons/project_mailgate/__openerp__.py | 5 ++++- addons/project_messages/__openerp__.py | 3 +++ addons/project_mrp/__openerp__.py | 5 +++-- addons/project_planning/__openerp__.py | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py index 6221f781fa7..c6abf308929 100644 --- a/addons/project_mailgate/__openerp__.py +++ b/addons/project_mailgate/__openerp__.py @@ -26,8 +26,11 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Generic Modules/Projects & Services", + "images": ["images/project_mailgate_task.jpeg"], "depends": ["project", "mail_gateway"], - "description": """This module is an interface that synchronises mails with OpenERP Project Task. + "description": """ +This module is an interface that synchronises mails with OpenERP Project Task. +============================================================================== It allows creating tasks as soon as a new mail arrives in our configured mail server. Moreover, it keeps track of all further communications and task states. diff --git a/addons/project_messages/__openerp__.py b/addons/project_messages/__openerp__.py index 732322060c6..8282d6871c6 100644 --- a/addons/project_messages/__openerp__.py +++ b/addons/project_messages/__openerp__.py @@ -23,10 +23,13 @@ { "name": "In-Project Messaging System", "version": "1.0", + "images": ["images/project_message.jpeg"], "depends": ["project"], "author": "OpenERP SA", "description": """ This module provides the functionality to send messages within a project. + ========================================================================= + A user can send messages individually to other user. He can even broadcast it to all the users. """, diff --git a/addons/project_mrp/__openerp__.py b/addons/project_mrp/__openerp__.py index e99869e2591..09212e2636d 100644 --- a/addons/project_mrp/__openerp__.py +++ b/addons/project_mrp/__openerp__.py @@ -25,8 +25,8 @@ 'version': '1.0', 'category': 'Generic Modules/Projects & Services', 'description': """ -This module creates a link between procurement orders -containing "service" lines and project management tasks. +This module creates a link between procurement orders containing "service" lines and project management tasks. +============================================================================================================== When installed, this module will automatically create a new task for each procurement order line, when the corresponding product @@ -47,6 +47,7 @@ automatically created via sale orders. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/product.jpeg', 'images/task_from_SO.jpeg'], 'depends': ['project', 'procurement', 'sale', 'mrp_jit'], 'init_xml': [], 'update_xml': ['project_mrp_workflow.xml', 'process/project_mrp_process.xml', 'project_mrp_view.xml'], diff --git a/addons/project_planning/__openerp__.py b/addons/project_planning/__openerp__.py index 1815582e1bf..117033d7493 100644 --- a/addons/project_planning/__openerp__.py +++ b/addons/project_planning/__openerp__.py @@ -26,6 +26,7 @@ 'category': 'Generic Modules/Human Resources', 'description': """ This module helps you to manage your plannings. +=============================================== This module is based on the analytic accounting and is totally integrated with * the timesheets encoding @@ -38,6 +39,7 @@ At the end of the month, the planning manager can also check if the encoded time """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/planning_statistics.jpeg','images/project_planning.jpeg'], 'depends': [ 'project', 'hr_timesheet', From cac45480ce42fa893ce7d607726ad563f9eff017 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Wed, 16 Mar 2011 18:37:34 +0530 Subject: [PATCH 052/121] [FIX] account: Con not open account chart from Wizard If we passing fiscal year argument lp bug: https://launchpad.net/bugs/735990 fixed bzr revid: ara@tinyerp.com-20110316130734-oc7f2sjipfq8lq2a --- addons/account/wizard/account_chart.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py index e8f0e432d69..740a97cea8e 100644 --- a/addons/account/wizard/account_chart.py +++ b/addons/account/wizard/account_chart.py @@ -83,13 +83,16 @@ class account_chart(osv.osv_memory): result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_tree') id = result and result[1] or False result = act_obj.read(cr, uid, [id], context=context)[0] + fiscalyear = data.get('fiscalyear', False) and data['fiscalyear'][0] or False result['periods'] = [] if data['period_from'] and data['period_to']: - result['periods'] = period_obj.build_ctx_periods(cr, uid, data['period_from'], data['period_to']) - result['context'] = str({'fiscalyear': data['fiscalyear'], 'periods': result['periods'], \ + period_from = data.get('period_from', False) and data['period_from'][0] or False + period_to = data.get('period_to', False) and data['period_to'][0] or False + result['periods'] = period_obj.build_ctx_periods(cr, uid, period_from, period_to) + result['context'] = str({'fiscalyear': fiscalyear, 'periods': result['periods'], \ 'state': data['target_move']}) if data['fiscalyear']: - result['name'] += ':' + fy_obj.read(cr, uid, [data['fiscalyear']], context=context)[0]['code'] + result['name'] += ':' + fy_obj.read(cr, uid, [fiscalyear], context=context)[0]['code'] return result _defaults = { From 33c691e7ccc3046bfaefc492ef96c29237a4f715 Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Wed, 16 Mar 2011 18:52:22 +0530 Subject: [PATCH 053/121] [ADD]: Images of project_scrum and project_timesheet modules. bzr revid: rch@tinyerp.com-20110316132222-wzmfcn3cj1uwa6zq --- addons/project_scrum/__openerp__.py | 6 ++++-- addons/project_timesheet/__openerp__.py | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py index a4b4e453acb..230dbde07a3 100644 --- a/addons/project_scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -25,8 +25,9 @@ 'version': '1.0', 'category': 'Enterprise Specific Modules/Information Technology', 'description': """ - This module implements all concepts defined by the scrum project - management methodology for IT companies: + This module implements all concepts defined by the scrum project management methodology for IT companies. + ========================================================================================================= + * Project with sprints, product owner, scrum master * Sprints with reviews, daily meetings, feedbacks * Product backlog @@ -47,6 +48,7 @@ * http://controlchaos.com """, 'author': 'OpenERP SA', + 'images': ['images/product_backlogs.jpeg', 'images/project_sprints.jpeg', 'images/scrum_dashboard.jpeg', 'images/scrum_meetings.jpeg'], 'depends': ['project', 'process'], 'init_xml': [], 'update_xml': [ diff --git a/addons/project_timesheet/__openerp__.py b/addons/project_timesheet/__openerp__.py index e0defdb7e07..7798e5a4108 100644 --- a/addons/project_timesheet/__openerp__.py +++ b/addons/project_timesheet/__openerp__.py @@ -24,12 +24,16 @@ 'version': '1.0', 'category': 'Generic Modules/Human Resources', 'description': """ + Synchronization of project task work entries with timesheet entries. + ==================================================================== + This module lets you transfer the entries under tasks defined for Project Management to the Timesheet line entries for particular date and particular user with the effect of creating, editing and deleting either ways. """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/invoice_task_work.jpeg', 'images/my_timesheet.jpeg', 'images/working_hour.jpeg'], 'depends': ['project', 'hr_timesheet_sheet', 'hr_timesheet_invoice'], 'init_xml': ['project_timesheet_data.xml'], 'update_xml': ["security/ir.model.access.csv","process/project_timesheet_process.xml", "report/task_report_view.xml", "project_timesheet_view.xml"], From 46003bb7e10eb20664d22d0e78dcdaee4cf12942 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Wed, 16 Mar 2011 18:58:33 +0530 Subject: [PATCH 054/121] [FIX] account: Con not open account chart from Wizard If we passing fiscal year argument bzr revid: ara@tinyerp.com-20110316132833-momnoero73a9q7g4 --- addons/account/wizard/account_chart.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/account/wizard/account_chart.py b/addons/account/wizard/account_chart.py index 740a97cea8e..3bfdff40b57 100644 --- a/addons/account/wizard/account_chart.py +++ b/addons/account/wizard/account_chart.py @@ -30,12 +30,12 @@ class account_chart(osv.osv_memory): _columns = { 'fiscalyear': fields.many2one('account.fiscalyear', \ 'Fiscal year', \ - help = 'Keep empty for all open fiscal years'), + help='Keep empty for all open fiscal years'), 'period_from': fields.many2one('account.period', 'Start period'), 'period_to': fields.many2one('account.period', 'End period'), 'target_move': fields.selection([('posted', 'All Posted Entries'), ('all', 'All Entries'), - ], 'Target Moves', required = True), + ], 'Target Moves', required=True), } def onchange_fiscalyear(self, cr, uid, ids, fiscalyear_id=False, context=None): @@ -83,16 +83,16 @@ class account_chart(osv.osv_memory): result = mod_obj.get_object_reference(cr, uid, 'account', 'action_account_tree') id = result and result[1] or False result = act_obj.read(cr, uid, [id], context=context)[0] - fiscalyear = data.get('fiscalyear', False) and data['fiscalyear'][0] or False + fiscalyear_id = data.get('fiscalyear', False) and data['fiscalyear'][0] or False result['periods'] = [] if data['period_from'] and data['period_to']: period_from = data.get('period_from', False) and data['period_from'][0] or False period_to = data.get('period_to', False) and data['period_to'][0] or False result['periods'] = period_obj.build_ctx_periods(cr, uid, period_from, period_to) - result['context'] = str({'fiscalyear': fiscalyear, 'periods': result['periods'], \ + result['context'] = str({'fiscalyear': fiscalyear_id, 'periods': result['periods'], \ 'state': data['target_move']}) - if data['fiscalyear']: - result['name'] += ':' + fy_obj.read(cr, uid, [fiscalyear], context=context)[0]['code'] + if fiscalyear_id: + result['name'] += ':' + fy_obj.read(cr, uid, [fiscalyear_id], context=context)[0]['code'] return result _defaults = { From 6405f1660d4bf3207355d5192474ba6d229bad83 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Thu, 17 Mar 2011 15:08:22 +0530 Subject: [PATCH 055/121] [FIX] account_voucher:voucher currency-related issues lp bug: https://launchpad.net/bugs/726296 fixed bzr revid: ara@tinyerp.com-20110317093822-bqy4n8sm0qorx82n --- addons/account_voucher/account_voucher.py | 5 +++-- addons/account_voucher/account_voucher_view.xml | 2 +- addons/account_voucher/voucher_payment_receipt_view.xml | 6 +++--- addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py index fc4589fb3bb..c80bb9b3c62 100644 --- a/addons/account_voucher/account_voucher.py +++ b/addons/account_voucher/account_voucher.py @@ -191,7 +191,7 @@ class account_voucher(osv.osv): domain=[('type','=','dr')], context={'default_type':'dr'}, readonly=True, states={'draft':[('readonly',False)]}), 'period_id': fields.many2one('account.period', 'Period', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'narration':fields.text('Notes', readonly=True, states={'draft':[('readonly',False)]}), - 'currency_id':fields.many2one('res.currency', 'Currency', readonly=True, states={'draft':[('readonly',False)]}), + 'currency_id':fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}), # 'currency_id': fields.related('journal_id','currency', type='many2one', relation='res.currency', string='Currency', store=True, readonly=True, states={'draft':[('readonly',False)]}), 'company_id': fields.many2one('res.company', 'Company', required=True, readonly=True, states={'draft':[('readonly',False)]}), 'state':fields.selection( @@ -977,7 +977,8 @@ class account_bank_statement_line(osv.osv): def _check_amount(self, cr, uid, ids, context=None): for obj in self.browse(cr, uid, ids, context=context): if obj.voucher_id: - if not (abs(obj.amount) == obj.voucher_id.amount): + diff = abs(obj.amount) - obj.voucher_id.amount + if not self.pool.get('res.currency').is_zero(cr, uid, obj.voucher_id.currency_id, diff): return False return True diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml index 392ed7fa798..53ce950e7a2 100644 --- a/addons/account_voucher/account_voucher_view.xml +++ b/addons/account_voucher/account_voucher_view.xml @@ -69,7 +69,7 @@ - + diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml index b62cba19d65..c53cc91d324 100644 --- a/addons/account_voucher/voucher_payment_receipt_view.xml +++ b/addons/account_voucher/voucher_payment_receipt_view.xml @@ -135,7 +135,7 @@ - + @@ -214,7 +214,7 @@ - + @@ -355,7 +355,7 @@ - + diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 0921f0a5f8a..04a7e5a43e0 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -102,7 +102,7 @@ - + @@ -230,7 +230,7 @@ - + From 1d44b3740585729b5b7752bb77f2aa51ee3e613f Mon Sep 17 00:00:00 2001 From: vro Date: Thu, 17 Mar 2011 15:11:56 +0530 Subject: [PATCH 056/121] [ADD]: Images: crm, crm_claim bzr revid: vro@tinyerp.com-20110317094156-mxev83bf0cae52ju --- addons/crm/__openerp__.py | 19 ++++++++++--------- addons/crm_claim/__openerp__.py | 11 +++++++---- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index db69144b408..459eeda2cfb 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -24,8 +24,11 @@ 'name': 'Customer & Supplier Relationship Management', 'version': '1.0', 'category': 'Generic Modules/CRM & SRM', - 'description': """The generic OpenERP Customer Relationship Management -system enables a group of people to intelligently and efficiently manage + 'description': """ + The generic OpenERP Customer Relationship Management. + ===================================================== + +This system enables a group of people to intelligently and efficiently manage leads, opportunities, meeting, phonecall etc. It manages key tasks such as communication, identification, prioritization, assignment, resolution and notification. @@ -42,13 +45,10 @@ place. The CRM module has a email gateway for the synchronisation interface between mails and OpenERP. -Create dashboard for CRM that includes: - * My Leads (list) - * Leads by Stage (graph) - * My Meetings (list) - * Sales Pipeline by Stage (graph) - * My Cases (list) - * Jobs Tracking (graph) +Creates a dashboard for CRM that includes: + * Opportunities by Categories (graph) + * Opportunities by Stage (graph) + * Planned Revenue by Stage and User (graph) """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', @@ -132,5 +132,6 @@ Create dashboard for CRM that includes: 'installable': True, 'active': False, 'certificate': '0079056041421', + 'images': ['images/crm_dashboard.jpeg','images/leads.jpeg','images/meetings.jpeg','images/opportunities.jpeg','images/outbound_calls.jpeg','images/stages.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_claim/__openerp__.py b/addons/crm_claim/__openerp__.py index 57d2e444247..5161d130d8d 100644 --- a/addons/crm_claim/__openerp__.py +++ b/addons/crm_claim/__openerp__.py @@ -21,11 +21,13 @@ { - 'name': 'Customer & Supplier Relationship Management', + 'name': 'Customer & Supplier Claims Management', 'version': '1.0', 'category': 'Generic Modules/CRM & SRM', 'description': """ -This modules allows you to track your customers/suppliers claims and flames. +This modules allows you to track your customers/suppliers claims and grievances. +================================================================================ + It is fully integrated with the email gateway so that you can create automatically new claims based on incoming emails. """, @@ -44,11 +46,12 @@ automatically new claims based on incoming emails. ], 'demo_xml': [ 'crm_claim_demo.xml', - ], - 'test': ['test/test_crm_claim.yml'], + ], + 'test': ['test/test_crm_claim.yml'], 'installable': True, 'active': False, 'certificate' : '00612027414703404749', + 'images': ['images/claim_categories.jpeg','images/claim_stages.jpeg','images/claims.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From e42c6fbd6c8a8d41c8202c35dbaed745b0dc50f5 Mon Sep 17 00:00:00 2001 From: vro Date: Thu, 17 Mar 2011 15:25:33 +0530 Subject: [PATCH 057/121] [ADD]: Images: crm_fundraising, crm_helpdesk, crm_partner_assign, crm_profiling bzr revid: vro@tinyerp.com-20110317095533-7v14vru5a5xrkqvk --- addons/crm_fundraising/__openerp__.py | 42 +++++++++++++----------- addons/crm_helpdesk/__openerp__.py | 42 +++++++++++++----------- addons/crm_partner_assign/__openerp__.py | 7 ++-- addons/crm_profiling/__openerp__.py | 8 ++--- 4 files changed, 54 insertions(+), 45 deletions(-) diff --git a/addons/crm_fundraising/__openerp__.py b/addons/crm_fundraising/__openerp__.py index b701769432f..49d5f448a59 100644 --- a/addons/crm_fundraising/__openerp__.py +++ b/addons/crm_fundraising/__openerp__.py @@ -21,30 +21,34 @@ { - 'name': 'CRM Fundraising', - 'version': '1.0', - 'category': 'Generic Modules/CRM & SRM', - 'description': """Fundraising""", - 'author': 'OpenERP SA', - 'website': 'http://www.openerp.com', - 'depends': ['crm'], + 'name': 'CRM Fundraising', + 'version': '1.0', + 'category': 'Generic Modules/CRM & SRM', + 'description': """ + Fundraising. + ============ + """, + 'author': 'OpenERP SA', + 'website': 'http://www.openerp.com', + 'depends': ['crm'], 'init_xml': [ - 'crm_fundraising_data.xml', - ], + 'crm_fundraising_data.xml', + ], 'update_xml': [ - 'crm_fundraising_view.xml', - 'crm_fundraising_menu.xml', - 'security/ir.model.access.csv', - 'report/crm_fundraising_report_view.xml', - ], + 'crm_fundraising_view.xml', + 'crm_fundraising_menu.xml', + 'security/ir.model.access.csv', + 'report/crm_fundraising_report_view.xml', + ], 'demo_xml': [ - 'crm_fundraising_demo.xml', - ], - 'test': ['test/test_crm_fund.yml'], - 'installable': True, - 'active': False, + 'crm_fundraising_demo.xml', + ], + 'test': ['test/test_crm_fund.yml'], + 'installable': True, + 'active': False, 'certificate' : '00871545204231528989', + 'images': ['images/fundraising_analysis.jpeg','images/fundraising_categories.jpeg','images/funds.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_helpdesk/__openerp__.py b/addons/crm_helpdesk/__openerp__.py index b85aa8cd12f..2cb712c057a 100644 --- a/addons/crm_helpdesk/__openerp__.py +++ b/addons/crm_helpdesk/__openerp__.py @@ -21,29 +21,33 @@ { - 'name': 'CRM Helpdesk', - 'version': '1.0', - 'category': 'Generic Modules/CRM & SRM', - 'description': """Helpdesk Management""", - 'author': 'OpenERP SA', - 'website': 'http://www.openerp.com', - 'depends': ['crm'], + 'name': 'CRM Helpdesk', + 'version': '1.0', + 'category': 'Generic Modules/CRM & SRM', + 'description': """ + Helpdesk Management. + ==================== + """, + 'author': 'OpenERP SA', + 'website': 'http://www.openerp.com', + 'depends': ['crm'], 'init_xml': [ - 'crm_helpdesk_data.xml', - ], + 'crm_helpdesk_data.xml', + ], 'update_xml': [ - 'crm_helpdesk_view.xml', - 'crm_helpdesk_menu.xml', - 'security/ir.model.access.csv', - 'report/crm_helpdesk_report_view.xml', - ], + 'crm_helpdesk_view.xml', + 'crm_helpdesk_menu.xml', + 'security/ir.model.access.csv', + 'report/crm_helpdesk_report_view.xml', + ], 'demo_xml': [ - 'crm_helpdesk_demo.xml', - ], - 'test': ['test/test_crm_helpdesk.yml'], - 'installable': True, - 'active': False, + 'crm_helpdesk_demo.xml', + ], + 'test': ['test/test_crm_helpdesk.yml'], + 'installable': True, + 'active': False, 'certificate' : '00830691522781519309', + 'images': ['images/helpdesk_analysis.jpeg','images/helpdesk_categories.jpeg','images/helpdesk_requests.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_partner_assign/__openerp__.py b/addons/crm_partner_assign/__openerp__.py index b6f91cffda2..e0f471806c1 100644 --- a/addons/crm_partner_assign/__openerp__.py +++ b/addons/crm_partner_assign/__openerp__.py @@ -21,12 +21,12 @@ { - 'name': 'Partner Geo-Localisation', + 'name': 'Partner Geo-Localization', 'version': '1.0', 'category': 'Generic Modules/Production', 'description': """ -This is the module used by OpenERP SA to redirect customers to his partners, -based on geolocalization. +This is the module used by OpenERP SA to redirect customers to its partners, based on geolocalization. +====================================================================================================== """, 'author': 'OpenERP SA', 'depends': ['crm'], @@ -41,4 +41,5 @@ based on geolocalization. 'installable': True, 'active': False, 'certificate': '00503409558942442061', + 'images': ['images/partner_geo_localization.jpeg','images/partner_grade.jpeg'], } diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py index 191bb32cfd7..481359571f8 100644 --- a/addons/crm_profiling/__openerp__.py +++ b/addons/crm_profiling/__openerp__.py @@ -21,18 +21,17 @@ { - 'name': 'Crm Profiling management - To Perform Segmentation within Partners', + 'name': 'CRM Profiling Management - To Perform Segmentation within Partners', 'version': '1.3', 'category': 'Generic Modules/CRM & SRM', 'description': """ This module allows users to perform segmentation within partners. + ================================================================= + It uses the profiles criteria from the earlier segmentation module and improve it. Thanks to the new concept of questionnaire. You can now regroup questions into a questionnaire and directly use it on a partner. It also has been merged with the earlier CRM & SRM segmentation tool because they were overlapping. - The menu items related are in "CRM & SRM\Configuration\Segmentations" - - * Note: this module is not compatible with the module segmentation, since it's the same which has been renamed. """, 'author': 'OpenERP SA', @@ -44,5 +43,6 @@ 'installable': True, 'active': False, 'certificate': '0033984979005', + 'images': ['images/profiling_questionnaires.jpeg','images/profiling_questions.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 02ee6a81235e57ec4ede8b80f11bfacfca7fa8cc Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Thu, 17 Mar 2011 15:40:01 +0530 Subject: [PATCH 058/121] [ADD]: Images of event_project, google_map, purchase_double_validation and stock_invoice_directly modules. bzr revid: rch@tinyerp.com-20110317101001-zn6eeunknk62obm7 --- addons/event_project/__openerp__.py | 5 ++++- addons/google_map/__openerp__.py | 1 + addons/project_retro_planning/__openerp__.py | 4 ++-- addons/purchase_double_validation/__openerp__.py | 1 + addons/stock_invoice_directly/__openerp__.py | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py index 04443239196..82f47f3d034 100644 --- a/addons/event_project/__openerp__.py +++ b/addons/event_project/__openerp__.py @@ -23,11 +23,14 @@ 'name': 'Event Project - Create Retro-Planning to manage your Events', 'version': '0.1', 'category': 'Generic Modules/Association', - 'description': """Organization and management of events. + 'description': """ + Organization and management of events. + ====================================== This module allows you to create retro planning for managing your events. """, 'author': 'OpenERP SA', + 'images': ['images/event.jpeg'], 'depends': ['project_retro_planning', 'event'], 'init_xml': [], 'update_xml': ['wizard/event_project_retro_view.xml', 'event_project_view.xml'], diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py index 5283ba92711..bc8a9cc6302 100644 --- a/addons/google_map/__openerp__.py +++ b/addons/google_map/__openerp__.py @@ -29,6 +29,7 @@ so that we can directly open google map from the url widget.""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/google_map.jpeg'], 'depends': ['base'], 'init_xml': [], 'update_xml': ['google_map_wizard.xml', 'google_map_view.xml'], diff --git a/addons/project_retro_planning/__openerp__.py b/addons/project_retro_planning/__openerp__.py index e906e587a7b..1d712282649 100644 --- a/addons/project_retro_planning/__openerp__.py +++ b/addons/project_retro_planning/__openerp__.py @@ -24,8 +24,8 @@ 'version': '0.1', 'category': 'Generic Modules/Projects & Services', 'description': """ - - If end date of project is changed - then the deadline date and start date for all the tasks will change accordingly """, + If end date of project is changed + then the deadline date and start date for all the tasks will change accordingly. """, 'author': 'OpenERP SA', 'depends': ['base', 'project'], 'init_xml': [], diff --git a/addons/purchase_double_validation/__openerp__.py b/addons/purchase_double_validation/__openerp__.py index e0defbf4dc9..0ce728e3145 100644 --- a/addons/purchase_double_validation/__openerp__.py +++ b/addons/purchase_double_validation/__openerp__.py @@ -23,6 +23,7 @@ "name" : "Double Validation for Purchase", "version" : "1.1", "category": 'Generic Modules/Sales & Purchases', + "images" : ["images/purchase_validation.jpeg"], "depends" : ["base","purchase"], "author" : 'OpenERP SA', "description": """ diff --git a/addons/stock_invoice_directly/__openerp__.py b/addons/stock_invoice_directly/__openerp__.py index 4017fe81daa..cad6fc5b012 100644 --- a/addons/stock_invoice_directly/__openerp__.py +++ b/addons/stock_invoice_directly/__openerp__.py @@ -30,6 +30,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', + 'images': ['images/create_invoice.jpeg'], 'depends': ['delivery', 'stock'], 'init_xml': [], 'update_xml': [], From 32d3a04bb8cbef8649d43b3404c7de7417c0c07e Mon Sep 17 00:00:00 2001 From: vro Date: Thu, 17 Mar 2011 15:45:53 +0530 Subject: [PATCH 059/121] [ADD]: Images: report_designer, report_intrastat, resource, web_livechat, web_uservoice bzr revid: vro@tinyerp.com-20110317101553-99ks2npcbqf5ae1n --- addons/report_designer/__openerp__.py | 7 +++++-- addons/report_intrastat/__openerp__.py | 5 ++++- addons/resource/__openerp__.py | 5 ++++- addons/web_livechat/__openerp__.py | 6 +++++- addons/web_uservoice/__openerp__.py | 14 ++++++++++---- 5 files changed, 28 insertions(+), 9 deletions(-) diff --git a/addons/report_designer/__openerp__.py b/addons/report_designer/__openerp__.py index e3afe4a15ec..8588c6c4e8b 100644 --- a/addons/report_designer/__openerp__.py +++ b/addons/report_designer/__openerp__.py @@ -21,12 +21,14 @@ { - "name" : "Reporting Tools", + "name" : "Reporting Tools Installer", "version" : "1.0", "depends" : ["base"], "author" : "OpenERP SA", "category": "Tools", - "description": """Installer for reporting tools selection + "description": """ + Installer for reporting tools. + ============================== """, 'website': 'http://www.openerp.com', 'init_xml': [], @@ -38,5 +40,6 @@ 'installable': True, 'active': False, 'certificate' : '00764037194670093149', + 'images': ['images/config_reporting_tools.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/report_intrastat/__openerp__.py b/addons/report_intrastat/__openerp__.py index 47c4c93a211..02236203888 100644 --- a/addons/report_intrastat/__openerp__.py +++ b/addons/report_intrastat/__openerp__.py @@ -21,11 +21,13 @@ { - 'name': 'Intrastat Reporting - Reporting', + 'name': 'Intrastat Reporting', 'version': '1.0', 'category': 'Generic Modules/Inventory Control', 'description': """ A module that adds intrastat reports. + ===================================== + This module gives the details of the goods traded between the countries of European Union """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', @@ -41,5 +43,6 @@ 'installable': True, 'active': False, 'certificate': '0056982189085', + 'images': ['images/country_intrastat_code.jpeg','images/intrastat_code.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py index 3c24403add3..545a08a80fe 100644 --- a/addons/resource/__openerp__.py +++ b/addons/resource/__openerp__.py @@ -26,7 +26,9 @@ "category" : "Generic Modules/Projects & Services", "website" : "http://www.openerp.com", "description": """ - Module for resource management + Module for resource management. + =============================== + A resource represent something that can be scheduled (a developer on a task or a work center on manufacturing orders). This module manages a resource calendar associated to every resource. @@ -46,6 +48,7 @@ 'installable': True, 'active': False, 'certificate': '00746371192190459469', + 'images': ['images/resource_leaves_calendar.jpeg','images/resource_leaves_form.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/web_livechat/__openerp__.py b/addons/web_livechat/__openerp__.py index 9c75cf1f326..3f0e7b56949 100644 --- a/addons/web_livechat/__openerp__.py +++ b/addons/web_livechat/__openerp__.py @@ -22,7 +22,10 @@ 'name': 'Live Chat Support', 'version': '1.1', 'category': 'Generic Modules/Others', - 'description': "Enable live chat support for whom have a maintenance contract", + 'description': """ + Enable live chat support for those who have a maintenance contract. + =================================================================== + """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', 'depends': ['base'], @@ -31,4 +34,5 @@ 'active': True, 'web': True, 'certificate': '0013762192410413', + 'images': ['images/web_livechat_support.jpeg'], } diff --git a/addons/web_uservoice/__openerp__.py b/addons/web_uservoice/__openerp__.py index 35ab24ed38d..205bb36aa07 100644 --- a/addons/web_uservoice/__openerp__.py +++ b/addons/web_uservoice/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2010 OpenERP s.a. (). # @@ -15,14 +15,19 @@ # 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 . +# along with this program. If not, see . # ############################################################################## { - 'name': 'Add uservoice button in header', + 'name': 'Receive User Feedback', 'version': '1.0', 'category': 'Generic Modules/Others', - 'description': "", + 'description': """ + Add Feedback button in header. + ============================== + + Invite OpenERP user feedback, powered by uservoice. + """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', 'depends': ['base'], @@ -31,4 +36,5 @@ 'active': False, 'web': True, 'certificate': '0040452504963885', + 'images': ['images/resource_leaves_calendar.jpeg','images/resource_leaves_form.jpeg'], } From 79bf0f73da6a231d8af08f5f24219524ee9f326a Mon Sep 17 00:00:00 2001 From: vro Date: Thu, 17 Mar 2011 16:34:08 +0530 Subject: [PATCH 062/121] [ADD]: Images: outlook, wiki, wiki_faq, wiki_quality_manual bzr revid: vro@tinyerp.com-20110317110408-2o5nbazf4a1b9iru --- addons/outlook/__openerp__.py | 6 ++++-- addons/wiki/__openerp__.py | 6 ++++-- addons/wiki_faq/__openerp__.py | 5 ++++- addons/wiki_quality_manual/__openerp__.py | 5 ++++- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py index 774c039ea8f..d416ebb2bec 100644 --- a/addons/outlook/__openerp__.py +++ b/addons/outlook/__openerp__.py @@ -28,11 +28,12 @@ 'depends' : ['base', 'mail_gateway'], 'category' : 'Generic Modules/Outlook interface', 'description': ''' - This module provide the Outlook plug-in. + This module provides the Outlook Plug-in. + ========================================= Outlook plug-in allows you to select an object that you’d like to add to your email and its attachments from MS Outlook. You can select a partner, a task, - a project, an analytical account, or any other object and Archived selected + a project, an analytical account, or any other object and archive selected mail in mailgate.messages with attachments. ''', @@ -42,6 +43,7 @@ 'active': False, 'installable': True, 'certificate' : '001278773815818292125', + 'images': ['images/config_outlook.jpeg','images/outlook_config_openerp.jpeg','images/outlook_push.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py index f29ebc04da1..97990abb015 100644 --- a/addons/wiki/__openerp__.py +++ b/addons/wiki/__openerp__.py @@ -24,9 +24,10 @@ 'version': '1.0.1', 'category': 'Generic Modules/Others', 'description': """ -The base module to manage documents(wiki) +The base module to manage documents(wiki). +========================================== -keep track for the wiki groups, pages, and history +Keep track of Wiki groups, pages, and history. """, 'author': ['OpenERP SA', 'Axelor'], 'website': 'http://openerp.com', @@ -50,5 +51,6 @@ keep track for the wiki groups, pages, and history 'active': False, 'certificate': '0086363630317', 'web': True, + 'images': ['images/create_index.jpeg','images/page_history.jpeg','images/wiki_groups.jpeg','images/wiki_pages.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki_faq/__openerp__.py b/addons/wiki_faq/__openerp__.py index 1cc7c770be5..3ac771f9915 100644 --- a/addons/wiki_faq/__openerp__.py +++ b/addons/wiki_faq/__openerp__.py @@ -23,7 +23,9 @@ 'name': 'Document Management - Wiki - FAQ', 'version': '1.0', 'category': 'Generic Modules/Others', - 'description': """This module provides a wiki FAQ Template + 'description': """ + This module provides a Wiki FAQ Template. + ========================================= """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', @@ -34,5 +36,6 @@ 'installable': True, 'active': False, 'certificate' : '00475023941677743389', + 'images': ['images/wiki_groups_internal_faq.jpeg','images/wiki_pages_internal_faq.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/wiki_quality_manual/__openerp__.py b/addons/wiki_quality_manual/__openerp__.py index 2e4d57f3cb0..a91aa906994 100644 --- a/addons/wiki_quality_manual/__openerp__.py +++ b/addons/wiki_quality_manual/__openerp__.py @@ -23,7 +23,9 @@ 'name': 'Document Management - Wiki - Quality Manual', 'version': '1.0', 'category': 'Generic Modules/Others', - 'description': """Quality Manual Template + 'description': """ + Quality Manual Template. + ======================== """, 'author': 'OpenERP SA', 'website': 'http://openerp.com', @@ -34,5 +36,6 @@ 'installable': True, 'active': False, 'certificate' : '00705749856097740509', + 'images': ['images/wiki_pages_quality_manual.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 86bc7ef222c18c3ccf7d25d4413f5396df912894 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 17 Mar 2011 13:22:39 +0100 Subject: [PATCH 064/121] fix hello bzr revid: al@openerp.com-20110317122239-wlyapf12h73m6uqo --- addons/base/static/openerp/js/base_chrome.js | 3 --- addons/base_hello/static/openerp/base_hello.js | 12 +----------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js index 60fb5b3f22f..32970d00905 100644 --- a/addons/base/static/openerp/js/base_chrome.js +++ b/addons/base/static/openerp/js/base_chrome.js @@ -238,7 +238,6 @@ openerp.base.Session = openerp.base.BasicController.extend({ var s = document.createElement("script"); s.src = files[i]; s.type = "text/javascript"; - self.log("load script: " + s.src); document.getElementsByTagName("head")[0].appendChild(s); } // at this point the js should be loaded or not ? @@ -252,8 +251,6 @@ openerp.base.Session = openerp.base.BasicController.extend({ }, on_session_modules_loaded: function() { var self = this; - self.log("init modules"); - self.log(self.module_list); for(var j=0; j Date: Thu, 17 Mar 2011 18:06:28 +0530 Subject: [PATCH 065/121] [ADD]: Images: report_webkit, report_webkit_sample bzr revid: vro@tinyerp.com-20110317123628-nvf7198lw8wazyi1 --- addons/report_webkit/__openerp__.py | 18 +++++++++++------- addons/report_webkit_sample/__openerp__.py | 13 ++++++++----- 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/addons/report_webkit/__openerp__.py b/addons/report_webkit/__openerp__.py index eae898dec58..a76bdf18292 100644 --- a/addons/report_webkit/__openerp__.py +++ b/addons/report_webkit/__openerp__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp) @@ -31,18 +31,21 @@ { "name" : "Webkit Report Engine", - "description" : """This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to support reports designed in HTML + CSS. + "description" : """ + This module adds a new Report Engine based on WebKit library (wkhtmltopdf) to support reports designed in HTML + CSS. + ===================================================================================================================== + The module structure and some code is inspired by the report_openoffice module. The module allows: -HTML report definition - -Multi header support + -Multi header support -Multi logo -Multi company support -HTML and CSS-3 support (In the limit of the actual WebKIT version) - -JavaScript support + -JavaScript support -Raw HTML debugger -Book printing capabilities - -Margins definition + -Margins definition -Paper size definition and much more @@ -57,7 +60,7 @@ After installing the wkhtmltopdf library on the OpenERP Server machine, you need path to the wkthtmltopdf executable file on the Company. For a sample report see also the webkit_report_sample module, and this video: - http://files.me.com/nbessi/06n92k.mov + http://files.me.com/nbessi/06n92k.mov TODO : @@ -71,7 +74,7 @@ Web client WYSIWYG "author" : "Camptocamp SA - NBessi", "category": "Reports/Webkit", "url": "http://http://www.camptocamp.com/", - "data": [ "security/ir.model.access.csv", + "data": [ "security/ir.model.access.csv", "data.xml", "wizard/report_webkit_actions_view.xml", "company_view.xml", @@ -81,4 +84,5 @@ Web client WYSIWYG "installable" : True, "active" : False, "certificate" : "001159699313338995949", + 'images': ['images/companies_webkit.jpeg','images/header_html.jpeg','images/header_img.jpeg'], } diff --git a/addons/report_webkit_sample/__openerp__.py b/addons/report_webkit_sample/__openerp__.py index faa39d29fef..ecde010aa07 100644 --- a/addons/report_webkit_sample/__openerp__.py +++ b/addons/report_webkit_sample/__openerp__.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ############################################################################## # -# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) +# Copyright (c) 2010 Camptocamp SA (http://www.camptocamp.com) # All Right Reserved # # Author : Nicolas Bessi (Camptocamp) @@ -31,13 +31,15 @@ { "name" : "Webkit Report Samples", - "description" : """Samples for Webkit Report Engine (report_webkit module). + "description" : """ + Samples for Webkit Report Engine (report_webkit module). + ======================================================== A sample invoice report is included in this module, as well as a wizard to add Webkit Report entries on any Document in the system. - + You have to create the print buttons by calling the wizard. For more details see: - http://files.me.com/nbessi/06n92k.mov + http://files.me.com/nbessi/06n92k.mov """, "version" : "0.9", "depends" : ["base", "account", "report_webkit"], @@ -45,9 +47,10 @@ "author" : "Camptocamp SA - NBessi", "url": "http://www.camptocamp.com/", "data": ["report_webkit_html_view.xml", - + ], "installable" : True, "active" : False, "certificate" : "00436592682591421981", + 'images': ['images/webkit_invoice_report.jpeg'], } From ea8379a0f2328dd68b58cae64db83934d076a369 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Mar 2011 13:51:07 +0100 Subject: [PATCH 066/121] [FIX] start/stop of cherrypy server so Ctrl-C works correctly bzr revid: xmo@openerp.com-20110317125107-87is0mml601p987n --- openerpweb/openerpweb.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index d427c8bac89..34aa8036caa 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -2,6 +2,7 @@ import os, re, sys, traceback, xmlrpclib +import cherrypy import cherrypy.lib.static import simplejson @@ -232,8 +233,9 @@ def main(argv): #'server.thread_pool' = 10, 'tools.sessions.on': True, } - cherrypy.config.update(config) - cherrypy_root = Root() - cherrypy.quickstart(cherrypy_root,'',{'/':{}}) + cherrypy.tree.mount(Root()) -# vim: + cherrypy.config.update(config) + cherrypy.server.subscribe() + cherrypy.engine.start() + cherrypy.engine.block() From 960091b74a746a1ae85db084fdc86b520e1f607b Mon Sep 17 00:00:00 2001 From: rch-openerp Date: Thu, 17 Mar 2011 18:38:14 +0530 Subject: [PATCH 067/121] [ADD]: Image of users_ldap module. bzr revid: rch@tinyerp.com-20110317130814-ad5y970db4sk9m08 --- addons/users_ldap/__openerp__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py index 9559c0f5d31..7a32bedd429 100644 --- a/addons/users_ldap/__openerp__.py +++ b/addons/users_ldap/__openerp__.py @@ -22,6 +22,7 @@ "name" : "Authenticate users with ldap server", "version" : "0.1", "depends" : ["base"], + "images" : ["images/ldap_configuration.jpeg"], "author" : "OpenERP SA", "description": """Adds support for authentication by ldap server. This module only works with Unix/Linux From dc3abe055b4bed7c5cd11e97c976aa08247233e5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Mar 2011 14:09:46 +0100 Subject: [PATCH 068/121] [FIX] JSON-RPC2 request/response process bzr revid: xmo@openerp.com-20110317130946-ptpaihigvie31moo --- addons/base/static/openerp/js/base_chrome.js | 19 ++++++++++--------- openerpweb/openerpweb.py | 11 ++++++----- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js index 32970d00905..c8f00a94d74 100644 --- a/addons/base/static/openerp/js/base_chrome.js +++ b/addons/base/static/openerp/js/base_chrome.js @@ -143,27 +143,28 @@ openerp.base.Session = openerp.base.BasicController.extend({ // Construct a JSON-RPC2 request, method is currently unused params.session_id = this.session_id; params.context = typeof(params.context) != "undefined" ? params.context : this.context; - var request = { jsonrpc: "2.0", method: "call", params: params, "id":null }; - - // This is a violation of the JSON-RPC2 over HTTP protocol - // specification but i don't know how to parse the raw POST content from - // cherrypy so i use a POST form with one variable named request - var post = { request: JSON.stringify(request) }; // Use a default error handler unless defined error_callback = typeof(error_callback) != "undefined" ? error_callback : this.on_rpc_error; // Call using the rpc_mode - this.rpc_ajax(url, post, success_callback, error_callback); + this.rpc_ajax(url, { + jsonrpc: "2.0", + method: "call", + params: params, + id:null + }, success_callback, error_callback); }, - rpc_ajax: function(url, post, success_callback, error_callback) { + rpc_ajax: function(url, payload, success_callback, error_callback) { var self = this; this.on_rpc_request(); $.ajax({ type: "POST", url: url, dataType: 'json', - data: post, + contentType: 'application/json', + data: JSON.stringify(payload), + processData: false, success: function(response, textStatus, jqXHR) { self.on_rpc_response(); if (response.error) { diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 34aa8036caa..64c5ae7d37e 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -1,4 +1,5 @@ #!/usr/bin/python +import functools import os, re, sys, traceback, xmlrpclib @@ -129,11 +130,11 @@ class JsonRequest(object): return simplejson.dumps(r) def jsonrequest(f): - # check cleaner wrapping: - # functools.wraps(f)(lambda x: JsonRequest().dispatch(x, f)) - l=lambda self, request: JsonRequest().dispatch(self, f, request) - l.exposed=1 - return l + @cherrypy.expose + @functools.wraps(f) + def json_handler(self): + return JsonRequest().dispatch(self, f, cherrypy.request.body.read()) + return json_handler class HttpRequest(object): """ Regular GET/POST request From a00f7aa97fe62a743dccc44f9b63272c091dae97 Mon Sep 17 00:00:00 2001 From: vro Date: Thu, 17 Mar 2011 18:58:00 +0530 Subject: [PATCH 069/121] [ADD]: Images: caldav, crm_caldav, document_webdav, project_caldav bzr revid: vro@tinyerp.com-20110317132800-olxywjriieykgafo --- addons/caldav/__openerp__.py | 35 +++++++++++++++------------ addons/crm_caldav/__openerp__.py | 5 +++- addons/document_webdav/__openerp__.py | 14 +++++++---- addons/project_caldav/__openerp__.py | 8 ++++-- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/addons/caldav/__openerp__.py b/addons/caldav/__openerp__.py index fe544aad52b..7e70810cbe3 100644 --- a/addons/caldav/__openerp__.py +++ b/addons/caldav/__openerp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2010 Tiny SPRL (). # @@ -15,20 +15,22 @@ # 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 . +# along with this program. If not, see . # ############################################################################## { - "name" : "Share Calendar using CalDAV", - "version" : "1.1", + "name" : "Share Calendar using CalDAV", + "version" : "1.1", "depends" : [ - "base", + "base", "document_webdav", ], 'description': """ - This module Contains basic functionality for caldav system like: + This module contains basic functionality for Caldav system. + =========================================================== + - Webdav server that provides remote access to calendar - Synchronisation of calendar using WebDAV - Customize calendar event and todo attribute with any of OpenERP model @@ -45,24 +47,25 @@ PORT : Port on which OpenERP server is running (By Default : 8069) DATABASE_NAME: Name of database on which OpenERP Calendar is created CALENDAR_NAME: Name of calendar to access -""", - "author" : "OpenERP SA", - 'category': 'Generic Modules/Others', - 'website': 'http://www.openerp.com', - "init_xml" : ["caldav_data.xml"], - "demo_xml" : [], +""", + "author" : "OpenERP SA", + 'category': 'Generic Modules/Others', + 'website': 'http://www.openerp.com', + "init_xml" : ["caldav_data.xml"], + "demo_xml" : [], "update_xml" : [ - 'security/ir.model.access.csv', + 'security/ir.model.access.csv', 'wizard/calendar_event_export_view.xml', 'wizard/calendar_event_import_view.xml', 'wizard/calendar_event_subscribe_view.xml', 'wizard/caldav_browse_view.xml', 'caldav_view.xml', 'caldav_setup.xml' - ], - "installable" : True, - "active" : False, + ], + "installable" : True, + "active" : False, "certificate" : "00924841426645403741", + 'images': ['images/calendar_collections.jpeg','images/calendars.jpeg','images/export_ics_file.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/crm_caldav/__openerp__.py b/addons/crm_caldav/__openerp__.py index e7809ba7fd6..a4a2d862b94 100644 --- a/addons/crm_caldav/__openerp__.py +++ b/addons/crm_caldav/__openerp__.py @@ -26,7 +26,9 @@ 'version': '1.1', 'category': 'Generic Modules/CRM & SRM', 'description': """ - New Features in Meeting: + Caldav features in Meeting. + =========================== + * Share meeting with other calendar clients like sunbird """, 'author': 'OpenERP SA', @@ -42,6 +44,7 @@ 'installable': True, 'active': False, 'certificate' : '001088048737252670109', + 'images': ['images/caldav_browse_step1.jpeg','images/caldav_browse_step2.jpeg'], } # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/document_webdav/__openerp__.py b/addons/document_webdav/__openerp__.py index 64bd6fa11e8..b6e892fd104 100644 --- a/addons/document_webdav/__openerp__.py +++ b/addons/document_webdav/__openerp__.py @@ -34,10 +34,13 @@ "author" : "OpenERP SA", "category" : "Generic Modules/Others", "website": "http://www.openerp.com", - "description": """ With this module, the WebDAV server for the documents is activated. + "description": """ + With this module, the WebDAV server for documents is activated. + =============================================================== + You can then use any compatible browser to remotely see the attachments of OpenObject. - After installation, the webDAV server can be controlled by a [webdav] section in the server's config. + After installation, the WebDAV server can be controlled by a [webdav] section in the server's config. Server Configuration Parameter: [webdav] ; enable = True ; Serve webdav over the http(s) servers @@ -49,20 +52,21 @@ ; since the messages are routed to the python logging, with ; levels "debug" and "debug_rpc" respectively, you can leave ; these options on - + Also implements IETF RFC 5785 for services discovery on a http server, which needs explicit configuration in openerp-server.conf, too. """, "depends" : ["base", "document"], "init_xml" : [], - "update_xml" : ['security/ir.model.access.csv', + "update_xml" : ['security/ir.model.access.csv', 'webdav_view.xml', 'webdav_setup.xml', ], "demo_xml" : [], - "test": [ #'test/webdav_test1.yml', + "test": [ #'test/webdav_test1.yml', ], "active": False, "installable": True, "certificate" : "001236490750845657973", + 'images': ['images/dav_properties.jpeg','images/directories_structure_principals.jpeg'], } diff --git a/addons/project_caldav/__openerp__.py b/addons/project_caldav/__openerp__.py index 6a83d9472e8..e929ef57b95 100644 --- a/addons/project_caldav/__openerp__.py +++ b/addons/project_caldav/__openerp__.py @@ -20,11 +20,14 @@ ############################################################################## { - "name": "CalDAV for task management", + "name": "CalDAV for Task Management", "version": "1.1", "author": "OpenERP SA", "category": "Generic Modules/Others", - "description": """ Synchronize between Project task and Caldav Vtodo.""", + "description": """ + Synchronization between Project Task and Caldav Vtodo. + ====================================================== + """, "depends": ["project", "caldav", "base_calendar"], "init_xml": ["project_caldav_data.xml", 'project_caldav_setup.xml', ], "demo_xml": [], @@ -33,4 +36,5 @@ "website": "http://www.openerp.com", "installable": True, "certificate" : "001114200456808204637", + 'images': ['images/project_tasks_caldav.jpeg'], } From 35b6a7efec5f8c59ef26abe646a787898672b65f Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 17 Mar 2011 14:41:55 +0100 Subject: [PATCH 070/121] form logic part1 bzr revid: al@openerp.com-20110317134155-snjjer2ynnbwuynf --- addons/base/static/openerp/js/base_views.js | 564 +++++++++++--------- 1 file changed, 299 insertions(+), 265 deletions(-) diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js index c03b08018fc..3c649d4af6f 100644 --- a/addons/base/static/openerp/js/base_views.js +++ b/addons/base/static/openerp/js/base_views.js @@ -3,6 +3,86 @@ *---------------------------------------------------------*/ openerp.base$views = function(openerp) { + +openerp.base.Action = openerp.base.Controller.extend({ + init: function(session, element_id) { + this._super(session, element_id); + this.action = null; + this.dataset = null; + this.searchview_id = false; + this.searchview = null; + this.listview_id = false; + this.listview = null; + this.formview_id = false; + this.formview = null; + }, + start: function() { + this.$element.html(QWeb.render("Action", {"prefix":this.element_id})); + this.$element.find("#mode_list").bind('click',this.on_mode_list); + this.$element.find("#mode_form").bind('click',this.on_mode_form); + this.on_mode_list(); + }, + on_mode_list: function() { + $("#oe_action_form").hide(); + $("#oe_action_search").show(); + $("#oe_action_list").show(); + }, + on_mode_form: function() { + $("#oe_action_form").show(); + $("#oe_action_search").hide(); + $("#oe_action_list").hide(); + }, + do_action: function(action) { + // instantiate the right controllers by understanding the action + this.action = action; + this.log(action); +// debugger; + //this.log(action); + if(action.type == "ir.actions.act_window") { + this.do_action_window(action); + } + }, + do_action_window: function(action) { + this.formview_id = false; + this.dataset = new openerp.base.DataSet(this.session, "oe_action_dataset", action.res_model); + this.dataset.start(); + + // Locate first tree view + this.listview_id = false; + for(var i = 0; i < action.views.length; i++) { + if(action.views[i][1] == "tree") { + this.listview_id = action.views[i][0]; + break; + } + } + this.listview = new openerp.base.ListView(this.session, "oe_action_list", this.dataset, this.listview_id); + this.listview.start(); + + // Locate first form view + this.listview_id = false; + for(var j = 0; j < action.views.length; j++) { + if(action.views[j][1] == "form") { + this.formview_id = action.views[j][0]; + break; + } + } + this.formview = new openerp.base.FormView(this.session, "oe_action_form", this.dataset, this.formview_id); + this.formview.start(); + + // Take the only possible search view. Is that consistent ? + this.searchview_id = false; + if(this.listview && action.search_view_id) { + this.searchview_id = action.search_view_id[0]; + } + this.searchview = new openerp.base.SearchView(this.session, "oe_action_search", this.dataset, this.searchview_id); + this.searchview.start(); + } +}); + +openerp.base.View = openerp.base.Controller.extend({ +// to replace Action +}); + openerp.base.DataSet = openerp.base.Controller.extend({ init: function(session, element_id, model) { this._super(session, element_id); @@ -42,15 +122,18 @@ openerp.base.DataSet = openerp.base.Controller.extend({ }); openerp.base.DataRecord = openerp.base.Controller.extend({ - init: function(session, element_id, model, id) { - this._super(session, element_id); + init: function(session, model, fields) { + this._super(session, null); this.model = model; this.id = id; - this.value = {}; + this.fields = fields; + this.values = {}; }, - start: function() { + load: function(id) { + // READ }, - on_ready: function() { + on_loaded: function() { + // set t this.values = data.rea }, }, on_change: function() { }, @@ -58,6 +141,204 @@ openerp.base.DataRecord = openerp.base.Controller.extend({ } }); +openerp.base.SearchView = openerp.base.Controller.extend({ + init: function(session, element_id, dataset, view_id) { + this._super(session, element_id); + this.dataset = dataset; + this.model = dataset.model; + this.view_id = view_id; + this.input_index = 0; + this.input_ids = {}; + this.domain = []; + }, + start: function() { + //this.log('Starting SearchView '+this.model+this.view_id) + this.rpc("/base/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded); + }, + on_loaded: function(data) { + this.fields_view = data.fields_view; + this.log(this.fields_view); + this.input_ids = {}; + this.$element.html(QWeb.render("SearchView", {"fields_view": this.fields_view})); + this.$element.find("#search").bind('click',this.on_search); + // TODO bind click event on all button + // TODO we don't do many2one yet, but in the future bind a many2one controller on them + this.log(this.$element.find("#search")); + }, + register_input: function(node) { + // self should be passed in the qweb dict to do: + // + + // generate id + var id = this.element_id + "_" + this.input_index++; + // TODO construct a nice object + // save it in our registry + this.input_ids[id] = { + node: node, + type: "filter", + domain: "", + context: "", + disabled: false + }; + + return id; + }, + on_click: function() { + // event catched on a button + // flip the disabled flag + // adjust the css class + }, + on_search: function() { + this.log("on_search"); + // collect all non disabled domains definitions, AND them + // evaluate as python expression + // save the result in this.domain + this.dataset.do_load(); + }, + on_clear: function() { + } +}); + +openerp.base.SearchViewInput = openerp.base.Controller.extend({ +// TODO not sure should we create a controller for every input ? + +// of we just keep a simple dict for each input in +// openerp.base.SearchView#input_ids +// and use if when we get an event depending on the type +// i think it's less bloated to avoid useless controllers + +// but i think for many2one a controller would be nice +// so simple dict for simple inputs +// an controller for many2one ? + +}); + +openerp.base.FormView = openerp.base.Controller.extend({ + init: function(session, element_id, dataset, view_id) { + this._super(session, element_id); + this.dataset = dataset; + this.dataset_index = 0; + this.model = dataset.model; + this.view_id = view_id; + this.fields_views = {}; + this.widgets = {}; + this.fields = {}; + this.datarecord = {}; + }, + start: function() { + //this.log('Starting FormView '+this.model+this.view_id) + this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded); + }, + on_loaded: function(data) { + this.fields_view = data.fields_view; + //this.log(this.fields_view); + + var frame = new openerp.base.WidgetFrame(this.session, null, this, this.fields_view.arch); + + this.$element.html(QWeb.render("FormView", { "frame": frame, "view": this })); + for (var i in this.widgets) { + this.widgets[i].register(); + } + // bind to all wdigets that have onchange ?? + + // When the dataset is loaded load the first record (like gtk) + this.dataset.on_loaded.add_last(this.do_load_record); + + // When a datarecord is loaded display the values in the inputs + this.datarecord = new openerp.base.DataRecord(this.session, this.model,{}); + this.datarecord.on_loaded.add(this.on_record_loaded); + + }, + do_load_record: function() { + // if dataset is empty display the empty datarecord + if(this.dataset.ids.length == 0) { + this.on_record_loaded(); + } + this.datarecord.load(this.dataset.ids[this.dataset_index]); + }, + on_record_loaded: function() { + //for i in this.fields: f.update_from_datarecord() + }, +}); + +openerp.base.ListView = openerp.base.Controller.extend({ + init: function(session, element_id, dataset, view_id) { + this._super(session, element_id); + this.dataset = dataset; + this.model = dataset.model; + this.view_id = view_id; + this.name = ""; + + this.cols = []; + + this.$table = null; + this.colnames = []; + this.colmodel = []; + + this.event_loading = false; // TODO in the future prevent abusive click by masking + }, + start: function() { + //this.log('Starting ListView '+this.model+this.view_id) + this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded); + }, + on_loaded: function(data) { + this.fields_view = data.fields_view; + //this.log(this.fields_view); + this.name = "" + this.fields_view.arch.attrs.string; + this.$element.html(QWeb.render("ListView", {"fields_view": this.fields_view})); + this.$table = this.$element.find("table"); + this.cols = []; + this.colnames = []; + this.colmodel = []; + // TODO uss a object for each col, fill it with view and fallback to dataset.model_field + var tree = this.fields_view.arch.children; + for(var i = 0; i < tree.length; i++) { + var col = tree[i]; + if(col.tag == "field") { + this.cols.push(col.attrs.name); + this.colnames.push(col.attrs.name); + this.colmodel.push({ name: col.attrs.name, index: col.attrs.name }); + } + } + //this.log(this.cols); + this.dataset.fields = this.cols; + this.dataset.on_loaded.add_last(this.do_fill_table); + }, + do_fill_table: function() { + //this.log("do_fill_table"); + + var self = this; + //this.log(this.dataset.data); + var rows = []; + var ids = this.dataset.ids; + for(var i = 0; i < ids.length; i++) { + // TODO very strange is sometimes non existing ? even as admin ? example ir.ui.menu + var row = this.dataset.values[ids[i]]; + if(row) + rows.push(row); +// else +// debugger; + } + //this.log(rows); + this.$table.jqGrid({ + data: rows, + datatype: "local", + height: "100%", + rowNum: 100, + //rowList: [10,20,30], + colNames: this.colnames, + colModel: this.colmodel, + //pager: "#plist47", + viewrecords: true, + caption: this.name + }).setGridWidth(this.$element.width()); + $(window).bind('resize', function() { self.$table.setGridWidth(self.$element.width()); }).trigger('resize'); + } +}); + +openerp.base.TreeView = openerp.base.Controller.extend({ +}); + openerp.base.Widget = openerp.base.Controller.extend({ // TODO Change this to init: function(view, node) { and use view.session and a new element_id for the super // it means that widgets are special controllers @@ -211,6 +492,7 @@ openerp.base.WidgetButton = openerp.base.Widget.extend({ openerp.base.Field = openerp.base.Widget.extend({ init: function(session, element_id, view, node) { this._super(session, element_id, view, node); + // this.datarecord = this.view.datarecord ?? } }); @@ -218,7 +500,18 @@ openerp.base.FieldChar = openerp.base.Field.extend({ init: function(session, element_id, view, node) { this._super(session, element_id, view, node); this.template = "FormView.field.char"; - } + + }, + start: function() { + // this.$element.bind('leaving_focus',) + }, + set_value: function() { + // this.$element.val(this.view.datarecord.values[this.name]) + }, + on_change: function() { + //this.view.update_field(this.name,value); + + }, }); openerp.base.FieldEmail = openerp.base.Field.extend({ @@ -321,112 +614,6 @@ openerp.base.widgets = { 'button' : openerp.base.WidgetButton } -openerp.base.FormView = openerp.base.Controller.extend({ - init: function(session, element_id, dataset, view_id) { - this._super(session, element_id); - this.dataset = dataset; - this.model = dataset.model; - this.view_id = view_id; - this.widgets = {}; - this.fields = {}; - }, - start: function() { - //this.log('Starting FormView '+this.model+this.view_id) - this.rpc("/base/formview/load", {"model": this.model, "view_id": this.view_id}, this.on_loaded); - }, - on_loaded: function(data) { - this.fields_view = data.fields_view; - //this.log(this.fields_view); - var frame = new openerp.base.WidgetFrame(this.session, null, this, this.fields_view.arch); - this.$element.html(QWeb.render("FormView", { "frame": frame, "view": this })); - for (var i in this.widgets) { - this.widgets[i].register(); - } - }, - on_button: function() { - }, - on_write: function() { - } -}); - -openerp.base.ListView = openerp.base.Controller.extend({ - init: function(session, element_id, dataset, view_id) { - this._super(session, element_id); - this.dataset = dataset; - this.model = dataset.model; - this.view_id = view_id; - this.name = ""; - - this.cols = []; - - this.$table = null; - this.colnames = []; - this.colmodel = []; - - this.event_loading = false; // TODO in the future prevent abusive click by masking - }, - start: function() { - //this.log('Starting ListView '+this.model+this.view_id) - this.rpc("/base/listview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded); - }, - on_loaded: function(data) { - this.fields_view = data.fields_view; - //this.log(this.fields_view); - this.name = "" + this.fields_view.arch.attrs.string; - this.$element.html(QWeb.render("ListView", {"fields_view": this.fields_view})); - this.$table = this.$element.find("table"); - this.cols = []; - this.colnames = []; - this.colmodel = []; - // TODO uss a object for each col, fill it with view and fallback to dataset.model_field - var tree = this.fields_view.arch.children; - for(var i = 0; i < tree.length; i++) { - var col = tree[i]; - if(col.tag == "field") { - this.cols.push(col.attrs.name); - this.colnames.push(col.attrs.name); - this.colmodel.push({ name: col.attrs.name, index: col.attrs.name }); - } - } - //this.log(this.cols); - this.dataset.fields = this.cols; - this.dataset.on_loaded.add_last(this.do_fill_table); - }, - do_fill_table: function() { - //this.log("do_fill_table"); - - var self = this; - //this.log(this.dataset.data); - var rows = []; - var ids = this.dataset.ids; - for(var i = 0; i < ids.length; i++) { - // TODO very strange is sometimes non existing ? even as admin ? example ir.ui.menu - var row = this.dataset.values[ids[i]]; - if(row) - rows.push(row); -// else -// debugger; - } - //this.log(rows); - this.$table.jqGrid({ - data: rows, - datatype: "local", - height: "100%", - rowNum: 100, - //rowList: [10,20,30], - colNames: this.colnames, - colModel: this.colmodel, - //pager: "#plist47", - viewrecords: true, - caption: this.name - }).setGridWidth(this.$element.width()); - $(window).bind('resize', function() { self.$table.setGridWidth(self.$element.width()); }).trigger('resize'); - } -}); - -openerp.base.TreeView = openerp.base.Controller.extend({ -}); - openerp.base.CalendarView = openerp.base.Controller.extend({ // Dhtmlx scheduler ? }); @@ -442,165 +629,12 @@ openerp.base.DiagramView = openerp.base.Controller.extend({ openerp.base.GraphView = openerp.base.Controller.extend({ }); -openerp.base.SearchViewInput = openerp.base.Controller.extend({ -// TODO not sure should we create a controller for every input ? - -// of we just keep a simple dict for each input in -// openerp.base.SearchView#input_ids -// and use if when we get an event depending on the type -// i think it's less bloated to avoid useless controllers - -// but i think for many2one a controller would be nice -// so simple dict for simple inputs -// an controller for many2one ? - -}); - -openerp.base.SearchView = openerp.base.Controller.extend({ - init: function(session, element_id, dataset, view_id) { - this._super(session, element_id); - this.dataset = dataset; - this.model = dataset.model; - this.view_id = view_id; - this.input_index = 0; - this.input_ids = {}; - this.domain = []; - }, - start: function() { - //this.log('Starting SearchView '+this.model+this.view_id) - this.rpc("/base/searchview/load", {"model": this.model, "view_id":this.view_id}, this.on_loaded); - }, - on_loaded: function(data) { - this.fields_view = data.fields_view; - this.log(this.fields_view); - this.input_ids = {}; - this.$element.html(QWeb.render("SearchView", {"fields_view": this.fields_view})); - this.$element.find("#search").bind('click',this.on_search); - // TODO bind click event on all button - // TODO we don't do many2one yet, but in the future bind a many2one controller on them - this.log(this.$element.find("#search")); - }, - register_input: function(node) { - // self should be passed in the qweb dict to do: - // - - // generate id - var id = this.element_id + "_" + this.input_index++; - // TODO construct a nice object - // save it in our registry - this.input_ids[id] = { - node: node, - type: "filter", - domain: "", - context: "", - disabled: false - }; - - return id; - }, - on_click: function() { - // event catched on a button - // flip the disabled flag - // adjust the css class - }, - on_search: function() { - this.log("on_search"); - // collect all non disabled domains definitions, AND them - // evaluate as python expression - // save the result in this.domain - }, - on_clear: function() { - } -}); - openerp.base.ProcessView = openerp.base.Controller.extend({ }); openerp.base.HelpView = openerp.base.Controller.extend({ }); -openerp.base.View = openerp.base.Controller.extend({ -// to replace Action -}); - -openerp.base.Action = openerp.base.Controller.extend({ - init: function(session, element_id) { - this._super(session, element_id); - this.action = null; - this.dataset = null; - this.searchview_id = false; - this.searchview = null; - this.listview_id = false; - this.listview = null; - this.formview_id = false; - this.formview = null; - }, - start: function() { - this.$element.html(QWeb.render("Action", {"prefix":this.element_id})); - this.$element.find("#mode_list").bind('click',this.on_mode_list); - this.$element.find("#mode_form").bind('click',this.on_mode_form); - this.on_mode_list(); - }, - on_mode_list: function() { - $("#oe_action_form").hide(); - $("#oe_action_search").show(); - $("#oe_action_list").show(); - }, - on_mode_form: function() { - $("#oe_action_form").show(); - $("#oe_action_search").hide(); - $("#oe_action_list").hide(); - }, - do_action: function(action) { - // instantiate the right controllers by understanding the action - this.action = action; - this.log(action); -// debugger; - //this.log(action); - if(action.type == "ir.actions.act_window") { - this.do_action_window(action); - } - }, - do_action_window: function(action) { - this.formview_id = false; - this.dataset = new openerp.base.DataSet(this.session, "oe_action_dataset", action.res_model); - this.dataset.start(); - - // Locate first tree view - this.listview_id = false; - for(var i = 0; i < action.views.length; i++) { - if(action.views[i][1] == "tree") { - this.listview_id = action.views[i][0]; - break; - } - } - this.listview = new openerp.base.ListView(this.session, "oe_action_list", this.dataset, this.listview_id); - this.listview.start(); - - // Locate first form view - this.listview_id = false; - for(var j = 0; j < action.views.length; j++) { - if(action.views[j][1] == "form") { - this.formview_id = action.views[j][0]; - break; - } - } - this.formview = new openerp.base.FormView(this.session, "oe_action_form", this.dataset, this.formview_id); - this.formview.start(); - - // Take the only possible search view. Is that consistent ? - this.searchview_id = false; - if(this.listview && action.search_view_id) { - this.searchview_id = action.search_view_id[0]; - } - this.searchview = new openerp.base.SearchView(this.session, "oe_action_search", this.dataset, this.searchview_id); - this.searchview.start(); - - // Connect the the dataset load event with the search button of search view - // THIS IS COOL - this.searchview.on_search.add_last(this.dataset.do_load); - } -}); }; // DEBUG_RPC:rpc.request:('execute', 'addons-dsh-l10n_us', 1, '*', ('ir.filters', 'get_filters', u'res.partner')) From ba4054f6fcae1e43b137193fda8705548d35af53 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Mar 2011 15:06:27 +0100 Subject: [PATCH 071/121] [IMP] cleanup JSON-RPC request lifecycle bzr revid: xmo@openerp.com-20110317140627-hurby78o45xrmg6p --- addons/base/static/openerp/js/base_chrome.js | 2 +- openerpweb/openerpweb.py | 104 +++++++++++-------- 2 files changed, 64 insertions(+), 42 deletions(-) diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js index c8f00a94d74..3cb6f2f3c89 100644 --- a/addons/base/static/openerp/js/base_chrome.js +++ b/addons/base/static/openerp/js/base_chrome.js @@ -183,7 +183,7 @@ openerp.base.Session = openerp.base.BasicController.extend({ error: function(jqXHR, textStatus, errorThrown) { self.on_rpc_response(); var error = { - code: 1, + code: -32098, message: "XmlHttpRequestError " + errorThrown, data: {type: "xhr"+textStatus, debug: jqXHR.responseText, objects: [jqXHR, errorThrown] } }; diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 64c5ae7d37e..9b617747728 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -81,59 +81,81 @@ class JsonRequest(object): <-- {"jsonrpc": "2.0", "error": {"code": 1, "message": "End user error message.", "data": {"code": "codestring", "debug": "traceback" } }, "id": null} """ - def __init__(self): - # result may be filled, it's content will be updated by the return - # value of the dispatched function if it's a dict - self.result = {} - self.error_type = "" - self.error_message = "" - self.error_debug = "" def parse(self, request): - self.cherrypy_request = None - self.cherrypy_session = None - d = simplejson.loads(request) - self.params = d.get("params",{}) + self.params = request.get("params",{}) self.session_id = self.params.pop("session_id", None) or "random.random" self.session = session_store.setdefault(self.session_id, OpenERPSession()) - self.context = self.params.pop("context", {}) + self.context = self.params.pop('context', None) + return self.params - def dispatch(self, controller, f, request): - try: - print "--> %s.%s %s"%(controller.__class__.__name__,f.__name__,request) - self.parse(request) - r=f(controller, self, **self.params) - if isinstance(r, dict): - self.result.update(r) - except OpenERPUnboundException,e: - self.error_type = "session_invalid" - self.error_message = "OpenERP Session Invalid" - self.error_debug = traceback.format_exc() - except xmlrpclib.Fault, e: - tb = "".join(traceback.format_exception("", None, sys.exc_traceback)) - self.error_type = "server_exception" - self.error_message = "OpenERP Server Error: %s"%e.faultCode - self.error_debug = "Client %s\nServer %s"%(tb,e.faultString) - except Exception,e: - self.error_type = "client_exception" - self.error_message = "OpenERP WebClient Error: %r"%e - self.error_debug = "Client %s"%traceback.format_exc() - r = {"jsonrpc": "2.0", "id": None} - if self.error_type: - r["error"] = {"code": 1, "message": self.error_message, "data": { "type":self.error_type, "debug": self.error_debug } } + def dispatch(self, controller, method, requestf=None, request=None): + ''' Calls the method asked for by the JSON-RPC2 request + + :param controller: the instance of the controller which received the request + :type controller: type + :param method: the method which received the request + :type method: callable + :param requestf: a file-like object containing an encoded JSON-RPC2 request + :type requestf: bytes> + :param request: an encoded JSON-RPC2 request + :type request: bytes + + :returns: a string-encoded JSON-RPC2 reply + :rtype: bytes + ''' + if requestf: + request = simplejson.load(requestf) else: - r["result"] = self.result - print "<--",r + request = simplejson.loads(request) + try: + print "--> %s.%s %s"%(controller.__class__.__name__,method.__name__,request) + error = None + result = method(controller, self, **self.parse(request)) + except OpenERPUnboundException: + error = { + 'code': -32075, + 'message': "OpenERP Session Invalid", + 'data': { + 'type': 'session_invalid', + 'debug': traceback.format_exc() + } + } + except xmlrpclib.Fault, e: + error = { + 'code': -32000, + 'message': "OpenERP Server Error", + 'data': { + 'type': "server_exception", + 'fault_code': e.faultCode, + 'debug': "Client %s\nServer %s" % ( + traceback.format_exc(), e.faultString) + } + } + except Exception: + error = { + 'code': -32050, + 'message': "OpenERP WebClient Error", + 'data': { + 'type': 'client_exception', + 'debug': "Client %s" % traceback.format_exc() + } + } + response = {"jsonrpc": "2.0", "id": request.get('id')} + if error: + response["error"] = error + else: + response["result"] = result + + print "<--", response print - #import pprint - #pprint.pprint(r) - return simplejson.dumps(r) + return simplejson.dumps(response) def jsonrequest(f): @cherrypy.expose @functools.wraps(f) def json_handler(self): - return JsonRequest().dispatch(self, f, cherrypy.request.body.read()) + return JsonRequest().dispatch(self, f, requestf=cherrypy.request.body) return json_handler class HttpRequest(object): From b8b37b18a2958994183d586da3f878ecfc0cd118 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 17 Mar 2011 15:06:38 +0100 Subject: [PATCH 072/121] datarecord load bzr revid: al@openerp.com-20110317140638-dgsu44ci48nnpevq --- addons/base/controllers/main.py | 11 +++++++++++ addons/base/static/openerp/js/base_views.js | 6 +++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 4567aa7f3ab..ba32d3fa754 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -177,6 +177,17 @@ class DataSet(openerpweb.Controller): values = m.read(ids, fields) return {'ids': ids, 'values': values} +class DataRecord(openerpweb.Controller): + _cp_path = "/base/datarecord" + @openerpweb.jsonrequest + def load(self,req,model,id,fields): + m = req.session.model(model) + value = {} + r = m.read([id]) + if r: + value = r[0] + return {'value': value} + class FormView(openerpweb.Controller): _cp_path = "/base/formview" @openerpweb.jsonrequest diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js index 3c649d4af6f..d86870005a6 100644 --- a/addons/base/static/openerp/js/base_views.js +++ b/addons/base/static/openerp/js/base_views.js @@ -130,10 +130,10 @@ openerp.base.DataRecord = openerp.base.Controller.extend({ this.values = {}; }, load: function(id) { - // READ + this.rpc("/base/datarecord/load", {"model": this.model, "id": this.id, "fields": "todo"}, this.on_loaded); }, - on_loaded: function() { - // set t this.values = data.rea }, + on_loaded: function(result) { + this.values = result.values; }, on_change: function() { }, From e1ec3c8b3bbc7f8c3de783aa9d64e06f6885d964 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Mar 2011 15:18:13 +0100 Subject: [PATCH 073/121] [FIX] misreading of the spec: the 32099..-32000 range is for *server* errors, not *application* errors bzr revid: xmo@openerp.com-20110317141813-ywn7uize8z04kvee --- openerpweb/openerpweb.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 9b617747728..9e6a8e489ce 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -114,7 +114,7 @@ class JsonRequest(object): result = method(controller, self, **self.parse(request)) except OpenERPUnboundException: error = { - 'code': -32075, + 'code': 1, 'message': "OpenERP Session Invalid", 'data': { 'type': 'session_invalid', @@ -123,7 +123,7 @@ class JsonRequest(object): } except xmlrpclib.Fault, e: error = { - 'code': -32000, + 'code': 25, 'message': "OpenERP Server Error", 'data': { 'type': "server_exception", @@ -134,7 +134,7 @@ class JsonRequest(object): } except Exception: error = { - 'code': -32050, + 'code': 50, 'message': "OpenERP WebClient Error", 'data': { 'type': 'client_exception', From 6e9014a8794ca23e457bf69642e695cbe5ae337c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Mar 2011 15:22:20 +0100 Subject: [PATCH 074/121] [IMP] display all of error.data on RPC error by default, don't display the error object itself bzr revid: xmo@openerp.com-20110317142220-ypr1lvhla6zawydv --- addons/base/static/openerp/js/base_chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js index 3cb6f2f3c89..9a3247b682e 100644 --- a/addons/base/static/openerp/js/base_chrome.js +++ b/addons/base/static/openerp/js/base_chrome.js @@ -197,7 +197,7 @@ openerp.base.Session = openerp.base.BasicController.extend({ }, on_rpc_error: function(error) { // TODO this should use the $element with focus and button is displaying OPW etc... - this.on_log(error, error.message, error.data.type, error.data.debug); + this.on_log(error.message, error.data); }, on_session_invalid: function(contination) { }, From 5f1e8c27c5dcc1facb461b0905121eba8ef12276 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 17 Mar 2011 15:53:21 +0100 Subject: [PATCH 075/121] base_calendar bzr revid: al@openerp.com-20110317145321-bchwp2kw8isof6xx --- addons/base/controllers/main.py | 2 +- addons/base_calendar/__openerp__.py | 55 ++----------------- .../static/openerp/js/base_calendar.js | 28 ++++++++++ 3 files changed, 34 insertions(+), 51 deletions(-) create mode 100644 addons/base_calendar/static/openerp/js/base_calendar.js diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index ba32d3fa754..4da1d06d8e0 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -103,7 +103,7 @@ class Session(openerpweb.Controller): @openerpweb.jsonrequest def modules(self, req): - return {"modules": ["base", "base_hello"]} + return {"modules": ["base", "base_hello", "base_calendar"]} @openerpweb.jsonrequest def csslist(self, req, mods='base,base_hello'): diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 863e0dd9394..44c80ae1a58 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -1,52 +1,7 @@ -# -*- 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" : "Basic Calendar Functionality", - "version" : "1.0", - "depends" : ["base"], - 'description': """Full featured calendar system that supports: - - Calendar of events - - Alerts (create requests) - - Recurring events - - Invitations to people""", - "author" : "OpenERP SA", - 'category': 'Tools', - 'website': 'http://www.openerp.com', - "init_xml" : [ - 'base_calendar_data.xml' - ], - "demo_xml" : [], - "update_xml" : [ - 'security/calendar_security.xml', - 'security/ir.model.access.csv', - 'wizard/calendar_event_edit_all_view.xml', - 'wizard/base_calendar_invite_attendee_view.xml', - 'wizard/base_calendar_set_exrule_view.xml', - 'base_calendar_view.xml' - ], - "test" : ['test/base_calendar_test.yml'], - "installable" : True, - "active" : False, - "certificate" : "00694071962960352821", + "name": "Hello", + "version": "2.0", + "depends": [], + "js": ["static/*/js/*.js"], + "css": [], } - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/base_calendar/static/openerp/js/base_calendar.js b/addons/base_calendar/static/openerp/js/base_calendar.js new file mode 100644 index 00000000000..37c1cd1a8f7 --- /dev/null +++ b/addons/base_calendar/static/openerp/js/base_calendar.js @@ -0,0 +1,28 @@ +/*--------------------------------------------------------- + * OpenERP base_calendar + *---------------------------------------------------------*/ + +openerp.base_calendar = function(openerp) { + +openerp.base_calendar.CalendarView = openerp.base.Controller.extend({ +// Dhtmlx scheduler ? +}); + +//openerp.base.Action = openerp.base.Action.extend({ +// do_action_window: function(action) { +// this._super.apply(this,arguments); +// for(var i = 0; i < action.views.length; i++) { +// if(action.views[i][1] == "calendar") { +// this.calendar_id = action.views[i][0]; +// break; +// } +// } +// // IF there is a view calender +// // if(this.calendar_id +// }, +//}); + +}; + +// DEBUG_RPC:rpc.request:('execute', 'addons-dsh-l10n_us', 1, '*', ('ir.filters', 'get_filters', u'res.partner')) +// vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: From 1d13b61284b1a0c1d697bdac97195465c251fe9c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 17 Mar 2011 16:01:53 +0100 Subject: [PATCH 076/121] login ask for db bzr revid: al@openerp.com-20110317150153-afr9lmsy1ihuafrt --- addons/base/controllers/main.py | 2 +- addons/base/static/openerp/base.xml | 1 + addons/base/static/openerp/js/base_chrome.js | 3 ++- openerpweb/openerpweb.py | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 4da1d06d8e0..88ca61026df 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -94,7 +94,7 @@ class Session(openerpweb.Controller): @openerpweb.jsonrequest def login(self, req, db, login, password): - req.session.login('trunk', login, password) + req.session.login(db, login, password) res = { "session_id" : req.session_id, "uid": req.session._uid, diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml index 1b295cf4cab..e5503729cec 100644 --- a/addons/base/static/openerp/base.xml +++ b/addons/base/static/openerp/base.xml @@ -23,6 +23,7 @@
+ Database:
Login:
Password:
diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js index 32970d00905..446fc113cf6 100644 --- a/addons/base/static/openerp/js/base_chrome.js +++ b/addons/base/static/openerp/js/base_chrome.js @@ -336,11 +336,12 @@ openerp.base.Login = openerp.base.Controller.extend({ on_submit: function(ev) { var self = this; var $e = this.$element; + var db = $e.find("form input[name=db]").val(); var login = $e.find("form input[name=login]").val(); var password = $e.find("form input[name=password]").val(); //$e.hide(); // Should hide then call callback - this.session.session_login("", login, password, function() { + this.session.session_login(db, login, password, function() { if(self.session.session_valid()) { self.on_login_valid(); } else { diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index d427c8bac89..4a795cce903 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -1,6 +1,6 @@ #!/usr/bin/python -import os, re, sys, traceback, xmlrpclib +import optparse, os, re, sys, traceback, xmlrpclib import cherrypy.lib.static import simplejson @@ -226,6 +226,8 @@ class Root(object): default.exposed = True def main(argv): + # optparse + config = { 'server.socket_port': 8002, #'server.socket_host': '64.72.221.48', From e14677f2552b32836e183f1387026fac8b36f1bd Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 17 Mar 2011 16:18:13 +0100 Subject: [PATCH 077/121] dont assume session invalid bzr revid: al@openerp.com-20110317151813-sy7m3oam2nm9nw0h --- addons/base/static/openerp/js/base_chrome.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js index 446fc113cf6..53256f7d260 100644 --- a/addons/base/static/openerp/js/base_chrome.js +++ b/addons/base/static/openerp/js/base_chrome.js @@ -318,7 +318,7 @@ openerp.base.Login = openerp.base.Controller.extend({ }, start: function() { this.$element.html(QWeb.render("Login", {})); - this.on_login_invalid(); + //this.on_login_invalid(); this.$element.find("form").submit(this.on_submit); }, on_login_invalid: function() { From 5298cde9533c26558e01602754b4a40a66241dbf Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Mar 2011 16:59:14 +0100 Subject: [PATCH 078/121] [FIX] content-type of JSON-RPC2 responses bzr revid: xmo@openerp.com-20110317155914-rh3w4puch88o2h77 --- openerpweb/openerpweb.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 3d0db1cea14..41a50dfa306 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -148,7 +148,11 @@ class JsonRequest(object): print "<--", response print - return simplejson.dumps(response) + + content = simplejson.dumps(response) + cherrypy.response.headers['Content-Type'] = 'application/json' + cherrypy.response.headers['Content-Length'] = len(content) + return content def jsonrequest(f): @cherrypy.expose From 20b55e10c10142636ecb6232b3faec2622cd4e8e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 17 Mar 2011 17:01:24 +0100 Subject: [PATCH 079/121] [IMP] redirect to root page instead of providing a link bzr revid: xmo@openerp.com-20110317160124-9a9fde1cqimct59a --- openerpweb/openerpweb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py index 41a50dfa306..19d082f0f60 100644 --- a/openerpweb/openerpweb.py +++ b/openerpweb/openerpweb.py @@ -249,7 +249,7 @@ class Root(object): return m(**kw) else: - return '/base/static/openerp/base.html' + raise cherrypy.HTTPRedirect('/base/static/openerp/base.html', 301) default.exposed = True def main(argv): From 38c3d7c344c005a73a4e2f9ef147ef1590ad807e Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 17 Mar 2011 17:13:56 +0100 Subject: [PATCH 080/121] [ADD] datarecord plugged to formview part1 bzr revid: fme@openerp.com-20110317161356-b9qxxj227anuz5lr --- addons/base/static/openerp/js/base_views.js | 38 ++++++++++++--------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/addons/base/static/openerp/js/base_views.js b/addons/base/static/openerp/js/base_views.js index d86870005a6..a81fac92e80 100644 --- a/addons/base/static/openerp/js/base_views.js +++ b/addons/base/static/openerp/js/base_views.js @@ -125,15 +125,16 @@ openerp.base.DataRecord = openerp.base.Controller.extend({ init: function(session, model, fields) { this._super(session, null); this.model = model; - this.id = id; + this.id = null; this.fields = fields; this.values = {}; }, load: function(id) { - this.rpc("/base/datarecord/load", {"model": this.model, "id": this.id, "fields": "todo"}, this.on_loaded); + this.id = id; + this.rpc("/base/datarecord/load", {"model": this.model, "id": id, "fields": "todo"}, this.on_loaded); }, on_loaded: function(result) { - this.values = result.values; + this.values = result.value; }, on_change: function() { }, @@ -237,7 +238,7 @@ openerp.base.FormView = openerp.base.Controller.extend({ this.$element.html(QWeb.render("FormView", { "frame": frame, "view": this })); for (var i in this.widgets) { - this.widgets[i].register(); + this.widgets[i].start(); } // bind to all wdigets that have onchange ?? @@ -246,7 +247,7 @@ openerp.base.FormView = openerp.base.Controller.extend({ // When a datarecord is loaded display the values in the inputs this.datarecord = new openerp.base.DataRecord(this.session, this.model,{}); - this.datarecord.on_loaded.add(this.on_record_loaded); + this.datarecord.on_loaded.add_last(this.on_record_loaded); }, do_load_record: function() { @@ -257,7 +258,9 @@ openerp.base.FormView = openerp.base.Controller.extend({ this.datarecord.load(this.dataset.ids[this.dataset_index]); }, on_record_loaded: function() { - //for i in this.fields: f.update_from_datarecord() + for (var f in this.fields) { + this.fields[f].update_from_datarecord() + } }, }); @@ -357,12 +360,6 @@ openerp.base.Widget = openerp.base.Controller.extend({ this.node = node; this.children = node.children; this.colspan = parseInt(node.attrs.colspan || 1); - if (node.tag == 'field') { - this.view.fields[node.attrs.name] = this; - if (node.attrs.nolabel != '1' && this.colspan > 1) { - this.colspan--; - } - } this.field = view.fields_view.fields[node.attrs.name]; this.template = "FormView.widget"; @@ -371,9 +368,9 @@ openerp.base.Widget = openerp.base.Controller.extend({ this.help = node.attrs.help || (this.field ? this.field.help : undefined); this.nolabel = (node.attrs.nolabel == '1'); }, - register: function() { + start: function() { + console.log("jquery", this.element_id) this.$element = $('#' + this.element_id); - return this; }, render: function() { var template = this.template; @@ -492,7 +489,16 @@ openerp.base.WidgetButton = openerp.base.Widget.extend({ openerp.base.Field = openerp.base.Widget.extend({ init: function(session, element_id, view, node) { this._super(session, element_id, view, node); + this.view.fields[node.attrs.name] = this; + if (node.attrs.nolabel != '1' && this.colspan > 1) { + this.colspan--; + } // this.datarecord = this.view.datarecord ?? + }, + update_from_datarecord: function() { + this.set_value(); // ???? + }, + set_value: function() { } }); @@ -503,14 +509,14 @@ openerp.base.FieldChar = openerp.base.Field.extend({ }, start: function() { + this._super.apply(this, arguments); // this.$element.bind('leaving_focus',) }, set_value: function() { - // this.$element.val(this.view.datarecord.values[this.name]) + this.$element.val(this.view.datarecord.values[this.name]); }, on_change: function() { //this.view.update_field(this.name,value); - }, }); From 4504ea1ca22e5eeb3ed6b9f7c42bac6f25f3500c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 17 Mar 2011 17:27:00 +0100 Subject: [PATCH 081/121] on_log temporary back to session bzr revid: al@openerp.com-20110317162700-tv0iq7a9us986i9o --- addons/base/static/openerp/js/base_chrome.js | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js index dedab94eeab..3685d64e860 100644 --- a/addons/base/static/openerp/js/base_chrome.js +++ b/addons/base/static/openerp/js/base_chrome.js @@ -105,18 +105,6 @@ openerp.base.Console = openerp.base.BasicController.extend({ init: function(element_id, server, port) { this._super(element_id); }, - on_log: function() { - // TODO this should move to Console and be active only in debug - // TODO $element should be for error not log - var self = this; - this._super.apply(this,arguments); - $.each(arguments, function(i,v) { - if(self.$element) { - v = v==null ? "null" : v; - $('
').text(v.toString()).appendTo(self.$element);
-            }
-        });
-    }
 });
 
 openerp.base.Database = openerp.base.BasicController.extend({
@@ -139,6 +127,18 @@ openerp.base.Session = openerp.base.BasicController.extend({
         this.module_loaded = {"base": true};
         this.context = {};
     },
+    on_log: function() {
+        // TODO this should move to Console and be active only in debug
+        // TODO $element should be for error not log
+        var self = this;
+        this._super.apply(this,arguments);
+        $.each(arguments, function(i,v) {
+            if(self.$element) {
+                v = v==null ? "null" : v;
+                $('
').text(v.toString()).appendTo(self.$element);
+            }
+        });
+    },
     rpc: function(url, params, success_callback, error_callback) {
         // Construct a JSON-RPC2 request, method is currently unused
         params.session_id = this.session_id;

From c27fc11c2f4f735731fbb7370c25a26080119a71 Mon Sep 17 00:00:00 2001
From: Antony Lesuisse 
Date: Thu, 17 Mar 2011 18:08:08 +0100
Subject: [PATCH 082/121] fix console.log

bzr revid: al@openerp.com-20110317170808-lwqxymfye4obfssg
---
 addons/base/static/openerp/js/base_chrome.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js
index 3685d64e860..b336f0144b5 100644
--- a/addons/base/static/openerp/js/base_chrome.js
+++ b/addons/base/static/openerp/js/base_chrome.js
@@ -95,7 +95,8 @@ openerp.base.BasicController = Class.extend({
         this.on_log.apply(this,args);
     },
     on_log: function() {
-        console.log(arguments);
+        if(window.console)
+            console.log(arguments);
     },
     on_ready: function() {
     }

From 9943d2e9c2037c39183a813536c3b7cbc338b727 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Thu, 17 Mar 2011 18:11:51 +0100
Subject: [PATCH 083/121] [FIX] forgotten rename

bzr revid: xmo@openerp.com-20110317171151-fn44gv41scophjlw
---
 addons/base/static/openerp/js/base_chrome.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js
index dedab94eeab..2b09b31454f 100644
--- a/addons/base/static/openerp/js/base_chrome.js
+++ b/addons/base/static/openerp/js/base_chrome.js
@@ -171,7 +171,7 @@ openerp.base.Session = openerp.base.BasicController.extend({
                     if (response.error.data.type == "session_invalid") {
                         self.uid = false;
                         self.on_session_invalid(function() {
-                            self.rpc(url, params, success_callback, error_callback);
+                            self.rpc(url, payload, success_callback, error_callback);
                         });
                     } else {
                         error_callback(response.error);
@@ -319,7 +319,6 @@ openerp.base.Login =  openerp.base.Controller.extend({
     },
     start: function() {
         this.$element.html(QWeb.render("Login", {}));
-        //this.on_login_invalid();
         this.$element.find("form").submit(this.on_submit);
     },
     on_login_invalid: function() {
@@ -335,6 +334,7 @@ openerp.base.Login =  openerp.base.Controller.extend({
         $e.hide();
     },
     on_submit: function(ev) {
+        ev.preventDefault();
         var self = this;
         var $e = this.$element;
         var db = $e.find("form input[name=db]").val();
@@ -349,7 +349,6 @@ openerp.base.Login =  openerp.base.Controller.extend({
                 self.on_login_invalid();
             }
         });
-        return false;
     },
     do_ask_login: function(continuation) {
         this.on_login_invalid();

From 38f62edbdca3805c5a9cf786f789c80fa777a0f4 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Thu, 17 Mar 2011 18:14:01 +0100
Subject: [PATCH 084/121] [FIX] correctly generate independent sessions

bzr revid: xmo@openerp.com-20110317171401-3qekzs59ue5tlywx
---
 openerpweb/openerpweb.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openerpweb/openerpweb.py b/openerpweb/openerpweb.py
index 19d082f0f60..2ec37af093c 100644
--- a/openerpweb/openerpweb.py
+++ b/openerpweb/openerpweb.py
@@ -2,6 +2,7 @@
 import functools
 
 import optparse, os, re, sys, traceback, xmlrpclib
+import uuid
 
 import cherrypy
 import cherrypy.lib.static
@@ -84,7 +85,7 @@ class JsonRequest(object):
 
     def parse(self, request):
         self.params = request.get("params",{})
-        self.session_id = self.params.pop("session_id", None) or "random.random"
+        self.session_id = self.params.pop("session_id", None) or uuid.uuid4().hex
         self.session = session_store.setdefault(self.session_id, OpenERPSession())
         self.context = self.params.pop('context', None)
         return self.params

From 6cab13279a3823c076dc8babdf4c712bca331cc5 Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Thu, 17 Mar 2011 18:14:03 +0100
Subject: [PATCH 085/121] [FIX] inline temporary variable

bzr revid: xmo@openerp.com-20110317171403-s1p00g5omgix01uu
---
 addons/base/controllers/main.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 88ca61026df..0f44c9b860d 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -95,11 +95,10 @@ class Session(openerpweb.Controller):
     @openerpweb.jsonrequest
     def login(self, req, db, login, password):
         req.session.login(db, login, password)
-        res = {
+        return {
             "session_id" : req.session_id,
             "uid": req.session._uid,
         }
-        return res
 
     @openerpweb.jsonrequest
     def modules(self, req):

From cd09d946d2df2c0d025ec0e193c90e87fafea1eb Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Thu, 17 Mar 2011 18:16:22 +0100
Subject: [PATCH 086/121] [FIX] loading modules should not nuke the login that
 has just been performed

bzr revid: xmo@openerp.com-20110317171622-ioebt4sbpmxkkpoc
---
 addons/base/static/openerp/js/base_chrome.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js
index 2b09b31454f..3a7f590c55b 100644
--- a/addons/base/static/openerp/js/base_chrome.js
+++ b/addons/base/static/openerp/js/base_chrome.js
@@ -229,7 +229,6 @@ openerp.base.Session = openerp.base.BasicController.extend({
             self.rpc('/base/session/jslist', {"mods": self.module_list.join(',')}, self.debug ? self.do_session_load_modules_debug : self.do_session_load_modules_prod);
             openerp._modules_loaded = true;
         });
-        this.uid = false;
     },
     do_session_load_modules_debug: function(result) {
         var self = this;

From 8699e1c85cf478debf4d5af4ee8bf345e18d2c0d Mon Sep 17 00:00:00 2001
From: Xavier Morel 
Date: Thu, 17 Mar 2011 18:18:55 +0100
Subject: [PATCH 087/121] [FIX] class on login form when not logged in is
 login_invalid

bzr revid: xmo@openerp.com-20110317171855-4ovpe64wnp7qzeqv
---
 addons/base/static/openerp/js/base_chrome.js | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js
index 3a7f590c55b..2392ec3250e 100644
--- a/addons/base/static/openerp/js/base_chrome.js
+++ b/addons/base/static/openerp/js/base_chrome.js
@@ -321,16 +321,16 @@ openerp.base.Login =  openerp.base.Controller.extend({
         this.$element.find("form").submit(this.on_submit);
     },
     on_login_invalid: function() {
-        var $e = this.$element;
-        $e.removeClass("login_valid");
-        $e.addClass("login_invalid");
-        $e.show();
+        this.$element
+            .removeClass("login_valid")
+            .addClass("login_invalid")
+            .show();
     },
     on_login_valid: function() {
-        var $e = this.$element;
-        $e.removeClass("oe_login_invalid");
-        $e.addClass("login_valid");
-        $e.hide();
+        this.$element
+            .addClass("login_valid")
+            .removeClass("login_invalid")
+            .hide();
     },
     on_submit: function(ev) {
         ev.preventDefault();

From 8daad6a2ecaf02c7c3af6fbe32fd2046d74194f6 Mon Sep 17 00:00:00 2001
From: Fabien Meghazi 
Date: Thu, 17 Mar 2011 18:25:08 +0100
Subject: [PATCH 088/121] Refactoring

bzr revid: fme@openerp.com-20110317172508-fb1yxc1bcunqm2gt
---
 addons/base/static/openerp/base.xml         |  76 +++------
 addons/base/static/openerp/js/base_views.js | 166 ++++++++++----------
 2 files changed, 102 insertions(+), 140 deletions(-)

diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index e5503729cec..a8ac9d40cde 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -94,46 +94,6 @@
     
     

 
-
-    

-    

-        
-        
-        0 / 0
-        
-        
-    

-    
-        
-    
-    

-        
-    

-
-
-    
-    
-        
-        
-        
-        

-    
-    
-        
-    
-
 
     

     

@@ -148,11 +108,11 @@
         
     

 
-
+
     Unhandled widget
     
 
-
+
     
@@ -166,7 +126,7 @@
     

     

         

     

 
-
+
     
         

             
@@ -174,31 +134,31 @@
         

     
 
-
+
     

         
     

 
-
-