From 744bfb8cc170cad94895a93409916c4624f36eec Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Wed, 24 Mar 2010 17:37:24 +0100 Subject: [PATCH 01/98] [IMP] wording: "children" intead of "childs" lp bug: https://launchpad.net/bugs/327259 fixed bzr revid: ls@numerigraphe.fr-20100324163724-q1xe1ozomk23k17j --- addons/account/account.py | 6 +++--- addons/account/account_assert_test.xml | 4 ++-- addons/account/report/general_ledger.py | 4 ++-- addons/account/report/general_ledger_landscape.py | 4 ++-- addons/account/wizard/wizard_move_line_select.py | 2 +- addons/account_report/report/accounting_report.py | 2 +- addons/account_report/report/accounting_report.rml | 2 +- addons/analytic/project.py | 4 ++-- .../wizard/tiny_sxw2rml/tiny_sxw2rml.py | 4 ++-- addons/caldav/DAV/davcmd.py | 2 +- addons/caldav/DAV/iface.py | 2 +- addons/caldav/DAV/propfind.py | 4 ++-- addons/caldav/DAV/utils.py | 12 ++++++------ addons/document/document_directory.py | 2 +- addons/document_ftp/ftpserver/abstracted_fs.py | 4 ++-- addons/document_webdav/DAV/davcmd.py | 2 +- addons/document_webdav/DAV/iface.py | 2 +- addons/document_webdav/DAV/propfind.py | 4 ++-- addons/document_webdav/DAV/utils.py | 12 ++++++------ addons/document_webdav/dav_fs.py | 6 +++--- addons/hr/hr_department.py | 12 ++++++------ addons/product/i18n/ar.po | 2 +- addons/product/i18n/bg.po | 2 +- addons/product/i18n/bs.po | 2 +- addons/product/i18n/ca.po | 2 +- addons/product/i18n/cs.po | 2 +- addons/product/i18n/de.po | 2 +- addons/product/i18n/el.po | 2 +- addons/product/i18n/es.po | 2 +- addons/product/i18n/es_AR.po | 2 +- addons/product/i18n/et.po | 2 +- addons/product/i18n/fi.po | 2 +- addons/product/i18n/fr.po | 2 +- addons/product/i18n/hr.po | 2 +- addons/product/i18n/hu.po | 2 +- addons/product/i18n/id.po | 2 +- addons/product/i18n/it.po | 2 +- addons/product/i18n/ko.po | 2 +- addons/product/i18n/lt.po | 2 +- addons/product/i18n/lv.po | 2 +- addons/product/i18n/nb.po | 2 +- addons/product/i18n/nb_NB.po | 2 +- addons/product/i18n/nl.po | 2 +- addons/product/i18n/nl_BE.po | 2 +- addons/product/i18n/pl.po | 2 +- addons/product/i18n/product.pot | 2 +- addons/product/i18n/pt.po | 2 +- addons/product/i18n/pt_BR.po | 2 +- addons/product/i18n/ro.po | 2 +- addons/product/i18n/ru.po | 2 +- addons/product/i18n/sk.po | 2 +- addons/product/i18n/sl.po | 2 +- addons/product/i18n/sq.po | 4 ++-- addons/product/i18n/sr.po | 2 +- addons/product/i18n/sv.po | 2 +- addons/product/i18n/tlh.po | 2 +- addons/product/i18n/tr.po | 2 +- addons/product/i18n/uk.po | 2 +- addons/product/i18n/vi.po | 2 +- addons/product/i18n/zh_CN.po | 2 +- addons/product/i18n/zh_TW.po | 2 +- addons/product/pricelist.py | 2 +- addons/stock/i18n/ar.po | 2 +- addons/stock/i18n/bg.po | 2 +- addons/stock/i18n/bs.po | 2 +- addons/stock/i18n/ca.po | 2 +- addons/stock/i18n/cs.po | 2 +- addons/stock/i18n/de.po | 2 +- addons/stock/i18n/el.po | 2 +- addons/stock/i18n/es.po | 2 +- addons/stock/i18n/es_AR.po | 2 +- addons/stock/i18n/et.po | 2 +- addons/stock/i18n/fi.po | 2 +- addons/stock/i18n/fr.po | 2 +- addons/stock/i18n/hr.po | 2 +- addons/stock/i18n/hu.po | 2 +- addons/stock/i18n/id.po | 2 +- addons/stock/i18n/it.po | 2 +- addons/stock/i18n/ko.po | 2 +- addons/stock/i18n/lt.po | 2 +- addons/stock/i18n/nl.po | 2 +- addons/stock/i18n/nl_BE.po | 2 +- addons/stock/i18n/pl.po | 2 +- addons/stock/i18n/pt.po | 2 +- addons/stock/i18n/pt_BR.po | 2 +- addons/stock/i18n/ro.po | 2 +- addons/stock/i18n/ru.po | 2 +- addons/stock/i18n/sl.po | 2 +- addons/stock/i18n/sq.po | 4 ++-- addons/stock/i18n/sr.po | 2 +- addons/stock/i18n/stock.pot | 2 +- addons/stock/i18n/sv.po | 2 +- addons/stock/i18n/th.po | 2 +- addons/stock/i18n/th_TH.po | 2 +- addons/stock/i18n/tlh.po | 2 +- addons/stock/i18n/tr.po | 2 +- addons/stock/i18n/uk.po | 2 +- addons/stock/i18n/vi.po | 4 ++-- addons/stock/i18n/zh_CN.po | 2 +- addons/stock/i18n/zh_TW.po | 2 +- addons/stock/wizard/wizard_inventory.py | 2 +- addons/wiki/wiki_view.xml | 4 ++-- addons/wiki/wizard/open_page.py | 2 +- 103 files changed, 134 insertions(+), 134 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 12868487c49..2bb7165eb4d 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -176,7 +176,7 @@ class account_account(osv.osv): args[pos] = ('id', 'in', ids1) pos += 1 - if context and context.has_key('consolidate_childs'): #add consolidated childs of accounts + if context and context.has_key('consolidate_children'): #add consolidated children of accounts ids = super(account_account, self).search(cr, uid, args, offset, limit, order, context=context, count=count) for consolidate_child in self.browse(cr, uid, context['account_id']).child_consol_ids: @@ -1456,7 +1456,7 @@ class account_tax(osv.osv): RETURN: [ tax ] tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2} - one tax for each tax id in IDS and their childs + one tax for each tax id in IDS and their children """ res = self._unit_compute(cr, uid, taxes, price_unit, address_id, product, partner, quantity) total = 0.0 @@ -1553,7 +1553,7 @@ class account_tax(osv.osv): RETURN: [ tax ] tax = {'name':'', 'amount':0.0, 'account_collected_id':1, 'account_paid_id':2} - one tax for each tax id in IDS and their childs + one tax for each tax id in IDS and their children """ res = self._unit_compute_inv(cr, uid, taxes, price_unit, address_id, product, partner=None) total = 0.0 diff --git a/addons/account/account_assert_test.xml b/addons/account/account_assert_test.xml index 585c6bda124..bb497328082 100644 --- a/addons/account/account_assert_test.xml +++ b/addons/account/account_assert_test.xml @@ -6,8 +6,8 @@ - - - wiki.wiki.tree.childs + + wiki.wiki.tree.children wiki.wiki tree child_ids diff --git a/addons/wiki/wizard/open_page.py b/addons/wiki/wizard/open_page.py index df015f5c5a0..626deaa3780 100644 --- a/addons/wiki/wizard/open_page.py +++ b/addons/wiki/wizard/open_page.py @@ -49,7 +49,7 @@ class wiz_open_page(wizard.interface): value['view_type'] = 'form' value['view_mode'] = 'tree,form' elif group.method == 'tree': - view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.childs')]) + view_id = pool.get('ir.ui.view').search(cr, uid, [('name','=','wiki.wiki.tree.children')]) value['view_id'] = view_id value['domain'] = [('group_id','=',group.id),('parent_id','=',False)] value['view_type'] = 'tree' From c1cb4b70d0b9c8df7dffa8706070ae682b5004f4 Mon Sep 17 00:00:00 2001 From: Numerigraphe - Lionel Sausin Date: Mon, 25 Oct 2010 10:48:51 +0200 Subject: [PATCH 02/98] [IMP] wording: children intead of childs (again) bzr revid: ls@numerigraphe.fr-20101025084851-3ri17e8ct5x7lue0 --- addons/auction/auction.py | 2 +- addons/auction/i18n/auction.pot | 2 +- addons/document_webdav/dav_fs.py | 4 ++-- addons/hr_evaluation/hr_evaluation.py | 10 +++++----- addons/product/i18n/el.po | 2 +- addons/product/i18n/es_EC.po | 2 +- addons/product/i18n/eu.po | 2 +- addons/product/i18n/fi.po | 2 +- addons/product/i18n/ko.po | 2 +- addons/product/i18n/mn.po | 2 +- addons/product/i18n/nb.po | 2 +- addons/product/i18n/vi.po | 2 +- addons/project_planning/project_planning.py | 12 ++++++------ addons/stock/i18n/es_EC.po | 2 +- addons/stock/i18n/mn.po | 2 +- addons/stock/test/stock_report.yml | 2 +- addons/wiki/wiki.py | 2 +- addons/wiki/wizard/wiki_create_menu.py | 2 +- 18 files changed, 28 insertions(+), 28 deletions(-) diff --git a/addons/auction/auction.py b/addons/auction/auction.py index 870194fa125..20090def512 100644 --- a/addons/auction/auction.py +++ b/addons/auction/auction.py @@ -190,7 +190,7 @@ class aie_category(osv.osv): 'name': fields.char('Name', size=64, required=True), 'code':fields.char('Code', size=64), 'parent_id': fields.many2one('aie.category', 'Parent aie Category', ondelete='cascade'), - 'child_ids': fields.one2many('aie.category', 'parent_id', help="Childs aie category") + 'child_ids': fields.one2many('aie.category', 'parent_id', help="children aie category") } def name_get(self, cr, uid, ids, context=None): diff --git a/addons/auction/i18n/auction.pot b/addons/auction/i18n/auction.pot index 8c8e0dc2a96..ba25f39b356 100644 --- a/addons/auction/i18n/auction.pot +++ b/addons/auction/i18n/auction.pot @@ -1461,7 +1461,7 @@ msgstr "" #. module: auction #: help:aie.category,child_ids:0 -msgid "Childs aie category" +msgid "children aie category" msgstr "" #. module: auction diff --git a/addons/document_webdav/dav_fs.py b/addons/document_webdav/dav_fs.py index 5d7fa2b5ec6..6b2a204b12f 100644 --- a/addons/document_webdav/dav_fs.py +++ b/addons/document_webdav/dav_fs.py @@ -307,7 +307,7 @@ class openerp_dav_handler(dav_interface): fp = node.full_path() if fp and len(fp): fp = '/'.join(fp) - self.parent.log_message('childs for: %s' % fp) + self.parent.log_message('children for: %s' % fp) else: fp = None domain = None @@ -345,7 +345,7 @@ class openerp_dav_handler(dav_interface): except DAV_Error: raise except Exception, e: - self.parent.log_error("cannot get_childs: "+ str(e)) + self.parent.log_error("cannot get_children: "+ str(e)) raise finally: if cr: cr.close() diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py index a8b2a3e2c69..e8066a7299f 100644 --- a/addons/hr_evaluation/hr_evaluation.py +++ b/addons/hr_evaluation/hr_evaluation.py @@ -211,15 +211,15 @@ class hr_evaluation(osv.osv): for evaluation in self.browse(cr, uid, ids, context=context): wait = False for phase in evaluation.plan_id.phase_ids: - childs = [] + children = [] if phase.action == "bottom-up": - childs = evaluation.employee_id.child_ids + children = evaluation.employee_id.child_ids elif phase.action in ("top-down", "final"): if evaluation.employee_id.parent_id: - childs = [evaluation.employee_id.parent_id] + children = [evaluation.employee_id.parent_id] elif phase.action == "self": - childs = [evaluation.employee_id] - for child in childs: + children = [evaluation.employee_id] + for child in children: # if not child.user_id: # continue diff --git a/addons/product/i18n/el.po b/addons/product/i18n/el.po index 726b4b10daf..e6deaabe800 100644 --- a/addons/product/i18n/el.po +++ b/addons/product/i18n/el.po @@ -1927,7 +1927,7 @@ msgstr "Έκπτωση Τιμής" #~ "αποθηκευόμενα προϊόντα με απεριόριστο στόκ ή χωρίς διαχείριση αποθήκευσης " #~ "στο σύστημα." -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "Υποκατηγορίες" #~ msgid "" diff --git a/addons/product/i18n/es_EC.po b/addons/product/i18n/es_EC.po index 4a86e904af0..d15982674be 100644 --- a/addons/product/i18n/es_EC.po +++ b/addons/product/i18n/es_EC.po @@ -1749,7 +1749,7 @@ msgstr "Cantidad mín." #: help:product.pricelist.item,categ_id:0 msgid "" "Set a category of product if this rule only apply to products of a category " -"and his childs. Keep empty for all products" +"and his children. Keep empty for all products" msgstr "" "Indicar una categoría de producto si esta regla sólo se aplica a productos " "de una categoría y a sus descendientes. Dejarlo vacío para todos los " diff --git a/addons/product/i18n/eu.po b/addons/product/i18n/eu.po index f01bcd3abda..5ea59fb6dd2 100644 --- a/addons/product/i18n/eu.po +++ b/addons/product/i18n/eu.po @@ -1675,7 +1675,7 @@ msgstr "Kopuru Minimoa" #: help:product.pricelist.item,categ_id:0 msgid "" "Set a category of product if this rule only apply to products of a category " -"and his childs. Keep empty for all products" +"and his children. Keep empty for all products" msgstr "" #. module: product diff --git a/addons/product/i18n/fi.po b/addons/product/i18n/fi.po index b46d2160e96..4cdc4ed2849 100644 --- a/addons/product/i18n/fi.po +++ b/addons/product/i18n/fi.po @@ -1808,7 +1808,7 @@ msgstr "Hinnanalennus" #~ "tuotteita joilla on loppumaton varasto, tai ne ovat järjestelmässä ilman " #~ "varastonhallintaa." -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "Alakategoriat" #~ msgid "You can not have 2 pricelist version that overlaps!" diff --git a/addons/product/i18n/ko.po b/addons/product/i18n/ko.po index 82ba1557ac2..09f2388f102 100644 --- a/addons/product/i18n/ko.po +++ b/addons/product/i18n/ko.po @@ -1744,7 +1744,7 @@ msgstr "가격 할인" #~ msgid "Rentable product" #~ msgstr "대여 가능한 상품" -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "차일드 카테고리" #~ msgid "Price Max. Margin" diff --git a/addons/product/i18n/mn.po b/addons/product/i18n/mn.po index da9bb9f8b4a..4247b7290c0 100644 --- a/addons/product/i18n/mn.po +++ b/addons/product/i18n/mn.po @@ -1735,7 +1735,7 @@ msgstr "Хамгийн бага тоо" #: help:product.pricelist.item,categ_id:0 msgid "" "Set a category of product if this rule only apply to products of a category " -"and his childs. Keep empty for all products" +"and his children. Keep empty for all products" msgstr "" "Энэ дүрэм үйлчлэх барааны ангиллыг сонгоно. Хэрэв бүх бараанд хамаатай бол " "хоосон орхино." diff --git a/addons/product/i18n/nb.po b/addons/product/i18n/nb.po index 8f242661526..57faa736d86 100644 --- a/addons/product/i18n/nb.po +++ b/addons/product/i18n/nb.po @@ -1712,7 +1712,7 @@ msgstr "" #~ "ferdigstillingen av det ferdige produktet. Dette er tiden du lover deg til " #~ "ovenfor kunden." -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "Barnekategori" #~ msgid "Price Min. Margin" diff --git a/addons/product/i18n/vi.po b/addons/product/i18n/vi.po index d895f25efde..29d295e4965 100644 --- a/addons/product/i18n/vi.po +++ b/addons/product/i18n/vi.po @@ -1727,7 +1727,7 @@ msgstr "Giảm giá" #~ msgid "Rentable product" #~ msgstr "Sản phẩm có thể cho thuê" -#~ msgid "Childs Categories" +#~ msgid "children Categories" #~ msgstr "Danh mục con" #~ msgid "Price Max. Margin" diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py index 759057fbaef..c36bd9eb594 100644 --- a/addons/project_planning/project_planning.py +++ b/addons/project_planning/project_planning.py @@ -68,12 +68,12 @@ class report_account_analytic_planning(osv.osv): ids_dept = obj_dept.search(cr, uid, [('id', 'child_of', mgnt_dept_ids)], context=context) if ids_dept: data_dept = obj_dept.read(cr, uid, ids_dept, ['member_ids'], context=context) - childs = map(lambda x: x['member_ids'], data_dept) - childs = tools.flatten(childs) - childs = obj_user.search(cr, uid, [('id', 'in', childs),('active', '=', True)], context=context) - if user_id in childs: - childs.remove(user_id) - child_ids.extend(tools.flatten(childs)) + children = map(lambda x: x['member_ids'], data_dept) + children = tools.flatten(children) + children = obj_user.search(cr, uid, [('id', 'in', children),('active', '=', True)], context=context) + if user_id in children: + children.remove(user_id) + child_ids.extend(tools.flatten(children)) set = {} map(set.__setitem__, child_ids, []) child_ids = set.keys() diff --git a/addons/stock/i18n/es_EC.po b/addons/stock/i18n/es_EC.po index ac5aab45c8e..f6b7ad99c70 100644 --- a/addons/stock/i18n/es_EC.po +++ b/addons/stock/i18n/es_EC.po @@ -359,7 +359,7 @@ msgstr "Líneas movimiento" #. module: stock #: wizard_field:stock.fill_inventory,init,recursive:0 -msgid "Include all childs for the location" +msgid "Include all children for the location" msgstr "Incluir todos los descendientes de la ubicación" #. module: stock diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po index 33e60ea3573..70d9d21bb1b 100644 --- a/addons/stock/i18n/mn.po +++ b/addons/stock/i18n/mn.po @@ -359,7 +359,7 @@ msgstr "Шилжих шугамууд" #. module: stock #: wizard_field:stock.fill_inventory,init,recursive:0 -msgid "Include all childs for the location" +msgid "Include all children for the location" msgstr "" #. module: stock diff --git a/addons/stock/test/stock_report.yml b/addons/stock/test/stock_report.yml index f6bcd60ad5e..41acade696a 100644 --- a/addons/stock/test/stock_report.yml +++ b/addons/stock/test/stock_report.yml @@ -1,5 +1,5 @@ - - In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(childs) report + In order to test the PDF reports defined on a stock, we will print a Stock Overviewall(children) report - !python {model: stock.location}: | import netsvc, tools, os diff --git a/addons/wiki/wiki.py b/addons/wiki/wiki.py index 2d814485a7c..d05121a3a70 100644 --- a/addons/wiki/wiki.py +++ b/addons/wiki/wiki.py @@ -88,7 +88,7 @@ class wiki_group(osv.osv): value['view_type'] = 'form' value['view_mode'] = 'tree,form' elif group.method == 'tree': - view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')]) + view_id = self.pool.get('ir.ui.view').search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')]) value['view_id'] = view_id value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)] value['view_type'] = 'tree' diff --git a/addons/wiki/wizard/wiki_create_menu.py b/addons/wiki/wizard/wiki_create_menu.py index 7cee4f88e96..cc0cea87ec5 100644 --- a/addons/wiki/wizard/wiki_create_menu.py +++ b/addons/wiki/wizard/wiki_create_menu.py @@ -70,7 +70,7 @@ class wiki_create_menu(osv.osv_memory): value['view_type'] = 'form' value['view_mode'] = 'tree,form' elif group.method == 'tree': - view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.childs')]) + view_id = obj_view.search(cr, uid, [('name', '=', 'wiki.wiki.tree.children')]) value['view_id'] = view_id value['domain'] = [('group_id', '=', group.id), ('parent_id', '=', False)] value['view_type'] = 'tree' From 59d536d5ce21dac3613fb063cd4cd8cfe7d54dfb Mon Sep 17 00:00:00 2001 From: Nguyen Thanh Phong Date: Sat, 27 Nov 2010 15:00:09 +0700 Subject: [PATCH 03/98] Add additional currency codes for VND and other currencies that have direct reference rates from ECB (http://www.ecb.int/stats/exchange/eurofxref/html/index.en.html) VND doesn't have direct exchange rate from ECB, so the exchange rate for VND was picked up from Vietcombank, the de-factor foreign exchange rate for commercial activities bzr revid: phongnt@phongnt-laptop-20101127080009-0bb6wjrcbqh5llv3 --- bin/addons/base/base_data.xml | 253 ++++++++++++++++++++++++++++++++++ 1 file changed, 253 insertions(+) diff --git a/bin/addons/base/base_data.xml b/bin/addons/base/base_data.xml index 143d2e26b07..df05005c504 100644 --- a/bin/addons/base/base_data.xml +++ b/bin/addons/base/base_data.xml @@ -1374,6 +1374,259 @@ + + + VND + VND + ₫ + 0.01 + 4 + + + + 26330.01 + + + + + + HKD + HKD + $ + 0.01 + 4 + + + + 11.1608 + + + + + + JPY + JPY + ¥ + 0.01 + 4 + + + + 133.62 + + + + + + BGN + BGN + лв + 0.01 + 4 + + + + 1.9558 + + + + + + EEK + EEK + kr + 0.01 + 4 + + + + 15.6466 + + + + + + LTL + LTL + Lt + 0.01 + 4 + + + + 3.4528 + + + + + + RON + RON + kr + 0.01 + 4 + + + + 4.2253 + + + + + + HRK + HRK + kn + 0.01 + 4 + + + + 7.2936 + + + + + + RUB + RUB + руб + 0.01 + 4 + + + + 43.16 + + + + + + TRY + TRY + TL + 0.01 + 4 + + + + 2.1411 + + + + + + KRW + KRW + ₩ + 0.01 + 4 + + + + 1662.37 + + + + + + MXN + MXN + $ + 0.01 + 4 + + + + 18.6664 + + + + + + MYR + MYR + RM + 0.01 + 4 + + + + 4.8887 + + + + + + NZD + NZD + $ + 0.01 + 4 + + + + 1.9764 + + + + + + PHP + PHP + Php + 0.01 + 4 + + + + 66.1 + + + + + + SGD + SGD + $ + 0.01 + 4 + + + + 2.0126 + + + + + + THB + THB + ฿ + 0.01 + 4 + + + + 47.779 + + + + + + ZAR + ZAR + R + 0.01 + 4 + + + + 10.5618 + + + + Reserve RSV From f84571fb57a5fb0ef57612d75f5e51acdf93561c Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Fri, 17 Dec 2010 18:22:57 +0530 Subject: [PATCH 04/98] [IMP] Account: Improve general ledger report bzr revid: ara@tinyerp.com-20101217125257-mrgovwfjs09jdgyb --- addons/account/report/account_general_ledger.rml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/addons/account/report/account_general_ledger.rml b/addons/account/report/account_general_ledger.rml index ae47873a294..d3da592e085 100644 --- a/addons/account/report/account_general_ledger.rml +++ b/addons/account/report/account_general_ledger.rml @@ -341,7 +341,7 @@ - + Chart of Account @@ -355,15 +355,12 @@ Filters By [[ get_filter(data)!='No Filter' and get_filter(data) ]] - - Partner's - Target Moves - + [[ get_account(data) or '' ]] @@ -420,9 +417,6 @@ - - [[ get_partners() ]] - [[ get_target_move(data) ]] From c4af077809bb268865ec735c81a961c6f2e3e587 Mon Sep 17 00:00:00 2001 From: pso Date: Mon, 20 Dec 2010 11:21:29 +0530 Subject: [PATCH 05/98] [FIX] account: Passed context as dict if it is None lp bug: https://launchpad.net/bugs/691810 fixed bzr revid: pso@tinyerp.com-20101220055129-5anvbd7pr09x0q1w --- addons/account/account.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/addons/account/account.py b/addons/account/account.py index c3cd13a8115..c37cc7dfb5e 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1278,6 +1278,8 @@ class account_move(osv.osv): return super(account_move, self).copy(cr, uid, id, default, context) def unlink(self, cr, uid, ids, context=None, check=True): + if context is None: + context = {} toremove = [] obj_move_line = self.pool.get('account.move.line') for move in self.browse(cr, uid, ids, context=context): From 024bb524f6cda18b41563712e6c39a589dc0b963 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Mon, 20 Dec 2010 11:23:04 +0530 Subject: [PATCH 06/98] [FIX] account: Account Journal onchange_type method context undefined error lp bug: https://launchpad.net/bugs/692139 fixed bzr revid: psi@tinyerp.co.in-20101220055304-u9clus3vjn9bxfhs --- addons/account/account.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account.py b/addons/account/account.py index c3cd13a8115..ce1fd2d17b0 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -708,7 +708,7 @@ class account_journal(osv.osv): return self.name_get(cr, user, ids, context=context) - def onchange_type(self, cr, uid, ids, type, currency): + def onchange_type(self, cr, uid, ids, type, currency, context=None): obj_data = self.pool.get('ir.model.data') user_pool = self.pool.get('res.users') From 5a1f918d35e86d7173689c29a999c37ade9a8ab5 Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Mon, 20 Dec 2010 15:19:33 +0530 Subject: [PATCH 07/98] [IMP] used is_zero funtion of res.currency in account reports bzr revid: psi@tinyerp.co.in-20101220094933-k93t4h87d985s20w --- addons/account/report/account_balance.py | 8 +++++--- addons/account/report/account_balance_sheet.py | 7 ++++--- addons/account/report/account_profit_loss.py | 7 ++++--- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/addons/account/report/account_balance.py b/addons/account/report/account_balance.py index 45d7e107180..00fa1f58ff6 100644 --- a/addons/account/report/account_balance.py +++ b/addons/account/report/account_balance.py @@ -70,6 +70,9 @@ class account_balance(report_sxw.rml_parse, common_report_header): def lines(self, form, ids=[], done=None):#, level=1): def _process_child(accounts, disp_acc, parent): account_rec = [acct for acct in accounts if acct['id']==parent][0] + currency_obj = self.pool.get('res.currency') + acc_id = self.pool.get('account.account').browse(self.cr, self.uid, account_rec['id']) + currency = acc_id.currency_id and acc_id.currency_id or acc_id.company_id.currency_id res = { 'id': account_rec['id'], 'type': account_rec['type'], @@ -84,12 +87,11 @@ class account_balance(report_sxw.rml_parse, common_report_header): } self.sum_debit += account_rec['debit'] self.sum_credit += account_rec['credit'] - acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account') if disp_acc == 'bal_movement': - if round(res['credit'], acc_digit) > 0 or round(res['debit'], acc_digit) > 0 or round(res['balance'], acc_digit) != 0: + if currency_obj.is_zero(self.cr, self.uid, currency, res['credit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) > 0 or currency_obj.is_zero(self.cr, self.uid, currency, res['balance']) != 0: self.result_acc.append(res) elif disp_acc == 'bal_solde': - if round(res['balance'], acc_digit) != 0: + if currency_obj.is_zero(self.cr, self.uid, currency, res['debit']) != 0: self.result_acc.append(res) else: self.result_acc.append(res) diff --git a/addons/account/report/account_balance_sheet.py b/addons/account/report/account_balance_sheet.py index 8816d702118..8762b44e1e2 100644 --- a/addons/account/report/account_balance_sheet.py +++ b/addons/account/report/account_balance_sheet.py @@ -89,6 +89,7 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) self.res_bl = self.obj_pl.final_result() account_pool = db_pool.get('account.account') + currency_pool = db_pool.get('res.currency') types = [ 'liability', @@ -136,16 +137,16 @@ class report_balancesheet_horizontal(report_sxw.rml_parse, common_report_header) 'level': account.level, 'balance':account.balance, } - acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account') + currency = account.currency_id and account.currency_id or account.company_id.currency_id if typ == 'liability' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_dr += account.balance 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 round(account.credit, acc_digit) > 0 or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0: + if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0: accounts_temp.append(account_dict) elif data['form']['display_account'] == 'bal_solde': - if round(account.balance, acc_digit) != 0: + if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0: accounts_temp.append(account_dict) else: accounts_temp.append(account_dict) diff --git a/addons/account/report/account_profit_loss.py b/addons/account/report/account_profit_loss.py index d9d6226904a..c17d2e7b23e 100644 --- a/addons/account/report/account_profit_loss.py +++ b/addons/account/report/account_profit_loss.py @@ -82,6 +82,7 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): db_pool = pooler.get_pool(self.cr.dbname) account_pool = db_pool.get('account.account') + currency_pool = db_pool.get('res.currency') types = [ 'expense', @@ -106,16 +107,16 @@ class report_pl_account_horizontal(report_sxw.rml_parse, common_report_header): accounts_temp = [] for account in accounts: if (account.user_type.report_type) and (account.user_type.report_type == typ): - acc_digit = self.pool.get('decimal.precision').precision_get(self.cr, 1, 'Account') + currency = account.currency_id and account.currency_id or account.company_id.currency_id if typ == 'expense' and account.type <> 'view' and (account.debit <> account.credit): self.result_sum_dr += abs(account.debit - account.credit) 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 round(account.credit, acc_digit) > 0 or round(account.debit, acc_digit) > 0 or round(account.balance, acc_digit) != 0: + if currency_pool.is_zero(self.cr, self.uid, currency, account.credit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.debit) > 0 or currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0: accounts_temp.append(account) elif data['form']['display_account'] == 'bal_solde': - if round(account.balance, acc_digit) != 0: + if currency_pool.is_zero(self.cr, self.uid, currency, account.balance) != 0: accounts_temp.append(account) else: accounts_temp.append(account) From a0c6493743bd6bc6f25b261e3dc4fe518480f9d8 Mon Sep 17 00:00:00 2001 From: pso Date: Mon, 20 Dec 2010 17:54:22 +0530 Subject: [PATCH 08/98] [FIX] account, sale, purchase: Improved analysis report lp bug: https://launchpad.net/bugs/673835 fixed bzr revid: pso@tinyerp.com-20101220122422-kqao990cf3q582df --- .../account/report/account_invoice_report.py | 20 ++++++++++++------- addons/purchase/report/purchase_report.py | 17 +++++++++++----- .../purchase/report/purchase_report_view.xml | 2 +- addons/sale/report/sale_report.py | 20 +++++++++++-------- addons/sale/report/sale_report_view.xml | 2 +- 5 files changed, 39 insertions(+), 22 deletions(-) diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py index 125edb0d992..e8da59bb165 100644 --- a/addons/account/report/account_invoice_report.py +++ b/addons/account/report/account_invoice_report.py @@ -36,7 +36,7 @@ class account_invoice_report(osv.osv): ('10','October'), ('11','November'), ('12','December')], 'Month', readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), 'product_qty':fields.float('Qty', readonly=True), - 'uom_name': fields.char('Default UoM', size=128, readonly=True), + 'uom_name': fields.char('Reference UoM', size=128, readonly=True), 'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True), 'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True), 'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True), @@ -88,7 +88,11 @@ class account_invoice_report(osv.osv): ai.partner_id as partner_id, ai.payment_term as payment_term, ai.period_id as period_id, - u.name as uom_name, + (case when u.uom_type not in ('reference') then + (select name from product_uom where uom_type='reference' and category_id=u.category_id) + else + u.name + end) as uom_name, ai.currency_id as currency_id, ai.journal_id as journal_id, ai.fiscal_position as fiscal_position, @@ -104,9 +108,9 @@ class account_invoice_report(osv.osv): ai.account_id as account_id, ai.partner_bank_id as partner_bank_id, sum(case when ai.type in ('out_refund','in_invoice') then - ail.quantity * u.factor * -1 + ail.quantity / u.factor * -1 else - ail.quantity * u.factor + ail.quantity / u.factor end) as product_qty, sum(case when ai.type in ('out_refund','in_invoice') then ail.quantity*ail.price_unit * -1 @@ -125,9 +129,9 @@ class account_invoice_report(osv.osv): else sum(ail.quantity*ail.price_unit) end)/(case when ai.type in ('out_refund','in_invoice') then - sum(ail.quantity*u.factor*-1) + sum(ail.quantity/u.factor*-1) else - sum(ail.quantity*u.factor) + sum(ail.quantity/u.factor) end) / cr.rate as price_average, cr.rate as currency_rate, sum((select extract(epoch from avg(date_trunc('day',aml.date_created)-date_trunc('day',l.create_date)))/(24*60*60)::decimal(16,2) @@ -179,7 +183,9 @@ class account_invoice_report(osv.osv): ai.account_id, ai.partner_bank_id, ai.residual, - ai.amount_total + ai.amount_total, + u.uom_type, + u.category_id ) """) diff --git a/addons/purchase/report/purchase_report.py b/addons/purchase/report/purchase_report.py index f30d65d8f28..8c5510852ca 100644 --- a/addons/purchase/report/purchase_report.py +++ b/addons/purchase/report/purchase_report.py @@ -52,7 +52,7 @@ class purchase_report(osv.osv): 'date_approve':fields.date('Date Approved', readonly=True), 'expected_date':fields.date('Expected Date', readonly=True), 'validator' : fields.many2one('res.users', 'Validated By', readonly=True), - 'product_uom' : fields.many2one('product.uom', 'Product UoM', required=True), + 'product_uom' : fields.many2one('product.uom', 'Reference UoM', required=True), 'company_id':fields.many2one('res.company', 'Company', readonly=True), 'user_id':fields.many2one('res.users', 'Responsible', readonly=True), 'delay':fields.float('Days to Validate', digits=(16,2), readonly=True), @@ -92,16 +92,20 @@ class purchase_report(osv.osv): s.company_id as company_id, l.product_id, t.categ_id as category_id, - l.product_uom as product_uom, + (case when u.uom_type not in ('reference') then + (select id from product_uom where uom_type='reference' and category_id = 1) + else + u.id + end) as product_uom, s.location_id as location_id, - sum(l.product_qty*u.factor) as quantity, + sum(l.product_qty/u.factor) as quantity, extract(epoch from age(s.date_approve,s.date_order))/(24*60*60)::decimal(16,2) as delay, extract(epoch from age(l.date_planned,s.date_order))/(24*60*60)::decimal(16,2) as delay_pass, count(*) as nbr, (l.price_unit*l.product_qty*u.factor)::decimal(16,2) as price_total, avg(100.0 * (l.price_unit*l.product_qty*u.factor) / (t.standard_price*l.product_qty*u.factor))::decimal(16,2) as negociation, sum(t.standard_price*l.product_qty*u.factor)::decimal(16,2) as price_standard, - (sum(l.product_qty*l.price_unit)/sum(l.product_qty*u.factor))::decimal(16,2) as price_average + (sum(l.product_qty*l.price_unit)/sum(l.product_qty/u.factor))::decimal(16,2) as price_average from purchase_order s left join purchase_order_line l on (s.id=l.order_id) left join product_product p on (l.product_id=p.id) @@ -131,7 +135,10 @@ class purchase_report(osv.osv): to_char(s.date_order, 'MM'), to_char(s.date_order, 'YYYY-MM-DD'), s.state, - s.warehouse_id + s.warehouse_id, + u.uom_type, + u.category_id, + u.id ) """) purchase_report() diff --git a/addons/purchase/report/purchase_report_view.xml b/addons/purchase/report/purchase_report_view.xml index 8bf381b4d41..7f52ca73cf0 100644 --- a/addons/purchase/report/purchase_report_view.xml +++ b/addons/purchase/report/purchase_report_view.xml @@ -101,7 +101,7 @@ - + diff --git a/addons/sale/report/sale_report.py b/addons/sale/report/sale_report.py index 75c37ff9416..f1dcbc32574 100644 --- a/addons/sale/report/sale_report.py +++ b/addons/sale/report/sale_report.py @@ -38,7 +38,7 @@ class sale_report(osv.osv): ('10', 'October'), ('11', 'November'), ('12', 'December')], 'Month', readonly=True), 'day': fields.char('Day', size=128, readonly=True), 'product_id': fields.many2one('product.product', 'Product', readonly=True), - 'uom_name': fields.char('Default UoM', size=128, readonly=True), + 'uom_name': fields.char('Reference UoM', size=128, readonly=True), 'product_uom_qty': fields.float('# of Qty', readonly=True), 'partner_id': fields.many2one('res.partner', 'Partner', readonly=True), @@ -90,17 +90,21 @@ class sale_report(osv.osv): sale_order s, ( select l.id as id, - l.product_id as product_id, - u.name as uom_name, - sum(l.product_uom_qty * u.factor) as product_uom_qty, - sum(l.product_uom_qty*l.price_unit) as price_total, - (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty * u.factor)*count(l.product_id))::decimal(16,2) as price_average, - pt.categ_id, l.order_id + l.product_id as product_id, + (case when u.uom_type not in ('reference') then + (select name from product_uom where uom_type='reference' and category_id=u.category_id) + else + u.name + end) as uom_name, + sum(l.product_uom_qty/u.factor) as product_uom_qty, + sum(l.product_uom_qty*l.price_unit) as price_total, + (sum(l.product_uom_qty*l.price_unit)/sum(l.product_uom_qty/u.factor)*count(l.product_id))::decimal(16,2) as price_average, + pt.categ_id, l.order_id from sale_order_line l left join product_uom u on (u.id=l.product_uom) left join product_template pt on (pt.id=l.product_id) - group by l.id, l.order_id, l.product_id, u.name, pt.categ_id) el + group by l.id, l.order_id, l.product_id, u.name, pt.categ_id, u.uom_type, u.category_id) el where s.id = el.order_id group by el.id, el.product_id, diff --git a/addons/sale/report/sale_report_view.xml b/addons/sale/report/sale_report_view.xml index a47ab2e73a9..40e6b0256e0 100644 --- a/addons/sale/report/sale_report_view.xml +++ b/addons/sale/report/sale_report_view.xml @@ -100,7 +100,7 @@ - + From 773cdea683b74a9cf122d0f15350c1e8d190749d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Degrave?= Date: Mon, 20 Dec 2010 15:56:07 +0100 Subject: [PATCH 09/98] "[IMP] security groups on act_window in product and partner objects" bzr revid: fde@openerp.com-20101220145607-vx2r937j9sj7e1zw --- addons/account/account_view.xml | 2 +- addons/account/security/ir.model.access.csv | 3 +++ .../account_analytic_default_view.xml | 6 +++--- addons/mrp/mrp_view.xml | 5 +++-- addons/mrp_subproduct/mrp_subproduct.py | 1 - addons/outlook/outlook_installer.xml | 0 .../openerp-outlook-plugin/Register-plugin.bat | 0 .../openerp-outlook-plugin/Unregister-plugin.bat | 0 addons/procurement/procurement_view.xml | 13 ++++++++----- .../procurement/wizard/make_procurement_view.xml | 2 +- addons/project_issue/security/ir.model.access.csv | 0 addons/purchase/purchase_view.xml | 3 ++- addons/purchase/security/ir.model.access.csv | 1 + addons/sale/sale_view.xml | 3 ++- addons/sale/security/ir.model.access.csv | 4 ++-- addons/sale_layout/__init__.py | 0 addons/sale_layout/__openerp__.py | 0 addons/sale_layout/i18n/fr_BE.po | 0 addons/sale_layout/i18n/fr_FR.po | 0 addons/sale_layout/report/__init__.py | 0 addons/sale_layout/report/report_sale_layout.py | 0 addons/sale_layout/report/report_sale_layout.rml | 0 addons/sale_layout/sale_layout_report.xml | 0 addons/sale_layout/sale_layout_view.xml | 0 .../plugin/openerp_plugin/chrome.manifest | 0 .../openerp_plugin/components/nsXmlRpcClient.js | 0 .../plugin/openerp_plugin/components/xml-rpc.xpt | Bin .../thunderbird/plugin/openerp_plugin/install.js | 0 .../thunderbird/plugin/openerp_plugin/install.rdf | 0 .../thunderbird/plugin/openerp_plugin/packaging.sh | 0 addons/wiki/test/wiki_test00.yml | 0 addons/wiki/web/widgets/rss/feedparser.py | 0 32 files changed, 26 insertions(+), 17 deletions(-) mode change 100755 => 100644 addons/outlook/outlook_installer.xml mode change 100644 => 100755 addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat mode change 100644 => 100755 addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat mode change 100755 => 100644 addons/project_issue/security/ir.model.access.csv mode change 100755 => 100644 addons/sale_layout/__init__.py mode change 100755 => 100644 addons/sale_layout/__openerp__.py mode change 100755 => 100644 addons/sale_layout/i18n/fr_BE.po mode change 100755 => 100644 addons/sale_layout/i18n/fr_FR.po mode change 100755 => 100644 addons/sale_layout/report/__init__.py mode change 100755 => 100644 addons/sale_layout/report/report_sale_layout.py mode change 100755 => 100644 addons/sale_layout/report/report_sale_layout.rml mode change 100755 => 100644 addons/sale_layout/sale_layout_report.xml mode change 100755 => 100644 addons/sale_layout/sale_layout_view.xml mode change 100755 => 100644 addons/thunderbird/plugin/openerp_plugin/chrome.manifest mode change 100755 => 100644 addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js mode change 100755 => 100644 addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt mode change 100755 => 100644 addons/thunderbird/plugin/openerp_plugin/install.js mode change 100755 => 100644 addons/thunderbird/plugin/openerp_plugin/install.rdf mode change 100755 => 100644 addons/thunderbird/plugin/openerp_plugin/packaging.sh mode change 100755 => 100644 addons/wiki/test/wiki_test00.yml mode change 100755 => 100644 addons/wiki/web/widgets/rss/feedparser.py diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index 39b861d1775..3d429d3a820 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2062,7 +2062,7 @@ - + Create Account diff --git a/addons/account/security/ir.model.access.csv b/addons/account/security/ir.model.access.csv index b7775c48c8d..ec243e2942f 100644 --- a/addons/account/security/ir.model.access.csv +++ b/addons/account/security/ir.model.access.csv @@ -116,5 +116,8 @@ "access_report_account_receivable_invoice","report.account.receivable.invoice","model_report_account_receivable","account.group_account_invoice",1,1,1,1 "access_report_account_receivable_user","report.account.receivable.user","model_report_account_receivable","account.group_account_user",1,1,1,1 "access_account_sequence_fiscal_year_invoice","account.sequence.fiscalyear invoice","model_account_sequence_fiscalyear","account.group_account_invoice",1,1,1,1 +"access_account_tax_sale_manager","account.tax sale manager","model_account_tax","base.group_sale_salesman",1,0,0,0 +"access_account_journal_sale_manager","account.journal sale manager","model_account_journal","base.group_sale_salesman",1,0,0,0 +"access_account_invoice_tax_sale_manager","account.invoice.tax sale manager","model_account_invoice_tax","base.group_sale_salesman",1,0,0,0 "access_account_sequence_fiscal_year_sale_user","account.sequence.fiscalyear.sale.user","model_account_sequence_fiscalyear","base.group_sale_salesman",1,1,1,0 "access_account_sequence_fiscal_year_sale_manager","account.sequence.fiscalyear.sale.manager","model_account_sequence_fiscalyear","base.group_sale_manager",1,1,1,1 diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml index 00656771c42..3bc3ba5222a 100644 --- a/addons/account_analytic_default/account_analytic_default_view.xml +++ b/addons/account_analytic_default/account_analytic_default_view.xml @@ -96,7 +96,7 @@ res_model="account.analytic.default" src_model="res.partner" context="{'search_default_partner_id': [active_id]}" - groups="base.group_extended"/> + groups="analytic.group_analytic_accounting"/> + groups="analytic.group_analytic_accounting"/> + groups="analytic.group_analytic_accounting"/> diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 10594219041..f950357b628 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -909,7 +909,7 @@ view_id="mrp_bom_tree_view" res_model="mrp.bom" src_model="product.product" - groups="base.group_extended"/> + groups="mrp.group_mrp_user"/> + src_model="product.product" + groups="mrp.group_mrp_user"/> diff --git a/addons/mrp_subproduct/mrp_subproduct.py b/addons/mrp_subproduct/mrp_subproduct.py index 2d7c761da90..130411987c1 100644 --- a/addons/mrp_subproduct/mrp_subproduct.py +++ b/addons/mrp_subproduct/mrp_subproduct.py @@ -60,7 +60,6 @@ class mrp_bom(osv.osv): mrp_bom() class mrp_production(osv.osv): - _name = 'mrp.production' _description = 'Production' _inherit= 'mrp.production' diff --git a/addons/outlook/outlook_installer.xml b/addons/outlook/outlook_installer.xml old mode 100755 new mode 100644 diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Register-plugin.bat old mode 100644 new mode 100755 diff --git a/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat b/addons/outlook/plugin/openerp-outlook-plugin/Unregister-plugin.bat old mode 100644 new mode 100755 diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml index c25301b6603..37c300e03ab 100644 --- a/addons/procurement/procurement_view.xml +++ b/addons/procurement/procurement_view.xml @@ -245,9 +245,10 @@ + name="Minimum Stock Rules" + res_model="stock.warehouse.orderpoint" + src_model="stock.warehouse" + groups="stock.group_stock_user"/> + src_model="product.product" + groups="stock.group_stock_user"/> + src_model="procurement.order" + groups="stock.group_stock_user"/> diff --git a/addons/procurement/wizard/make_procurement_view.xml b/addons/procurement/wizard/make_procurement_view.xml index 2e9b44edb63..060e67d3be8 100644 --- a/addons/procurement/wizard/make_procurement_view.xml +++ b/addons/procurement/wizard/make_procurement_view.xml @@ -35,7 +35,7 @@ target="new" key2="client_action_multi" id="act_make_procurement" - groups="base.group_extended"/> + groups="stock.group_stock_user,mrp.group_mrp_user,purchase.group_purchase_user"/> diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv old mode 100755 new mode 100644 diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index d08f602d158..9e491aafe07 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -407,6 +407,7 @@ context="{'search_default_partner_id': [active_id]}" id="act_res_partner_2_purchase_order" name="Purchase Orders" + groups="purchase.group_purchase_user" res_model="purchase.order" src_model="res.partner"/> @@ -416,7 +417,7 @@ name="Purchases" res_model="purchase.order.line" src_model="product.product" - groups="base.group_extended"/> + groups="purchase.group_purchase_user"/> diff --git a/addons/purchase/security/ir.model.access.csv b/addons/purchase/security/ir.model.access.csv index 7857fa4586d..cf96c8e2f13 100644 --- a/addons/purchase/security/ir.model.access.csv +++ b/addons/purchase/security/ir.model.access.csv @@ -44,3 +44,4 @@ "access_report_stock_move_user","report.stock.move.user","stock.model_report_stock_move","group_purchase_user",1,0,0,0 "access_stock_production_lot_user","stock.production.lot user","stock.model_stock_production_lot","group_purchase_user",1,0,1,0 "access_stock_production_lot_revision","stock.production.lot.revision","stock.model_stock_production_lot_revision","group_purchase_user",1,0,1,0 +"access_res_partner_purchase_manager","res.partner.purchase.manager","base.model_res_partner","group_purchase_manager",1,1,1,1 diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index c282b38a14b..394a1cda97c 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -514,6 +514,7 @@ context="{'search_default_partner_id': [active_id]}" id="act_res_partner_2_sale_order" name="Sales" + groups="base.group_sale_salesman" res_model="sale.order" src_model="res.partner"/> @@ -523,7 +524,7 @@ name="Product sales" res_model="sale.order.line" src_model="product.product" - groups="base.group_extended"/> + groups="base.group_sale_salesman"/> diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 923c91fb3aa..4b3d409d8c5 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -16,13 +16,13 @@ "access_sale_order_stock_worker","sale.order stock worker","model_sale_order","stock.group_stock_user",1,1,0,0 "access_sale_order_line_stock_worker","sale.order.line stock worker","model_sale_order_line","stock.group_stock_user",1,1,0,0 "access_sale_order_manager","sale.order.manager","model_sale_order","base.group_sale_manager",1,1,1,1 -"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,0,0,0 +"access_sale_order_line_manager","sale.order.line.manager","model_sale_order_line","base.group_sale_manager",1,1,1,1 "access_sale_report_salesman","sale.report","model_sale_report","base.group_sale_salesman",1,1,1,0 "access_sale_report_manager","sale.report","model_sale_report","base.group_sale_manager",1,1,1,1 "access_ir_property_sales","ir.property.sales","base.model_ir_property","base.group_sale_salesman",1,1,1,1 "access_sale_account_journal","account.journal sale order.user","account.model_account_journal","base.group_sale_salesman",1,0,0,0 "access_res_partner_sale_user","res.partner.sale.user","base.model_res_partner","base.group_sale_salesman",1,0,0,0 -"access_res_partner_sale_manager","res.partner.sale.user","base.model_res_partner","base.group_sale_manager",1,0,0,0 +"access_res_partner_sale_manager","res.partner.sale.manager","base.model_res_partner","base.group_sale_manager",1,1,1,1 "access_report_stock_move_sales","report.stock.move.sale","stock.model_report_stock_move","base.group_sale_manager",1,1,1,1 "access_stock_picking_sales","stock.picking.sales","stock.model_stock_picking","base.group_sale_manager",1,1,1,1 "access_product_template_sale_user","product.template sale use","product.model_product_template","base.group_sale_salesman",1,0,0,0 diff --git a/addons/sale_layout/__init__.py b/addons/sale_layout/__init__.py old mode 100755 new mode 100644 diff --git a/addons/sale_layout/__openerp__.py b/addons/sale_layout/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/sale_layout/i18n/fr_BE.po b/addons/sale_layout/i18n/fr_BE.po old mode 100755 new mode 100644 diff --git a/addons/sale_layout/i18n/fr_FR.po b/addons/sale_layout/i18n/fr_FR.po old mode 100755 new mode 100644 diff --git a/addons/sale_layout/report/__init__.py b/addons/sale_layout/report/__init__.py old mode 100755 new mode 100644 diff --git a/addons/sale_layout/report/report_sale_layout.py b/addons/sale_layout/report/report_sale_layout.py old mode 100755 new mode 100644 diff --git a/addons/sale_layout/report/report_sale_layout.rml b/addons/sale_layout/report/report_sale_layout.rml old mode 100755 new mode 100644 diff --git a/addons/sale_layout/sale_layout_report.xml b/addons/sale_layout/sale_layout_report.xml old mode 100755 new mode 100644 diff --git a/addons/sale_layout/sale_layout_view.xml b/addons/sale_layout/sale_layout_view.xml old mode 100755 new mode 100644 diff --git a/addons/thunderbird/plugin/openerp_plugin/chrome.manifest b/addons/thunderbird/plugin/openerp_plugin/chrome.manifest old mode 100755 new mode 100644 diff --git a/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js b/addons/thunderbird/plugin/openerp_plugin/components/nsXmlRpcClient.js old mode 100755 new mode 100644 diff --git a/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt b/addons/thunderbird/plugin/openerp_plugin/components/xml-rpc.xpt old mode 100755 new mode 100644 diff --git a/addons/thunderbird/plugin/openerp_plugin/install.js b/addons/thunderbird/plugin/openerp_plugin/install.js old mode 100755 new mode 100644 diff --git a/addons/thunderbird/plugin/openerp_plugin/install.rdf b/addons/thunderbird/plugin/openerp_plugin/install.rdf old mode 100755 new mode 100644 diff --git a/addons/thunderbird/plugin/openerp_plugin/packaging.sh b/addons/thunderbird/plugin/openerp_plugin/packaging.sh old mode 100755 new mode 100644 diff --git a/addons/wiki/test/wiki_test00.yml b/addons/wiki/test/wiki_test00.yml old mode 100755 new mode 100644 diff --git a/addons/wiki/web/widgets/rss/feedparser.py b/addons/wiki/web/widgets/rss/feedparser.py old mode 100755 new mode 100644 From 5d77a6f5b9c8c7e7b1059366f64bb2d0637bd492 Mon Sep 17 00:00:00 2001 From: pso Date: Tue, 21 Dec 2010 10:34:12 +0530 Subject: [PATCH 10/98] [FIX] sale, purchase: Put constraint for order reference lp bug: https://launchpad.net/bugs/692456 fixed bzr revid: pso@tinyerp.com-20101221050412-j6ubw3wiwvs1irp2 --- addons/purchase/purchase.py | 3 +++ addons/sale/sale.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 79bc59759ae..108d17bfd4b 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -218,6 +218,9 @@ class purchase_order(osv.osv): 'pricelist_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').browse(cr, uid, context['partner_id']).property_product_pricelist_purchase.id, 'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'purchase.order', context=c), } + _sql_constraints = [ + ('name_uniq', 'unique(name)', 'Order Reference must be unique !'), + ] _name = "purchase.order" _description = "Purchase Order" _order = "name desc" diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 29cd5ea593a..2d6fc87a240 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -185,7 +185,7 @@ class sale_order(osv.osv): for line in self.pool.get('sale.order.line').browse(cr, uid, ids, context=context): result[line.order_id.id] = True return result.keys() - + _columns = { 'name': fields.char('Order Reference', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}, select=True), @@ -274,6 +274,9 @@ class sale_order(osv.osv): 'partner_order_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['contact'])['contact'], 'partner_shipping_id': lambda self, cr, uid, context: context.get('partner_id', False) and self.pool.get('res.partner').address_get(cr, uid, [context['partner_id']], ['delivery'])['delivery'], } + _sql_constraints = [ + ('name_uniq', 'unique(name)', 'Order Reference must be unique !'), + ] _order = 'name desc' # Form filling From 61668fe2af9d9e21d361f765df07001450354bdd Mon Sep 17 00:00:00 2001 From: pso Date: Tue, 21 Dec 2010 11:21:49 +0530 Subject: [PATCH 11/98] [FIX] sale: Put colors for diff state in list view lp bug: https://launchpad.net/bugs/692735 fixed bzr revid: pso@tinyerp.com-20101221055149-7zjvbzq3u6jjtfzt --- addons/sale/sale_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 5d1e06c2d35..a98cf80c4d2 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -81,7 +81,7 @@ tree 2 - + From 69c31f245b86f2a9eee5c3f2bad9c1ab458210f8 Mon Sep 17 00:00:00 2001 From: pso Date: Tue, 21 Dec 2010 14:21:07 +0530 Subject: [PATCH 12/98] [FIX] sale_marging: Calculated cost price as per pricelist lp bug: https://launchpad.net/bugs/689924 fixed bzr revid: pso@tinyerp.com-20101221085107-rbq0875kpzivi6wg --- addons/sale_margin/sale_margin.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index 97fd3b29cef..5778e21ba11 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -30,8 +30,9 @@ class sale_order_line(osv.osv): uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id, lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag) if product: + rate = self.pool.get('res.partner').browse(cr, uid, partner_id).property_product_pricelist.currency_id.rate purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price - res['value'].update({'purchase_price': purchase_price}) + res['value'].update({'purchase_price': purchase_price * rate}) return res def _product_margin(self, cr, uid, ids, field_name, arg, context=None): From 96c353e309d524f45806799fe18eba5f6bb910da Mon Sep 17 00:00:00 2001 From: pso Date: Tue, 21 Dec 2010 15:12:04 +0530 Subject: [PATCH 13/98] [IMP] sale_margin: Code reverted bzr revid: pso@tinyerp.com-20101221094204-8kdgkgmtr7d886zd --- addons/sale_margin/sale_margin.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index 5778e21ba11..97fd3b29cef 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -30,9 +30,8 @@ class sale_order_line(osv.osv): uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id, lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag) if product: - rate = self.pool.get('res.partner').browse(cr, uid, partner_id).property_product_pricelist.currency_id.rate purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price - res['value'].update({'purchase_price': purchase_price * rate}) + res['value'].update({'purchase_price': purchase_price}) return res def _product_margin(self, cr, uid, ids, field_name, arg, context=None): From 21199236dfd86f31454e158f790f398b44fc7f3d Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 21 Dec 2010 15:30:28 +0530 Subject: [PATCH 14/98] [FIX] hr:add an employee to a department lp bug: https://launchpad.net/bugs/691218 fixed bzr revid: psi@tinyerp.co.in-20101221100028-vpkskil3ur6ccjij --- addons/hr/hr.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr/hr.py b/addons/hr/hr.py index 7c400ecf40e..103b0534349 100644 --- a/addons/hr/hr.py +++ b/addons/hr/hr.py @@ -221,7 +221,7 @@ class hr_department(osv.osv): _inherit = 'hr.department' _columns = { 'manager_id': fields.many2one('hr.employee', 'Manager'), - 'member_ids': fields.one2many('hr.employee', 'department_id', 'Members'), + 'member_ids': fields.one2many('hr.employee', 'department_id', 'Members', readonly=True), } hr_department() From dc372ed0d6f75160476dfe7cf8f07906eb538f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Degrave?= Date: Tue, 21 Dec 2010 11:04:23 +0100 Subject: [PATCH 15/98] [IMP] access rights for warehouse user group bzr revid: fde@openerp.com-20101221100423-tomvr10f9am22msn --- .../report/account_balance_landscape_old_backup.rml | 0 .../account/report/account_balance_old_backup.rml | 0 addons/account_voucher/report/account_voucher.rml | 0 .../report/account_voucher_print.rml | 0 addons/auction/report/catalog2.xsl | 0 .../plugin/openerp_report_designer/bin/Makefile | 0 .../plugin/openerp_report_designer/bin/OOo_run.sh | 0 addons/base_synchro/base_synchro_view.xml | 0 addons/crm/scripts/php/xmlrpc.inc | 0 .../security/email_template_security.xml | 0 addons/hr/__openerp__.py | 0 addons/hr_contract/__openerp__.py | 0 addons/hr_payroll/hr_paroll_report.xml | 0 addons/hr_payroll/report/__init__.py | 0 addons/hr_payroll/report/payslip.rml | 0 addons/hr_payroll/report/report_payslip.py | 0 addons/hr_payroll/report/report_year_report.rml | 0 addons/hr_payroll/report/report_year_salary.py | 0 addons/hr_payroll/wizard/__init__.py | 0 .../wizard/hr_payroll_employees_detail.py | 0 addons/hr_payroll/wizard/hr_payroll_year_salary.py | 0 addons/l10n_ca/__init__.py | 0 addons/l10n_ca/__openerp__.py | 0 addons/l10n_ch/readme.txt | 0 addons/l10n_ch/report/bvr_invoice_report.rml | 0 addons/l10n_ch/report/bvr_report.rml | 0 addons/l10n_ch/report/normalized_oo2rml.xsl | 0 addons/l10n_ch/report/ocrbb.ttf | Bin addons/l10n_ch/wizard.xml | 0 addons/l10n_de/__init__.py | 0 addons/l10n_de/__openerp__.py | 0 addons/l10n_de/account_chart_skr03.xml | 0 addons/l10n_de/account_chart_skr04.xml | 0 addons/l10n_de/account_chart_template_skr03.xml | 0 addons/l10n_de/account_chart_template_skr04.xml | 0 .../l10n_de/account_tax_fiscal_position_skr03.xml | 0 .../l10n_de/account_tax_fiscal_position_skr04.xml | 0 addons/l10n_de/account_tax_skr03.xml | 0 addons/l10n_de/account_tax_skr04.xml | 0 addons/l10n_de/account_types_skr03.xml | 0 addons/l10n_de/account_types_skr04.xml | 0 addons/l10n_de/i18n/ar_AR.po | 0 addons/l10n_de/i18n/be_BE.po | 0 addons/l10n_de/i18n/bg_BG.po | 0 addons/l10n_de/i18n/bs_BS.po | 0 addons/l10n_de/i18n/ca_ES.po | 0 addons/l10n_de/i18n/cs_CZ.po | 0 addons/l10n_de/i18n/es_AR.po | 0 addons/l10n_de/i18n/es_ES.po | 0 addons/l10n_de/i18n/et_EE.po | 0 addons/l10n_de/i18n/fi_FI.po | 0 addons/l10n_de/i18n/fr_FR.po | 0 addons/l10n_de/i18n/hr_HR.po | 0 addons/l10n_de/i18n/hu_HU.po | 0 addons/l10n_de/i18n/id_ID.po | 0 addons/l10n_de/i18n/it_IT.po | 0 addons/l10n_de/i18n/ko_KO.po | 0 addons/l10n_de/i18n/lt_LT.po | 0 addons/l10n_de/i18n/nl_BE.po | 0 addons/l10n_de/i18n/nl_NL.po | 0 addons/l10n_de/i18n/pl_PL.po | 0 addons/l10n_de/i18n/pt_PT.po | 0 addons/l10n_de/i18n/ro_RO.po | 0 addons/l10n_de/i18n/ru_RU.po | 0 addons/l10n_de/i18n/sl_SL.po | 0 addons/l10n_de/i18n/sq_AL.po | 0 addons/l10n_de/i18n/sv_SE.po | 0 addons/l10n_de/i18n/tr_TR.po | 0 addons/l10n_de/i18n/uk_UA.po | 0 addons/l10n_de/i18n/vi_VN.po | 0 addons/l10n_de/i18n/znd_ZND.po | 0 addons/l10n_de/l10n_de_wizard.xml | 0 addons/l10n_gr/account_chart.xml | 0 addons/l10n_gr/account_tax.xml | 0 addons/l10n_lu/wizard/2008_DECL_F_M10.pdf | 0 addons/l10n_ma/__openerp__.py | 0 addons/l10n_nl/__init__.py | 0 addons/l10n_nl/__openerp__.py | 0 addons/l10n_nl/account_chart_netherlands.xml | 0 addons/l10n_nl/l10n_nl_wizard.xml | 0 .../scripts/openerp_mailgate/openerp_mailgate.py | 0 addons/mrp/security/ir.model.access.csv | 1 + addons/mrp_operations/report/mrp_code_barcode.rml | 0 addons/mrp_operations/report/mrp_wc_barcode.rml | 0 addons/mrp_operations/security/ir.model.access.csv | 0 addons/stock/security/ir.model.access.csv | 2 ++ 86 files changed, 3 insertions(+) mode change 100755 => 100644 addons/account/report/account_balance_landscape_old_backup.rml mode change 100755 => 100644 addons/account/report/account_balance_old_backup.rml mode change 100755 => 100644 addons/account_voucher/report/account_voucher.rml mode change 100755 => 100644 addons/account_voucher/report/account_voucher_print.rml mode change 100755 => 100644 addons/auction/report/catalog2.xsl mode change 100755 => 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile mode change 100755 => 100644 addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh mode change 100755 => 100644 addons/base_synchro/base_synchro_view.xml mode change 100755 => 100644 addons/crm/scripts/php/xmlrpc.inc mode change 100755 => 100644 addons/email_template/security/email_template_security.xml mode change 100755 => 100644 addons/hr/__openerp__.py mode change 100755 => 100644 addons/hr_contract/__openerp__.py mode change 100755 => 100644 addons/hr_payroll/hr_paroll_report.xml mode change 100755 => 100644 addons/hr_payroll/report/__init__.py mode change 100755 => 100644 addons/hr_payroll/report/payslip.rml mode change 100755 => 100644 addons/hr_payroll/report/report_payslip.py mode change 100755 => 100644 addons/hr_payroll/report/report_year_report.rml mode change 100755 => 100644 addons/hr_payroll/report/report_year_salary.py mode change 100755 => 100644 addons/hr_payroll/wizard/__init__.py mode change 100755 => 100644 addons/hr_payroll/wizard/hr_payroll_employees_detail.py mode change 100755 => 100644 addons/hr_payroll/wizard/hr_payroll_year_salary.py mode change 100755 => 100644 addons/l10n_ca/__init__.py mode change 100755 => 100644 addons/l10n_ca/__openerp__.py mode change 100755 => 100644 addons/l10n_ch/readme.txt mode change 100755 => 100644 addons/l10n_ch/report/bvr_invoice_report.rml mode change 100755 => 100644 addons/l10n_ch/report/bvr_report.rml mode change 100755 => 100644 addons/l10n_ch/report/normalized_oo2rml.xsl mode change 100755 => 100644 addons/l10n_ch/report/ocrbb.ttf mode change 100755 => 100644 addons/l10n_ch/wizard.xml mode change 100755 => 100644 addons/l10n_de/__init__.py mode change 100755 => 100644 addons/l10n_de/__openerp__.py mode change 100755 => 100644 addons/l10n_de/account_chart_skr03.xml mode change 100755 => 100644 addons/l10n_de/account_chart_skr04.xml mode change 100755 => 100644 addons/l10n_de/account_chart_template_skr03.xml mode change 100755 => 100644 addons/l10n_de/account_chart_template_skr04.xml mode change 100755 => 100644 addons/l10n_de/account_tax_fiscal_position_skr03.xml mode change 100755 => 100644 addons/l10n_de/account_tax_fiscal_position_skr04.xml mode change 100755 => 100644 addons/l10n_de/account_tax_skr03.xml mode change 100755 => 100644 addons/l10n_de/account_tax_skr04.xml mode change 100755 => 100644 addons/l10n_de/account_types_skr03.xml mode change 100755 => 100644 addons/l10n_de/account_types_skr04.xml mode change 100755 => 100644 addons/l10n_de/i18n/ar_AR.po mode change 100755 => 100644 addons/l10n_de/i18n/be_BE.po mode change 100755 => 100644 addons/l10n_de/i18n/bg_BG.po mode change 100755 => 100644 addons/l10n_de/i18n/bs_BS.po mode change 100755 => 100644 addons/l10n_de/i18n/ca_ES.po mode change 100755 => 100644 addons/l10n_de/i18n/cs_CZ.po mode change 100755 => 100644 addons/l10n_de/i18n/es_AR.po mode change 100755 => 100644 addons/l10n_de/i18n/es_ES.po mode change 100755 => 100644 addons/l10n_de/i18n/et_EE.po mode change 100755 => 100644 addons/l10n_de/i18n/fi_FI.po mode change 100755 => 100644 addons/l10n_de/i18n/fr_FR.po mode change 100755 => 100644 addons/l10n_de/i18n/hr_HR.po mode change 100755 => 100644 addons/l10n_de/i18n/hu_HU.po mode change 100755 => 100644 addons/l10n_de/i18n/id_ID.po mode change 100755 => 100644 addons/l10n_de/i18n/it_IT.po mode change 100755 => 100644 addons/l10n_de/i18n/ko_KO.po mode change 100755 => 100644 addons/l10n_de/i18n/lt_LT.po mode change 100755 => 100644 addons/l10n_de/i18n/nl_BE.po mode change 100755 => 100644 addons/l10n_de/i18n/nl_NL.po mode change 100755 => 100644 addons/l10n_de/i18n/pl_PL.po mode change 100755 => 100644 addons/l10n_de/i18n/pt_PT.po mode change 100755 => 100644 addons/l10n_de/i18n/ro_RO.po mode change 100755 => 100644 addons/l10n_de/i18n/ru_RU.po mode change 100755 => 100644 addons/l10n_de/i18n/sl_SL.po mode change 100755 => 100644 addons/l10n_de/i18n/sq_AL.po mode change 100755 => 100644 addons/l10n_de/i18n/sv_SE.po mode change 100755 => 100644 addons/l10n_de/i18n/tr_TR.po mode change 100755 => 100644 addons/l10n_de/i18n/uk_UA.po mode change 100755 => 100644 addons/l10n_de/i18n/vi_VN.po mode change 100755 => 100644 addons/l10n_de/i18n/znd_ZND.po mode change 100755 => 100644 addons/l10n_de/l10n_de_wizard.xml mode change 100755 => 100644 addons/l10n_gr/account_chart.xml mode change 100755 => 100644 addons/l10n_gr/account_tax.xml mode change 100755 => 100644 addons/l10n_lu/wizard/2008_DECL_F_M10.pdf mode change 100755 => 100644 addons/l10n_ma/__openerp__.py mode change 100755 => 100644 addons/l10n_nl/__init__.py mode change 100755 => 100644 addons/l10n_nl/__openerp__.py mode change 100755 => 100644 addons/l10n_nl/account_chart_netherlands.xml mode change 100755 => 100644 addons/l10n_nl/l10n_nl_wizard.xml mode change 100755 => 100644 addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py mode change 100755 => 100644 addons/mrp_operations/report/mrp_code_barcode.rml mode change 100755 => 100644 addons/mrp_operations/report/mrp_wc_barcode.rml mode change 100755 => 100644 addons/mrp_operations/security/ir.model.access.csv diff --git a/addons/account/report/account_balance_landscape_old_backup.rml b/addons/account/report/account_balance_landscape_old_backup.rml old mode 100755 new mode 100644 diff --git a/addons/account/report/account_balance_old_backup.rml b/addons/account/report/account_balance_old_backup.rml old mode 100755 new mode 100644 diff --git a/addons/account_voucher/report/account_voucher.rml b/addons/account_voucher/report/account_voucher.rml old mode 100755 new mode 100644 diff --git a/addons/account_voucher/report/account_voucher_print.rml b/addons/account_voucher/report/account_voucher_print.rml old mode 100755 new mode 100644 diff --git a/addons/auction/report/catalog2.xsl b/addons/auction/report/catalog2.xsl old mode 100755 new mode 100644 diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile b/addons/base_report_designer/plugin/openerp_report_designer/bin/Makefile old mode 100755 new mode 100644 diff --git a/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh b/addons/base_report_designer/plugin/openerp_report_designer/bin/OOo_run.sh old mode 100755 new mode 100644 diff --git a/addons/base_synchro/base_synchro_view.xml b/addons/base_synchro/base_synchro_view.xml old mode 100755 new mode 100644 diff --git a/addons/crm/scripts/php/xmlrpc.inc b/addons/crm/scripts/php/xmlrpc.inc old mode 100755 new mode 100644 diff --git a/addons/email_template/security/email_template_security.xml b/addons/email_template/security/email_template_security.xml old mode 100755 new mode 100644 diff --git a/addons/hr/__openerp__.py b/addons/hr/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/hr_paroll_report.xml b/addons/hr_payroll/hr_paroll_report.xml old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/report/__init__.py b/addons/hr_payroll/report/__init__.py old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/report/payslip.rml b/addons/hr_payroll/report/payslip.rml old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/report/report_payslip.py b/addons/hr_payroll/report/report_payslip.py old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/report/report_year_report.rml b/addons/hr_payroll/report/report_year_report.rml old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/report/report_year_salary.py b/addons/hr_payroll/report/report_year_salary.py old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/wizard/__init__.py b/addons/hr_payroll/wizard/__init__.py old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/wizard/hr_payroll_employees_detail.py b/addons/hr_payroll/wizard/hr_payroll_employees_detail.py old mode 100755 new mode 100644 diff --git a/addons/hr_payroll/wizard/hr_payroll_year_salary.py b/addons/hr_payroll/wizard/hr_payroll_year_salary.py old mode 100755 new mode 100644 diff --git a/addons/l10n_ca/__init__.py b/addons/l10n_ca/__init__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_ch/readme.txt b/addons/l10n_ch/readme.txt old mode 100755 new mode 100644 diff --git a/addons/l10n_ch/report/bvr_invoice_report.rml b/addons/l10n_ch/report/bvr_invoice_report.rml old mode 100755 new mode 100644 diff --git a/addons/l10n_ch/report/bvr_report.rml b/addons/l10n_ch/report/bvr_report.rml old mode 100755 new mode 100644 diff --git a/addons/l10n_ch/report/normalized_oo2rml.xsl b/addons/l10n_ch/report/normalized_oo2rml.xsl old mode 100755 new mode 100644 diff --git a/addons/l10n_ch/report/ocrbb.ttf b/addons/l10n_ch/report/ocrbb.ttf old mode 100755 new mode 100644 diff --git a/addons/l10n_ch/wizard.xml b/addons/l10n_ch/wizard.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/__init__.py b/addons/l10n_de/__init__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_chart_skr03.xml b/addons/l10n_de/account_chart_skr03.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_chart_skr04.xml b/addons/l10n_de/account_chart_skr04.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_chart_template_skr03.xml b/addons/l10n_de/account_chart_template_skr03.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_chart_template_skr04.xml b/addons/l10n_de/account_chart_template_skr04.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_tax_fiscal_position_skr03.xml b/addons/l10n_de/account_tax_fiscal_position_skr03.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_tax_fiscal_position_skr04.xml b/addons/l10n_de/account_tax_fiscal_position_skr04.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_tax_skr03.xml b/addons/l10n_de/account_tax_skr03.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_tax_skr04.xml b/addons/l10n_de/account_tax_skr04.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_types_skr03.xml b/addons/l10n_de/account_types_skr03.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/account_types_skr04.xml b/addons/l10n_de/account_types_skr04.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/ar_AR.po b/addons/l10n_de/i18n/ar_AR.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/be_BE.po b/addons/l10n_de/i18n/be_BE.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/bg_BG.po b/addons/l10n_de/i18n/bg_BG.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/bs_BS.po b/addons/l10n_de/i18n/bs_BS.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/ca_ES.po b/addons/l10n_de/i18n/ca_ES.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/cs_CZ.po b/addons/l10n_de/i18n/cs_CZ.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/es_AR.po b/addons/l10n_de/i18n/es_AR.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/es_ES.po b/addons/l10n_de/i18n/es_ES.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/et_EE.po b/addons/l10n_de/i18n/et_EE.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/fi_FI.po b/addons/l10n_de/i18n/fi_FI.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/fr_FR.po b/addons/l10n_de/i18n/fr_FR.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/hr_HR.po b/addons/l10n_de/i18n/hr_HR.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/hu_HU.po b/addons/l10n_de/i18n/hu_HU.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/id_ID.po b/addons/l10n_de/i18n/id_ID.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/it_IT.po b/addons/l10n_de/i18n/it_IT.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/ko_KO.po b/addons/l10n_de/i18n/ko_KO.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/lt_LT.po b/addons/l10n_de/i18n/lt_LT.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/nl_BE.po b/addons/l10n_de/i18n/nl_BE.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/nl_NL.po b/addons/l10n_de/i18n/nl_NL.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/pl_PL.po b/addons/l10n_de/i18n/pl_PL.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/pt_PT.po b/addons/l10n_de/i18n/pt_PT.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/ro_RO.po b/addons/l10n_de/i18n/ro_RO.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/ru_RU.po b/addons/l10n_de/i18n/ru_RU.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/sl_SL.po b/addons/l10n_de/i18n/sl_SL.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/sq_AL.po b/addons/l10n_de/i18n/sq_AL.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/sv_SE.po b/addons/l10n_de/i18n/sv_SE.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/tr_TR.po b/addons/l10n_de/i18n/tr_TR.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/uk_UA.po b/addons/l10n_de/i18n/uk_UA.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/vi_VN.po b/addons/l10n_de/i18n/vi_VN.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/i18n/znd_ZND.po b/addons/l10n_de/i18n/znd_ZND.po old mode 100755 new mode 100644 diff --git a/addons/l10n_de/l10n_de_wizard.xml b/addons/l10n_de/l10n_de_wizard.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_gr/account_chart.xml b/addons/l10n_gr/account_chart.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/account_tax.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf b/addons/l10n_lu/wizard/2008_DECL_F_M10.pdf old mode 100755 new mode 100644 diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_nl/__init__.py b/addons/l10n_nl/__init__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py old mode 100755 new mode 100644 diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/account_chart_netherlands.xml old mode 100755 new mode 100644 diff --git a/addons/l10n_nl/l10n_nl_wizard.xml b/addons/l10n_nl/l10n_nl_wizard.xml old mode 100755 new mode 100644 diff --git a/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/mail_gateway/scripts/openerp_mailgate/openerp_mailgate.py old mode 100755 new mode 100644 diff --git a/addons/mrp/security/ir.model.access.csv b/addons/mrp/security/ir.model.access.csv index 496462b390c..eb8b8a197b8 100644 --- a/addons/mrp/security/ir.model.access.csv +++ b/addons/mrp/security/ir.model.access.csv @@ -71,3 +71,4 @@ "access_report_mrp_inout_user","report.mrp.inout user","model_report_mrp_inout","mrp.group_mrp_user",1,0,0,0 "access_report_workcenter_load_user","report.workcenter.load.user","model_report_workcenter_load","mrp.group_mrp_user",1,0,0,0 "access_mrp_bom_salesman","mrp.bom","model_mrp_bom","base.group_sale_salesman",1,0,0,0 +"access_mrp_bom_stockuser","mrp.bom","model_mrp_bom","stock.group_stock_user",1,0,0,0 diff --git a/addons/mrp_operations/report/mrp_code_barcode.rml b/addons/mrp_operations/report/mrp_code_barcode.rml old mode 100755 new mode 100644 diff --git a/addons/mrp_operations/report/mrp_wc_barcode.rml b/addons/mrp_operations/report/mrp_wc_barcode.rml old mode 100755 new mode 100644 diff --git a/addons/mrp_operations/security/ir.model.access.csv b/addons/mrp_operations/security/ir.model.access.csv old mode 100755 new mode 100644 diff --git a/addons/stock/security/ir.model.access.csv b/addons/stock/security/ir.model.access.csv index a2234521218..833d5ecb6c6 100644 --- a/addons/stock/security/ir.model.access.csv +++ b/addons/stock/security/ir.model.access.csv @@ -9,6 +9,8 @@ "access_stock_journal_manager","stock.journal.manager","model_stock_journal","stock.group_stock_manager",1,1,1,1 "access_stock_tracking_user","stock.tracking user","model_stock_tracking","stock.group_stock_user",1,1,1,1 "access_stock_tracking_manager","stock.tracking manager","model_stock_tracking","stock.group_stock_manager",1,0,0,0 +"access_stock_tracking_sales_user","stock.tracking sales.user","model_stock_tracking","base.group_sale_salesman",1,1,1,0 +"access_stock_tracking_purchase_user","stock.tracking purchase.user","model_stock_tracking","purchase.group_purchase_user",1,1,1,0 "access_stock_picking_user","stock.picking user","model_stock_picking","stock.group_stock_user",1,1,1,1 "access_stock_picking_manager","stock.picking manager","model_stock_picking","stock.group_stock_manager",1,1,0,0 "access_stock_production_lot_manager","stock.production.lot manager","model_stock_production_lot","stock.group_stock_manager",1,0,0,0 From f32adf267a672519e1fc6125fcf596e6e6c504d8 Mon Sep 17 00:00:00 2001 From: pso Date: Tue, 21 Dec 2010 15:54:10 +0530 Subject: [PATCH 16/98] [FIX] sale_marging: Calculated cost price as per pricelist lp bug: https://launchpad.net/bugs/689924 fixed bzr revid: pso@tinyerp.com-20101221102410-lylp224ghp45qkpi --- addons/sale_margin/sale_margin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index 97fd3b29cef..f7bbf41e5d3 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -29,9 +29,12 @@ class sale_order_line(osv.osv): res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty=qty, uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id, lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag) + frm_cur = self.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id + to_cur = self.pool.get('res.partner').browse(cr, uid, partner_id).property_product_pricelist.currency_id.id if product: purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price - res['value'].update({'purchase_price': purchase_price}) + price = self.pool.get('res.currency').compute(cr, uid, frm_cur, to_cur, purchase_price, round=False) + res['value'].update({'purchase_price': price}) return res def _product_margin(self, cr, uid, ids, field_name, arg, context=None): From 2afb6b4fb9ebc10659f1a8b7385f05c350580cf3 Mon Sep 17 00:00:00 2001 From: "hda(Open ERP)" <> Date: Tue, 21 Dec 2010 16:29:26 +0530 Subject: [PATCH 17/98] [FIX] account_anglo_saxon: Fixed 438717 lp bug: https://launchpad.net/bugs/438717 fixed bzr revid: pso@tinyerp.com-20101221105926-v8yolvocwulslyc6 --- addons/account_anglo_saxon/product.py | 40 +++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/addons/account_anglo_saxon/product.py b/addons/account_anglo_saxon/product.py index acd6577fbb7..ebb9bde3d00 100644 --- a/addons/account_anglo_saxon/product.py +++ b/addons/account_anglo_saxon/product.py @@ -30,7 +30,25 @@ class product_category(osv.osv): string="Price Difference Account", method=True, view_load=True, - help="This account will be used to value price difference between purchase price and cost price."), + help="This account will be used to value price difference between purchase price and cost price."), + + #Redefine fields to change help text for anglo saxon methodology. + 'property_account_income_categ': fields.property( + 'account.account', + type='many2one', + relation='account.account', + string="Income Account", + method=True, + view_load=True, + help="This account will be used to value outgoing stock for the current product category using sale price"), + 'property_account_expense_categ': fields.property( + 'account.account', + type='many2one', + relation='account.account', + string="Expense Account", + method=True, + view_load=True, + help="This account will be used to value outgoing stock for the current product category using cost price"), } product_category() @@ -45,7 +63,25 @@ class product_template(osv.osv): string="Price Difference Account", method=True, view_load=True, - help="This account will be used to value price difference between purchase price and cost price."), + help="This account will be used to value price difference between purchase price and cost price."), + + #Redefine fields to change help text for anglo saxon methodology. + 'property_account_income': fields.property( + 'account.account', + type='many2one', + relation='account.account', + string="Income Account", + method=True, + view_load=True, + help="This account will be used to value outgoing stock for the current product category using sale price"), + 'property_account_expense': fields.property( + 'account.account', + type='many2one', + relation='account.account', + string="Expense Account", + method=True, + view_load=True, + help="This account will be used to value outgoing stock for the current product category using cost price"), } product_template() From d9ade7b4f60e989f1113a524b3899ee205b5a55b Mon Sep 17 00:00:00 2001 From: "psi (Open ERP)" Date: Tue, 21 Dec 2010 16:55:30 +0530 Subject: [PATCH 18/98] [IMP] hr_payroll: Improve YML test bzr revid: psi@tinyerp.co.in-20101221112530-c3el0a4hfone7qwo --- addons/hr_payroll/__openerp__.py | 6 +++--- addons/hr_payroll/test/payment_advice.yml | 7 +------ addons/hr_payroll/test/payroll_register.yml | 8 -------- addons/hr_payroll/test/payslip.yml | 19 +++++-------------- 4 files changed, 9 insertions(+), 31 deletions(-) diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py index 0725e34f0f9..b305e6bf92b 100644 --- a/addons/hr_payroll/__openerp__.py +++ b/addons/hr_payroll/__openerp__.py @@ -55,9 +55,9 @@ 'wizard/hr_payroll_year_salary.xml', ], 'test': [ -# 'test/payslip.yml', -# 'test/payment_advice.yml', -# 'test/payroll_register.yml', + 'test/payslip.yml', + 'test/payment_advice.yml', + 'test/payroll_register.yml', # 'test/hr_payroll_report.yml', ], 'demo_xml': [ diff --git a/addons/hr_payroll/test/payment_advice.yml b/addons/hr_payroll/test/payment_advice.yml index 2d9fb8465c5..c10ada27c56 100644 --- a/addons/hr_payroll/test/payment_advice.yml +++ b/addons/hr_payroll/test/payment_advice.yml @@ -19,19 +19,14 @@ type_id: hr_contract.hr_contract_type_emp country_id: base.in department_id: hr.dep_it - employee_account: account.a_recv gender: male marital: hr.hr_employee_marital_status_single name: Richie - pg_joining: '2009-12-01' - property_bank_account: account.cash - salary_account: account.a_recv vehicle_distance: 0.0 - I create a new payment advice record - !record {model: hr.payroll.advice, id: hr_payroll_advice_advice0}: - account_id: account.cash line_ids: - amount: 5500.0 bysal: 5000.0 @@ -56,7 +51,7 @@ - Print Payroll Advice -- +- !python {model: hr.payroll.advice}: | import netsvc, tools, os (data, format) = netsvc.LocalService('report.payroll.advice').create(cr, uid, [ref('hr_payroll_advice_advice0')], {}, {}) diff --git a/addons/hr_payroll/test/payroll_register.yml b/addons/hr_payroll/test/payroll_register.yml index 7327688d22a..8bc346a34e1 100644 --- a/addons/hr_payroll/test/payroll_register.yml +++ b/addons/hr_payroll/test/payroll_register.yml @@ -18,25 +18,17 @@ type_id: hr_contract.hr_contract_type_emp country_id: base.in department_id: hr.dep_it - employee_account: account.a_recv gender: male marital: hr.hr_employee_marital_status_single name: Keith - pg_joining: '2009-12-01' - property_bank_account: account.cash - salary_account: account.a_recv vehicle_distance: 0.0 - I create a payroll register record. - !record {model: hr.payroll.register, id: hr_payroll_register_payroll0}: - bank_journal_id: account.bank_journal date: '2010-07-02' - journal_id: account.expenses_journal line_ids: - employee_id: hr_payroll.hr_employee_keith0 - bank_journal_id: account.bank_journal - journal_id: account.expenses_journal name: payroll1 - I click on Compute button. diff --git a/addons/hr_payroll/test/payslip.yml b/addons/hr_payroll/test/payslip.yml index ca204a62241..aa739d2c9a1 100644 --- a/addons/hr_payroll/test/payslip.yml +++ b/addons/hr_payroll/test/payslip.yml @@ -29,14 +29,10 @@ type_id: hr_contract.hr_contract_type_emp country_id: base.in department_id: hr.dep_it - employee_account: account.a_recv gender: male marital: hr.hr_employee_marital_status_single name: Richard - pg_joining: '2009-12-01' - property_bank_account: account.cash bank_account_id: res_partner_bank_0 - salary_account: account.a_recv vehicle_distance: 0.0 - I create a new payroll structure for software developer @@ -44,8 +40,7 @@ !record {model: hr.payroll.structure, id: hr_payroll_structure_softwaredeveloper0}: code: SD line_ids: - - account_id: account.a_expense - amount: 0.40000000000000002 + - amount: 0.40000000000000002 amount_type: per category_id: hr_payroll.HRA code: HRA @@ -54,8 +49,7 @@ sequence: 5 total: 0.0 type: allowance - - account_id: account.a_expense - amount: 10000.0 + - amount: 10000.0 amount_type: fix category_id: hr_payroll.CA code: CA @@ -64,8 +58,7 @@ sequence: 10 total: 0.0 type: allowance - - account_id: account.a_pay - amount: 10000.0 + - amount: 10000.0 amount_type: fix category_id: hr_payroll.PT code: PT @@ -74,8 +67,7 @@ sequence: 15 total: 0.0 type: deduction - - account_id: account.a_pay - amount: 0.125 + - amount: 0.125 amount_type: per category_id: hr_payroll.PF code: PF @@ -89,9 +81,8 @@ I create a employee payslip record - !record {model: hr.payslip, id: hr_payslip_0}: - bank_journal_id: account.bank_journal employee_id: hr_payroll.hr_employee_richard0 - journal_id: account.expenses_journal + - I click on 'Compute Sheet' button - From 1d311657b708663d3e760951db1f9ac630627887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Degrave?= Date: Tue, 21 Dec 2010 13:13:37 +0100 Subject: [PATCH 19/98] [IMP] access rights for manufacturing user group bzr revid: fde@openerp.com-20101221121337-hydrszi2yy18kuc4 --- addons/sale/security/ir.model.access.csv | 2 ++ addons/stock/stock_view.xml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 4b3d409d8c5..e44ced2bbcd 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -1,6 +1,8 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_sale_shop","sale.shop","model_sale_shop","base.group_user",1,0,0,0 "access_sale_order","sale.order","model_sale_order","base.group_sale_salesman",1,1,1,0 +"access_sale_order_manufacturing_user","sale.order manufacturing.user","model_sale_order","mrp.group_mrp_user",1,0,0,0 +"access_sale_order_line_manufacturing_user","sale.order.line manufacturing.user","model_sale_order_line","mrp.group_mrp_user",1,1,0,0 "access_sale_order_line","sale.order.line","model_sale_order_line","base.group_sale_salesman",1,1,1,1 "access_account_invoice_tax_salesman","account_invoice_tax salesman","account.model_account_invoice_tax","base.group_sale_salesman",1,1,1,0 "access_account_invoice_salesman","account_invoice salesman","account.model_account_invoice","base.group_sale_salesman",1,1,1,0 diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 1683914c082..6c60eff1a45 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -623,7 +623,7 @@ -