Commit Graph
34754 Commits
Author SHA1 Message Date
Thibault Francois 9c3fc1c226 [MERGE] bug fix lp:720247
bzr revid: tfr@openerp.com-20110309111913-y14gkw6et9mf5946
2011-03-09 12:19:13 +01:00
Els Van Vossel e2b95177b7 [IMP] Changed some module names and descriptions
bzr revid: evv@openerp.com-20110309111634-mox4i5hxj07lhuuv
2011-03-09 12:16:34 +01:00
Xavier Morel 9b56599bb6 [IMP] muck around with vars and returns to simplify flows in qweb, extract xhr generation in its own function
bzr revid: xmo@openerp.com-20110309111307-rpaueaqjdzg1dkgj
2011-03-09 12:13:07 +01:00
Vo Minh Thu a7b73bbb33 [FIX] l10n_lu: added import with_statement.
bzr revid: vmt@openerp.com-20110309110820-jax81r3qsori93sl
2011-03-09 12:08:20 +01:00
Thibault Francois 3e7c4ec599 [IMP] calendar fix
bzr revid: tfr@openerp.com-20110309105959-zblg3a87gt9vu25w
2011-03-09 11:59:59 +01:00
Xavier Morel e94c8e810b [IMP] use switch/case in QWeb.trim, remove default case (as it's already handled by conditional at function top)
bzr revid: xmo@openerp.com-20110309104800-tdbzuqtg9lpardhr
2011-03-09 11:48:00 +01:00
Xavier Morel c7cfccf678 [REM] broken QWeb.dump() and QWeb.debug() functions ('s' unknown and undeclared in dump), broken qweb demo HTML file
bzr revid: xmo@openerp.com-20110309104358-ndorl9ijp1perixs
2011-03-09 11:43:58 +01:00
Xavier Morel 6bf2a9efd6 [FIX] deduplicate local variable declaration
bzr revid: xmo@openerp.com-20110309104058-oicx8oz67wq0cdq4
2011-03-09 11:40:58 +01:00
Xavier Morel adf7654683 [IMP] quiet down pycharm's type-inference/verif again
bzr revid: xmo@openerp.com-20110309104008-9g3efgflpz4j8am8
2011-03-09 11:40:08 +01:00
Xavier Morel 59a28e24ce [FIX] don't leak out variables as globals
bzr revid: xmo@openerp.com-20110309103930-0q0bnv4l6d8bb9tf
2011-03-09 11:39:30 +01:00
psi (Open ERP) 8b1895b8e8 [IMP] hr_payroll: Improve demo data(set negative value for deduction)
bzr revid: psi@tinyerp.co.in-20110309103758-x4kzt9kn5krogre3
2011-03-09 16:07:58 +05:30
Xavier Morel 5e6bff90ca [FIX] QWeb.reg is a regex, don't init to a string (or pycharm's type-inference whines)
bzr revid: xmo@openerp.com-20110309103634-eqxuczw0g0kilhcy
2011-03-09 11:36:34 +01:00
Xavier Morel 31845dbf61 [IMP] terminate all JS statements in qweb
bzr revid: xmo@openerp.com-20110309103529-adjvos1r0s073fz9
2011-03-09 11:35:29 +01:00
Xavier Morel a99603920c [IMP] reindent qweb
bzr revid: xmo@openerp.com-20110309103436-a3v9bh4f87ddnutj
2011-03-09 11:34:36 +01:00
Vo Minh Thu 4db9a2533c [FIX] setup.py: modification so py2exe works.
- still needs some testing, sdist should be tested again.

bzr revid: vmt@openerp.com-20110309101939-zo19v7gxd1bqryrb
2011-03-09 11:19:39 +01:00
psi (Open ERP) b46811e762 [MERGE] merge with mtr's payroll branch
bzr revid: psi@tinyerp.co.in-20110309101242-385e7hxtp2z9j04h
2011-03-09 15:42:42 +05:30
psi (Open ERP) 4de1ee3f35 [IMP] on hr.employee object make basic field as function and the function make the sum of basic field of all the hr.contract for this employee that have date_start < now() and now() < date_stop or not date_stop
bzr revid: psi@tinyerp.co.in-20110309101041-p4i0n49uq0qo2tm2
2011-03-09 15:40:41 +05:30
Els Van Vossel a69c473f52 [IMP] Changed all module categories, limited number of categories
bzr revid: evv@openerp.com-20110309100505-mwxe08davyzdkfis
2011-03-09 11:05:05 +01:00
Thibault Francois 04434d72e5 [MERGE] bug lp:730746
bzr revid: tfr@openerp.com-20110309093205-aiq6kscljyr6w3rx
2011-03-09 10:32:05 +01:00
aag (OpenERP) 48406be61d [FIX] Product:Reference UoM for category should be checked for uniqueness
lp bug: https://launchpad.net/bugs/731035 fixed

