pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,049 Commits 1 Branch 0 Tags
680ac657987fad1215a177df33e0bf330dfd0345
Commit Graph
27049 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jay Vora (OpenERP) 680ac65798 [MERGE] Merged Anup's branch for the fix of webkit report failing to translate report texts 
bzr revid: jvo@tinyerp.com-20110616054053-9i1xsaavcje6gyd1
 2011-06-16 11:10:53 +05:30
Launchpad Translations on behalf of openerp 6fa378ef67 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110616052838-fnjl9u9cnb1jvoa7
 2011-06-16 05:28:38 +00:00
Jay Vora (OpenERP) b2a3fcd74e [MERGE] Merged Riken's branch for the fix on report_webkit in case the report template is missing or wrong path is supplied 
bzr revid: jvo@tinyerp.com-20110615105020-9f89s1wj15z72nnl
 2011-06-15 16:20:20 +05:30
Launchpad Translations on behalf of openerp c53a71e5fd Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110611061409-ecnqbwm3bygj8u5g
bzr revid: launchpad_translations_on_behalf_of_openerp-20110612055743-thjtyvlghv6ilesh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110613050634-37bhjxopxl12dd0h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110614053053-gxk9oiflw1rl915r
bzr revid: launchpad_translations_on_behalf_of_openerp-20110615054922-xkkewo3ajk3i5hje
 2011-06-15 05:49:22 +00:00
rch-openerp 40114b7eb9 [FIX] webkit: User friendly popup error message displayed while webkit report's path does not exist. 
bzr revid: rch@tinyerp.com-20110614120803-k9ohpc3cehh9agz3
 2011-06-14 17:38:03 +05:30
rch-openerp 6436bfacba [IMP]: Remove unchange lines from diff. 
bzr revid: rch@tinyerp.com-20110614120215-v2gg7ws7qq333yqa
 2011-06-14 17:32:15 +05:30
rch-openerp 719d35406d [Merge]: From lp:openobject-addons/6.0 
bzr revid: rch@tinyerp.com-20110614111238-8u4nu93c6ocr6pps
 2011-06-14 16:42:38 +05:30
rch-openerp ba16e35fef [FIX] webkit: User friendly popup error message displayed when webkit report's path does not exist. 
lp bug: https://launchpad.net/bugs/747284 fixed

bzr revid: rch@tinyerp.com-20110613111747-nh9j1t8kfss2o8vu
 2011-06-13 16:47:47 +05:30
pso (OpenERP) c42c0fbf0a [MERGE] Merged IRA's branch to remove company name from all translation files 
bzr revid: pso@tinyerp.com-20110610144056-7btpse8plsj0umed
 2011-06-10 20:10:56 +05:30
Launchpad Translations on behalf of openerp bcdae4b5c0 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110610053839-22gcervxkaqwds4c
bzr revid: launchpad_translations_on_behalf_of_openerp-20110610053916-lgmzqin1pa1a9bxn
 2011-06-10 05:39:16 +00:00
Jay Vora (OpenERP) a3b4fb985f [MERGE] Merged Panos(xrg)' branch for the fix on yml assertion report message 
bzr revid: jvo@tinyerp.com-20110609192321-hbbiz0bxfw4xj0ep
 2011-06-10 00:53:21 +05:30
Jay Vora (OpenERP) 96ef9d4997 [MERGE] Merged Tejas' branch for the fix of copy() of tasks from project and template creation 
bzr revid: jvo@tinyerp.com-20110609113329-phkqf0mszjd186qr
 2011-06-09 17:03:29 +05:30
Launchpad Translations on behalf of openerp 8366c21a7a Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110609054412-x73d1ted80mmjoy4
 2011-06-09 05:44:12 +00:00
Launchpad Translations on behalf of openerp bad898f180 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110526054022-2ds2g929z18ig90d
bzr revid: launchpad_translations_on_behalf_of_openerp-20110528055054-ov9x4rz2eh1bkwsk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110530054037-wxjyiqpks1m9p9r9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110604062439-y9jslckbylbdh1bw
bzr revid: launchpad_translations_on_behalf_of_openerp-20110605061405-k1zpw9pwwp01cm0k
bzr revid: launchpad_translations_on_behalf_of_openerp-20110607055108-6md8992nbe3eovde
bzr revid: launchpad_translations_on_behalf_of_openerp-20110608054238-fjvqja5x8qqikmkc
bzr revid: launchpad_translations_on_behalf_of_openerp-20110609054334-iya43fa8ab0gxpz0
 2011-06-09 05:43:34 +00:00
Stephane Wirtel 45de3f6388 [FIX] Import __future__ 
bzr revid: stw@openerp.com-20110608142148-ja2tig95vk4t0vd8
 2011-06-08 16:21:48 +02:00
Anup (OpenERP) 25ec9dd480 [MERGE] account_budget : Merged RGO's branch for budget line's fix 
bzr revid: ach@tinyerp.com-20110608074144-cxnt2ak1uyv5453b
 2011-06-08 13:11:44 +05:30
