Commit Graph
42644 Commits
Author SHA1 Message Date
Ujjvala Collins (OpenERP) 3051a3c40c [MERGE]
bzr revid: uco@tinyerp.com-20110310054629-szq66pkzv8p0uwm0
2011-03-10 11:16:29 +05:30
Jigar Amin 52447bde82 [BUG-FIX] lp:731294 survey : Access rights for the Invited or and Survey User to Create Report Using netrpc local service
lp bug: https://launchpad.net/bugs/731294 fixed

bzr revid: jam@tinyerp.com-20110310054211-a9pxctozw27h5ujh
2011-03-10 11:12:11 +05:30
mtr d4a5c96afa [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-payroll
bzr revid: mtr@mtr-20110310053747-79fbrkud3ycqfhz6
2011-03-10 11:07:47 +05:30
psi (Open ERP) 3ce6dbde44 [MERGE] merge with main trunk-payroll branch
bzr revid: psi@tinyerp.co.in-20110310053224-zlmqbi3u1ht3ocop
2011-03-10 11:02:24 +05:30
ARA (OpenERP) 05055ad75b [FIX] Point_of_sale: resubmit above merge proposal
bzr revid: ara@tinyerp.com-20110310053113-c3ae7c9we0k4mnrl
2011-03-10 11:01:13 +05:30
Atul Patel (OpenERP) 600ffac3d5 [IMP]: Import data for opportunity and correct some problem for dependency.
bzr revid: atp@tinyerp.com-20110310051958-u30t8o233aq3euet
2011-03-10 10:49:58 +05:30
Bhumika (OpenERP) 8141fc1e0a [MERGE]
bzr revid: sbh@tinyerp.com-20110310051935-yq4ozggqwz5ru3o8
2011-03-10 10:49:35 +05:30
ARA (OpenERP) f2010d5be3 [FIX] Point_of_sale: [trunk] POS: creating invoice for partner with empty address
bzr revid: ara@tinyerp.com-20110310051238-cc8uki8qo47045n4
2011-03-10 10:42:38 +05:30
Launchpad Translations on behalf of openerp 418a1beffd Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110310044636-k42hq7vfv8qd11o5
2011-03-10 04:46:36 +00:00
Xavier Morel e312689221 [ADD] qunit test for qweb
bzr revid: xmo@openerp.com-20110309221205-sjdh5rdbjqzy1ntn
2011-03-09 23:12:05 +01:00
Quentin (OpenERP) 61b9fd420f [MERGE] lp:731035
bzr revid: qdp-launchpad@openerp.com-20110309184127-hac60f3vqynk0rkh
2011-03-09 19:41:27 +01:00
Xavier Morel 5c946d629b [IMP] improvements to qweb
bzr revid: xmo@openerp.com-20110309170254-ucze2gs4yhh14y8v
2011-03-09 18:02:54 +01:00
Quentin (OpenERP) c312d4b2bd [MERGE] lp:726444
bzr revid: qdp-launchpad@openerp.com-20110309165246-b1gws90c0ewv3h3w
2011-03-09 17:52:46 +01:00
Quentin (OpenERP) f110edbefa [MERGE] lp:726816
bzr revid: qdp-launchpad@openerp.com-20110309164418-jvtr58an3yej7yhm
2011-03-09 17:44:18 +01:00
Quentin (OpenERP) 3b7a15a34e [MERGE] lp:726551
bzr revid: qdp-launchpad@openerp.com-20110309163756-2jd6j11qhz6zjgit
2011-03-09 17:37:56 +01:00
Quentin (OpenERP) 1dbe9ad07c [MERGE] lp:722673
bzr revid: qdp-launchpad@openerp.com-20110309163322-zvcz3q64hsr3x031
2011-03-09 17:33:22 +01:00
Quentin (OpenERP) fbd4d063f8 [MERGE] merged fix of lp bug 715477
bzr revid: qdp-launchpad@openerp.com-20110309161249-klox9o64rmhhzg5x
2011-03-09 17:12:49 +01:00
Quentin (OpenERP) 2bad63af62 [MERGE] merged fix of lp bug 724891
bzr revid: qdp-launchpad@openerp.com-20110309160739-vlt5tmua4sspw2a0
2011-03-09 17:07:39 +01:00
Quentin (OpenERP) a9752fa0c8 [MERGE] merged fix of bug 727162
bzr revid: qdp-launchpad@openerp.com-20110309160532-5elwfovvttom3i7w
2011-03-09 17:05:32 +01:00
Quentin (OpenERP) e362e692e3 [MERGE] merged fix of bug 721595
bzr revid: qdp-launchpad@openerp.com-20110309160129-306vxpqxitjzt2hd
2011-03-09 17:01:29 +01:00
Fabien Meghazi a28eabafef Display header's user info when logged in. Should do real on_logged_in and on_logged_out
bzr revid: fme@openerp.com-20110309155944-4027u8f3er4o1y6w
2011-03-09 16:59:44 +01:00
Quentin (OpenERP) d129e16e85 [MERGE] merged dev2 branch
bzr revid: qdp-launchpad@openerp.com-20110309155527-l9d77rtquhtto7ts
2011-03-09 16:55:27 +01:00
Fabien Meghazi 346d439591 Added header right corner
bzr revid: fme@openerp.com-20110309150338-manveau1sy99fotm
2011-03-09 16:03:38 +01:00
Fabien Meghazi 0cb92aa8bd Added header images (should talk about a clean way to store images)
bzr revid: fme@openerp.com-20110309145945-jf3e3zodlexlxu15
2011-03-09 15:59:45 +01:00
Quentin (OpenERP) 0422834a5a [REVERT] reverted bugfix lp 708434, should be discussed and developped in a distinct branch
bzr revid: qdp-launchpad@openerp.com-20110309145900-29ynvnyv7neh9bcn
2011-03-09 15:59:00 +01:00
Quentin (OpenERP) 0efe8a535e [REF] product/pricelist.py: small code refactoring
bzr revid: qdp-launchpad@openerp.com-20110309145201-srzm1vhmega7sh3f
2011-03-09 15:52:01 +01:00
Atul Patel (OpenERP) 45c7fab903 [ADD]: ADD Dependency table and import dependency before Import table for sugarcrm.
bzr revid: atp@tinyerp.com-20110309140832-kadne2p106oiox8f
2011-03-09 19:38:32 +05:30
ARA (OpenERP) 96415dbeb7 [FIX] Point_of_sale: [trunk] POS: creating invoice for partner with empty address
lp bug: https://launchpad.net/bugs/731787 fixed

bzr revid: ara@tinyerp.com-20110309134355-p62rr19fyewvq2p1
2011-03-09 19:13:55 +05:30
RME (OpenERP) e693a24c0d [IMP] more than one sprints overlaps need seperation of that sprints
bzr revid: rme@tinyerp.com-20110309133107-19cm6vwn1l92i8nk
2011-03-09 19:01:07 +05:30
psi (Open ERP) da3745b2d6 [IMP] hr_payroll: Get payslip_line for leaves
bzr revid: psi@tinyerp.co.in-20110309133027-2z1b6i3pvz0di3i9
2011-03-09 19:00:27 +05:30
Quentin (OpenERP) 4341c795c4 [MERGE] merged with main addons branch
bzr revid: qdp-launchpad@openerp.com-20110309131425-bz2wsl8onhzyl2ww
2011-03-09 14:14:25 +01:00
Thibault Francois e3e979a498 [MERGE] default value in act_window
bzr revid: tfr@openerp.com-20110309130345-uraw50vl1xlzqy6t
2011-03-09 14:03:45 +01:00
mtr bb4cc763a9 [MERGE] branch merged with trunk-payroll-salary_rules-psi
bzr revid: mtr@mtr-20110309125647-4qv3bwf6rm6j9b5j
2011-03-09 18:26:47 +05:30
ksa (Open ERP) 27e3559326 [FIX]:product_margin purchases values in sales
lp bug: https://launchpad.net/bugs/723448 fixed

bzr revid: ksa@tinyerp.co.in-20110309123538-45ufsyjrtkhj7cj1
2011-03-09 18:05:38 +05:30
Ujjvala Collins (OpenERP) e3718e60c2 [FIX] mail_gateway: Fixed unique file name error while sending mail.
lp bug: https://launchpad.net/bugs/730632 fixed

bzr revid: uco@tinyerp.com-20110309123033-lwpzrncs7qge8jag
2011-03-09 18:00:33 +05:30
ron@tinyerp.com 3a600489fb [FIX]stock:split production lot take only Int value
lp bug: https://launchpad.net/bugs/729539 fixed

bzr revid: ron@tinyerp.com-20110309122421-3a5dwc52gzoiqbr8
2011-03-09 17:54:21 +05:30
Xavier Morel 7c72a27d11 [IMP] try adding some doc to qweb foreach
bzr revid: xmo@openerp.com-20110309115746-4hkmq0oziwoi4jfs
2011-03-09 12:57:46 +01:00
Rucha (Open ERP) c77b0fdc66 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-oldstyle-wiz-conversion-oldstyle-wiz-ron
bzr revid: rpa@tinyerp.com-20110309113256-lv2bmr1mhoq2ujq1
2011-03-09 17:02:56 +05:30
Thibault Francois 50c25ec820 [MERGE] bug fix lp:725081
bzr revid: tfr@openerp.com-20110309113205-n2sf2ioe8gowg6ll
2011-03-09 12:32:05 +01:00
mtr f0e3ce0dbb [IMP] hr_payroll:improved code of _calculate(hr.payslip) for gross and net
bzr revid: mtr@mtr-20110309113003-03rr094fnxwn5n35
2011-03-09 17:00:03 +05:30
Thibault Francois d67c8b3977 [MERGE] 725736
bzr revid: tfr@openerp.com-20110309112550-zzm2n7khyt8d9lnj
2011-03-09 12:25:50 +01:00
ARA (OpenERP) 182cb58b7e [FIX] account: [6.0.1] Exception raised when setting an Account InActive
lp bug: https://launchpad.net/bugs/728417 fixed

bzr revid: ara@tinyerp.com-20110309112242-vrdmegno38b5ogre
2011-03-09 16:52:42 +05:30
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