bzr revid: aag@tinyerp.co.in-20110309091943-2mpn5q4b3i6r383i
2011-03-09 14:49:43 +05:30
Thibault Francois b7b0b24321 [MERGE] bug fix lp:727875
bzr revid: tfr@openerp.com-20110309091641-308d0hyow2t17jdu
2011-03-09 10:16:41 +01:00
mtr 5b0fdb52a9 [IMP] hr_payroll:commented 'allounce' and 'deduction' field in view of payroll register.
bzr revid: mtr@mtr-20110309085733-1cmjz1q1fojs3iso
2011-03-09 14:27:33 +05:30
mtr f6a7d660be [IMP] hr_payroll:improved code and view for 'basic_amount' of hr.payslip
bzr revid: mtr@mtr-20110309085441-nka6x5s8hfhxt982
2011-03-09 14:24:41 +05:30
ron@tinyerp.com c70f688377 [IMP]point_of_sale:correct string and code improve for property field
bzr revid: ron@tinyerp.com-20110309083839-pqfbqs85e2q6316m
2011-03-09 14:08:39 +05:30
mtr 6292725450 [IMP] hr_contract:added access rights for hr.passport object
bzr revid: mtr@mtr-20110309062231-ea2huggnqk8qgchg
2011-03-09 11:52:31 +05:30
Rifakat Haradwala (Open ERP) 3aea08000a [Merge] : Merge with lp:openobject-addons
bzr revid: rha@tinyerp.com-20110309062148-2lu0jdzg16m9gsus
2011-03-09 11:51:48 +05:30
psi (Open ERP) ff6906a863 [MERGE] merge with mtr's payroll branch
bzr revid: psi@tinyerp.co.in-20110309051412-9nbsm55bg6d0uhvm
bzr revid: psi@tinyerp.co.in-20110309051510-1f5t36fmrvvdylgp
bzr revid: psi@tinyerp.co.in-20110309061636-62k6exdgr5ilnblj
2011-03-09 11:46:36 +05:30
Bhumika (OpenERP) 9fc9446215 [MERGE]
bzr revid: sbh@tinyerp.com-20110309061118-nhifc6pde89o8wbw
2011-03-09 11:41:18 +05:30
mtr 1dc96b5404 [IMP] hr,hr_payroll:removed hr.passport from .csv,improved hr.payslip and hr.payslip.line object
bzr revid: mtr@mtr-20110309061111-sl9d1b10c9wnk16r
2011-03-09 11:41:11 +05:30
RME (OpenERP) 13d3c639fa [FIX] wiki : Accented character creating problem in 'Difference' wizard to show difference of changes occured in revisions
lp bug: https://launchpad.net/bugs/730746 fixed