Ila Rana fb0c1a61b3 [FIX]:stock_location_translation_problem(case:6112) 
bzr revid: ira@tinyerp.com-20110608073418-g1h9s0vmr7ybhvfb
 2011-06-08 13:04:18 +05:30
Launchpad Translations on behalf of openerp 78f3b1bcdb Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110608054322-fhnbs0qip0i7dhpb
 2011-06-08 05:43:22 +00:00
Ravi Gohil (Open ERP) eafbcb600f [FIX] account_budget: removed select=1 in budget lines 
bzr revid: rgo@tinyerp.com-20110608044037-n6ywreq1zswtbni8
 2011-06-08 10:10:37 +05:30
Jay Vora (OpenERP) 8322076815 [MERGE] Merged Stefan Rijnhart (Therp)' branch for the fix of journal creation from templates 
bzr revid: jvo@tinyerp.com-20110607182144-xxj0eyeyanvvcdxy
 2011-06-07 23:51:44 +05:30
Jay Vora (OpenERP) cd7d6f513a [MERGE] Merged Rifakat's branch to set the default security days as 0 for company 
bzr revid: jvo@tinyerp.com-20110607174736-7lw2qay1bpfmbwgm
 2011-06-07 23:17:36 +05:30
Jay Vora (OpenERP) fbe8147d9d [MERGE] Merged the branch for the fix of hr_holidays 
bzr revid: jvo@tinyerp.com-20110607172943-yltnxcyaphbt71d8
 2011-06-07 22:59:43 +05:30
Jay Vora (OpenERP) 5436c95ae2 [REVERTER] Reverted MSH's fix for share module 
bzr revid: jvo@tinyerp.com-20110607172822-yl7w47yt08lfp3yt
 2011-06-07 22:58:22 +05:30
Jay Vora (OpenERP) a356667de1 [FIX] hr_holidays: Refusal of holidays was broken when leave is requested by category 
lp bug: https://launchpad.net/bugs/794099 fixed

bzr revid: jvo@tinyerp.com-20110607171935-icqldup5eqmcem0b
 2011-06-07 22:49:35 +05:30
Ravi Gohil (Open ERP) 59ed60fcc4 [FIX] account_budget: removed select=1 
bzr revid: rgo@tinyerp.com-20110607132051-40gayxpaz0j9zr5d
 2011-06-07 18:50:51 +05:30
Ravi Gohil (Open ERP) 663b5199cd [merge]: merging with the same branch 
bzr revid: rgo@tinyerp.com-20110607131508-d8c2qtwj02g7qc7w
 2011-06-07 18:45:08 +05:30
Ravi Gohil (Open ERP) 0b4bb20a03 [FIX] account_budget : Admin user has been added to anlytic group by default 
lp bug: https://launchpad.net/bugs/781790 fixed

bzr revid: rgo@tinyerp.com-20110608112109-5x3tqu7a8lo2m9hc
 2011-06-08 16:51:09 +05:30
Rifakat Haradwala (Open ERP) 03d602ef27 [IMP]: useability improvement in company for Security Days 
bzr revid: rha@tinyerp.com-20110607112640-r5t44iycnh6x2ayj
 2011-06-07 16:56:40 +05:30
Mohammed Shekha(Open ERP) 74b9c6aa19 [FIX] Domain should be in list. 
bzr revid: noz@tinyerp.com-20110607100444-u4ba95ts7tssy1j6
 2011-06-07 15:34:44 +05:30
Jay Vora (OpenERP) 6ccb0e047a [MERGE] Merged Oliver Dony's branch for the fixes of share module 
bzr revid: jvo@tinyerp.com-20110607073027-gd9wius28dxck4js
 2011-06-07 13:00:27 +05:30
Jay Vora (OpenERP) ed1008a73c [MERGE] Merged from Parent branch 
bzr revid: jvo@tinyerp.com-20110607071218-9izvo0x9jat0a332
 2011-06-07 12:42:18 +05:30
Jay Vora (OpenERP) 4c72e4401f [FIX] Backported the fix from trunk for the module Audittrail : audit_trail settings should be readable by everyone, not just the user in employee group 
lp bug: https://launchpad.net/bugs/722579 fixed

bzr revid: jvo@tinyerp.com-20110607071047-ubogvm2fndrhh1zd
 2011-06-07 12:40:47 +05:30
Launchpad Translations on behalf of openerp 641183ceb3 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110607055136-eweklqa6yg8a87hj
 2011-06-07 05:51:36 +00:00
pso (OpenERP) a5bc0b2462 [MERGE] Merged SKH's branch to update file content in init_xml, data_xml and to set noupdate=1 in related data file. Merged branch lp:~openerp-dev/openobject-addons/6.0-opw-5661-skh (case:5661) 
bzr revid: pso@tinyerp.com-20110607053954-gmsnik2r543symvd
 2011-06-07 11:09:54 +05:30
Jay Vora (OpenERP) 1cab9fc8ac [FIX] account_followup: corrected the followup report getting called from wizard 
lp bug: https://launchpad.net/bugs/789215 fixed

bzr revid: jvo@tinyerp.com-20110606101409-o08phj4cft9snpvw
 2011-06-06 15:44:09 +05:30