bzr revid: rme@tinyerp.com-20110309060847-4kuh78sr7uzznfye
2011-03-09 11:38:47 +05:30
Bhumika (OpenERP) 6932356c45 [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20110308052207-vmx44ylksjf9mo9a
bzr revid: sbh@tinyerp.com-20110309060049-ojkwrrhy2mcmlgo6
2011-03-09 11:30:49 +05:30
Rifakat Haradwala (Open ERP) 0ec541f6f4 [IMP] : mrp: string formatting
bzr revid: rha@tinyerp.com-20110309060025-7klq1juri4ho2f1z
2011-03-09 11:30:25 +05:30
Rucha (Open ERP) ca51678217 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-trunk-oldstyle-wiz-convrsion-aag
bzr revid: rpa@tinyerp.com-20110309055539-rt1g1o9blyqsmv44
2011-03-09 11:25:39 +05:30
ARA (OpenERP) 25ee7aff54 [FIX] account: [6.0] invoice - must check if product is to_sell, to_purchase
bzr revid: ara@tinyerp.com-20110309054913-ohllm2ppeyprk8n1
2011-03-09 11:19:13 +05:30
ARA (OpenERP) b45b35d224 [FIX] account: [6.0] invoice - must check if product is to_sell, to_purchase
lp bug: https://launchpad.net/bugs/729602 fixed

bzr revid: ara@tinyerp.com-20110309051047-y52k8fez7hs2tvle
2011-03-09 10:40:47 +05:30
Rifakat Haradwala (Open ERP) 5cd5e83cbf [IMP] : account,account_followup,project,project_scrum: string formatting
bzr revid: rha@tinyerp.com-20110309045822-pcvetf2a2nd0o8kv
2011-03-09 10:28:22 +05:30
Launchpad Translations on behalf of openerp 1e681a15bc Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110305045627-sks4s3i42qo2oj3p
bzr revid: launchpad_translations_on_behalf_of_openerp-20110306045008-pcson59t3bl9r6ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20110307044936-g60qlnsbhllrba7h
bzr revid: launchpad_translations_on_behalf_of_openerp-20110308044752-1i8vh7qa5baootby
bzr revid: launchpad_translations_on_behalf_of_openerp-20110309044026-i5o7lki6yoc0wwol
2011-03-09 04:40:26 +00:00
Jigar Amin 6f4eaf868e [FIX] project_issue : assigned_to field should read only until the field of the task is filled, improvemnts suggested by tfr
bzr revid: jam@tinyerp.com-20110309043622-uh2v02zp9mvboe0t
2011-03-09 10:06:22 +05:30
Fabien Meghazi be420bc347 Start working on layout
bzr revid: fme@openerp.com-20110308224758-si0b41r1nvpb0ban
2011-03-08 23:47:58 +01:00
Fabien Meghazi a22866c19f Added images
bzr revid: fme@openerp.com-20110308224732-wfcbrnto166ftl2y
2011-03-08 23:47:32 +01:00
Vo Minh Thu 545acf9b98 [MERGE] sql_db: use the config values later than at import time.
bzr revid: vmt@openerp.com-20110308175013-sc58omafi21h8zbp
2011-03-08 18:50:13 +01:00
Christophe Simonis 6b7a10e4bf [FIX] account: correct default unit price for supplier invoices (issue #4346)
bzr revid: chs@openerp.com-20110308164037-iknvpeo079u68bo5
2011-03-08 17:40:37 +01:00
Thibault Francois c2531d6426 [IMP] mass forward lead also + fix email_to empty + fix body not defined
bzr revid: tfr@openerp.com-20110308164002-e28rir542eim9fff
2011-03-08 17:40:02 +01:00
niv-openerp 2e2d85503a [FIX] compilation problems
bzr revid: nicolas.vanhoren@openerp.com-20110308162041-0t6kk49hfmf13hay
2011-03-08 17:20:41 +01:00
niv-openerp 13d8b38c4e [FIX] Cleaned for eclipse.
bzr revid: nicolas.vanhoren@openerp.com-20110308145754-uzjzt5unoa2sslri
2011-03-08 15:57:54 +01:00
niv-openerp 747783efea [FIX] Corrected indentation.
bzr revid: nicolas.vanhoren@openerp.com-20110308145530-rdy43672n558kq5s
2011-03-08 15:55:30 +01:00
Jay Vora (OpenERP) 9cfdc4248c [FIX] Purchase_requisition : Correction on call to write(), Corrected the commit sbh@tinyerp.com-20100709113554-htq4ole8xlezba0w
lp bug: https://launchpad.net/bugs/724891 fixed

bzr revid: jvo@tinyerp.com-20110308145252-jo1123m1pp579ulp
2011-03-08 20:22:52 +05:30
Vo Minh Thu adc6decdb5 [MERGE] debian/init: merged Niels Huylebroeck change to factor out log and config files as parameter.
bzr revid: vmt@openerp.com-20110308145129-9z1c58m1vk512zlg
2011-03-08 15:51:29 +01:00
Vo Minh Thu 8fae3e7c6f [FIX] sql_db: use the config values later than at import time.
lp bug: https://launchpad.net/bugs/716715 fixed

bzr revid: vmt@openerp.com-20110308140449-5v883yms1z8dy23k
2011-03-08 15:04:49 +01:00
aag (OpenERP) d6d6475163 [IMP] STOCK :RD Project- old style wizard conversion-add one new Func get_return_history
bzr revid: aag@tinyerp.co.in-20110308134725-2o5n6olzqtfn09tx
2011-03-08 19:17:25 +05:30