Launchpad Translations on behalf of openerp 63df568e0b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110604062542-kjl652zx460qui6g
bzr revid: launchpad_translations_on_behalf_of_openerp-20110605061513-kkfft2p8rjl4gseh
bzr revid: launchpad_translations_on_behalf_of_openerp-20110606054349-hi2fwldkfbzht3rv
 2011-06-06 05:43:49 +00:00
P. Christeas 5344e317ae yaml_import: fix ambiguous syntax at end of report 
When finishing a YAML import, the syntax ["str %d" % int + int] turns
out to be ambiguous and is resolved as [ ("str %d" % int) + int],
leading to a:
  TypeError: cannot concatenate 'str' and 'int' objects

This had been first fixed in commit f46966e044d18a644 (2010-06-30)
(cherry picked from commit cc0c584e5dfbf672d51f61e7207047f357e31471)

bzr revid: xrg@linux.gr-20110605113520-4jvooqvs2wbm1qs0
 2011-06-05 14:35:20 +03:00
Anup (OpenERP) 891cffb477 [FIX] account_invoice_layout : Fixed the issue with the account in invoice lines when multicompany environment is used(Case:5805) 
lp bug: https://launchpad.net/bugs/784499 fixed

bzr revid: ach@tinyerp.com-20110603110608-afq8idnx3r6821z6
 2011-06-03 16:36:08 +05:30
Launchpad Translations on behalf of openerp 9786984685 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20110602060319-yd7ydo50oksv630o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110603060029-6l62ka38ko2f1rkt
 2011-06-03 06:00:29 +00:00
Jay Vora (OpenERP) ffe6b0b5b2 [FIX/REF] Minor but Important fixes 
bzr revid: jvo@tinyerp.com-20110602051455-sl7dhyq1godaj5cd
 2011-06-02 10:44:55 +05:30
Jay Vora (OpenERP) 7f0ccd13fb [FIX] Project_scrum/Purchase_requisition : Corrected _defaults for date/datetime values 
bzr revid: jvo@tinyerp.com-20110601211919-v23j6jazo09q5mxk
 2011-06-02 02:49:19 +05:30
Jay Vora (OpenERP) 1726a21590 [MERGE] Merged RGO's branch for the fix of Stock : Corrected _defaults for date/time fields 
bzr revid: jvo@tinyerp.com-20110601210758-e6h64e28vulptk2t
 2011-06-02 02:37:58 +05:30
Jay Vora (OpenERP) 2c97b2a1de [FIX] Product_visible_discount : Correction in the __openerp__.py for the dependency module and fix the onchange methods for sale order line and invoice line(Ref : Case 5998) 
bzr revid: jvo@tinyerp.com-20110601210054-tzfwnoy72hrpavyd
 2011-06-02 02:30:54 +05:30
Somesh(OpenERP) 316415201c [FIX] Product_visible_discount : Correction in the __openerp__.py for the dependency module and fix the code for the product pricelist item(Ref : Case 5998) 
bzr revid: jvo@tinyerp.com-20110601205621-51stxny30ixd8q7w
 2011-06-02 02:26:21 +05:30
Somesh(OpenERP) 1481ce0677 [FIX] Product_visible_discount : Correction in the __openerp__.py for the dependency module and fix the code for the product pricelist item(Ref : Case 5998) 
bzr revid: jvo@tinyerp.com-20110601204012-cclm9qdw15cbvnoo
 2011-06-02 02:10:12 +05:30
Somesh(OpenERP) 4f939dfd21 [FIX] Product_visible_discount : Correction in the __openerp__.py for the dependency module and fix the code for the product pricelist item(Ref : Case 5998) 
bzr revid: jvo@tinyerp.com-20110601203636-ruw224r8u75aplzj
 2011-06-02 02:06:36 +05:30
Somesh(OpenERP) 9568612c0f [FIX] Product_visible_discount : Correction in the __openerp__.py for the dependency module and fix the code for the product pricelist item(Ref : Case 5998) 
bzr revid: jvo@tinyerp.com-20110601202806-8uxb2r9lylvpibvu
 2011-06-02 01:58:06 +05:30
Jay Vora (OpenERP) 13b4cb8250 [FIX] l10n_ch : Correction made to look for customer invoices only on BVR import(Case 5493) 
bzr revid: jvo@tinyerp.com-20110601122804-9m5x99h62nz9xcbs
 2011-06-01 17:58:04 +05:30
Jay Vora (OpenERP) 55c0844873 [FIX] HR_Payroll/Hr_recruitment/Membership/Point_of_sale/Project_timesheet : Corrected Yml tests,thanks to buildbot 
bzr revid: jvo@tinyerp.com-20110601121446-jzm8iwof1k7rghst
 2011-06-01 17:44:46 +05:30
Jay Vora (OpenERP) 2565c86d65 [FIX] HR_Payroll/Hr_recruitment/Membership/Point_of_sale/Project_timesheet : Corrected Yml tests,thanks to buildbot 
bzr revid: jvo@tinyerp.com-20110601074434-3of4ae2986opx9tr
 2011-06-01 13:14:34 +05:30