odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
85,602 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

1320 Commits

Author SHA1 Message Date
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
 2014-05-02 15:07:53 +02:00
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report 
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
 2014-05-01 18:11:56 +02:00
Fabien Meghazi b7003a382a [MERGE] upstream 
bzr revid: fme@openerp.com-20140429154104-csm3jq6uxy9tk1ea
 2014-04-29 17:41:04 +02:00
Richard Mathot (OpenERP) d0e9ba289f [MERGE] from trunk 
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
 2014-04-29 14:44:52 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7 
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
 2014-04-29 13:27:38 +02:00
Richard Mathot (OpenERP) 65f2db5c21 [MERGE] from trunk 
bzr revid: rim@openerp.com-20140429081937-hhqcg84o7iha78fq
 2014-04-29 10:19:37 +02:00
Denis Ledoux 2832d2ddc9 [MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 10016 revid:dle@openerp.com-20140425125507-njfyl1r6wn11vqwx 
bzr revid: dle@openerp.com-20140425125926-5nchz1tcq4fx18jx
 2014-04-25 14:59:26 +02:00
Martin Trigaux bb85882322 [FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet (opw 592632) 
bzr revid: mat@openerp.com-20140425100856-lcpgyjdk4u632bws
 2014-04-25 12:08:56 +02:00
Fabien Meghazi 1c4e2cfd22 [IMP] bundlify addons (except website) 
bzr revid: fme@openerp.com-20140424172129-ze74eaz2eaidmxhm
 2014-04-24 19:21:29 +02:00
Martin Trigaux 34067a1f49 [FIX] hr_timesheet_sheet: forbid to record an attendance in a submitted timesheet 
lp bug: https://launchpad.net/bugs/1180769 fixed

bzr revid: mat@openerp.com-20140424142829-ramy830hwkghk1jv
 2014-04-24 16:28:29 +02:00
Christophe Simonis 7a7d7febf8 [MERGE] forward port of branch saas-3 up to revid 9429 chs@openerp.com-20140424123538-rxk9got9k2on1ki1 
bzr revid: chs@openerp.com-20140424131824-4ksluvhnegp7kplb
bzr revid: chs@openerp.com-20140424134533-lhhcd32n3s0m9cqk
 2014-04-24 15:45:33 +02:00
Christophe Simonis 52cfc16c2e [MERGE] forward port of branch 7.0 up to revid 10012 launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz 
bzr revid: chs@openerp.com-20140424123538-rxk9got9k2on1ki1
 2014-04-24 14:35:38 +02:00
Denis Ledoux 966a818aa6 [FIX] hr_timesheet_sheet: allow writing attendance line not according to the date order, and check that the attendances satisfy the alternance constraint, even for delete operations 
lp bug: https://launchpad.net/bugs/1180773 fixed

bzr revid: dle@openerp.com-20140423112554-75bpk5k3viroqbh5
 2014-04-23 13:25:54 +02:00
Bharat Devnani (Open ERP) 3a0c820dfd [MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock) 
bzr revid: rim@openerp.com-20140422123022-22zef462lts0qyqi
 2014-04-22 14:30:22 +02:00
Launchpad Translations on behalf of openerp 89fd1bede4 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140419063533-z6kswp5wkioh5jlv
bzr revid: launchpad_translations_on_behalf_of_openerp-20140420055842-traoy17xi60ufook
bzr revid: launchpad_translations_on_behalf_of_openerp-20140421050815-44ydlitvsaj3xdd9
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422082459-bfjqgpt2bpgll64p
 2014-04-22 08:24:59 +00:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
 2014-04-22 07:52:47 +00:00
Bharat R. Devnani (OpenERP) b8d4387d33 [MERGE] merged with main addons branch 
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
 2014-04-18 11:42:56 +05:30
Darshan Kalola (OpenERP) cccc7a3d0c [MERGE]sync with trunk. 
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
 2014-04-17 18:53:29 +05:30
Gery Debongnie f57b767361 [MERGE] merge from trunk 
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
 2014-04-15 17:01:46 +02:00
Gery Debongnie 8135812d34 [FIX] moves the field definitions of models hr.job and hr.employee that should have been in submodules to their correct place (in hr_something) to avoid dependencies problems (addons hr, hr_*) 
bzr revid: ged@openerp.com-20140415105419-wy026n5k10wo80wb
 2014-04-15 12:54:19 +02:00
Randhir Mayatra rma-openerp c399e1daaf [MERGE] merge with latest trunk and resolve conflicts 
bzr revid: rma@tinyerp.com-20140414110149-r3l00xr8l08ex7oc
 2014-04-14 16:31:49 +05:30
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Richard Mathot (OpenERP) e1cebe9003 [REF] hr_timesheet: unused piece of code 
bzr revid: rim@openerp.com-20140414132634-xaps5ydbic5jriw4
 2014-04-14 15:26:34 +02:00
Richard Mathot (OpenERP) 91a5db808d [MERGE] from trunk 
bzr revid: rim@openerp.com-20140414115354-w8gpo3eks1rnud9k
 2014-04-14 13:53:54 +02:00
Gery Debongnie 2e9ee9c76e [MERGE] merge from rma branch 
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
 2014-04-10 16:51:31 +02:00
Randhir Mayatra rma-openerp 9dbaa58694 [MERGE] merge with latest trunk 
bzr revid: rma@tinyerp.com-20140407102440-ngtr58o2w2ypqrol
 2014-04-07 15:54:40 +05:30
Chirag Dodiya (OpenERP) 76840b36cb [MRG]Merge with lp:openobject-addons 
bzr revid: cod@tinyerp.com-20140331090709-y4bj3kqp5chq2zko
 2014-03-31 14:37:09 +05:30
Randhir Mayatra rma-openerp 77ff3a69b8 [IMP] improve icons and views 
bzr revid: rma@tinyerp.com-20140328133051-2amm63n2vy3bj3xe
 2014-03-28 19:00:51 +05:30
Randhir Mayatra rma-openerp 457a62dee6 [IMP] add stat button for point of sale, email template 
bzr revid: rma@tinyerp.com-20140327113720-1jlqhlk17muqv5nf
 2014-03-27 17:07:20 +05:30
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Yogesh Parekh (OpenERP) 3897de56b7 [IMP]: Convert buttons into stat buttons in hr modules 
bzr revid: ypa@tinyerp.com-20140326120056-qqauj7pmhf0uxhuj
 2014-03-26 17:30:56 +05:30
Launchpad Translations on behalf of openerp 1f3c4f852f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140319063002-sd17jxb37ycogrrz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140320061944-bwpy0lt1bp5ee0y2
 2014-03-20 06:19:44 +00:00
Chirag Dodiya (OpenERP) dd404cd701 [MRG]Merge with lp:openobject-addons 
bzr revid: cod@tinyerp.com-20140319070736-oxjw6beks1fda6xn
 2014-03-19 12:37:36 +05:30
Launchpad Translations on behalf of openerp f166daf065 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065427-0he29w0cqe07xmc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065421-4udfyb7xcfq5h1zy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140309060314-64jktl10pkq3inv4
 2014-03-09 06:03:14 +00:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
 2014-03-04 08:27:04 +00:00
Launchpad Translations on behalf of openerp 9863dbe5c8 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
 2014-03-04 07:52:38 +00:00
Sunil Sharma (OpenERP) dd4813e360 [mrg]:lp:openobject-addons 
bzr revid: sunilsharma.sharma07@gmail.com-20140304063937-vyrt063gzfhsoy4k
 2014-03-04 12:09:37 +05:30
Chirag Dodiya (OpenERP) dbc6a8368d [MRG]Merge with trunk 
bzr revid: cod@tinyerp.com-20140225083944-abbn3m7e5c26crk1
 2014-02-25 14:09:44 +05:30
Launchpad Translations on behalf of openerp b949cef63c Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221054843-7g7jwzx085jnes1q
 2014-02-21 05:48:43 +00:00
Launchpad Translations on behalf of openerp 5d2f1c68ac Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
 2014-02-17 06:03:28 +00:00
Bharat R. Devnani (OpenERP) 9e102b6b24 [MERGE] merged with main addons 
bzr revid: bde@tinyerp.com-20140212064422-4thlmyk5psff9lth
 2014-02-12 12:14:22 +05:30
Darshan Kalola (OpenERP) b3c6e20e36 [MERGE]sync with trunk and resolve conflicts. 
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
 2014-02-10 14:18:03 +05:30
Launchpad Translations on behalf of openerp 2bebb9cd4d Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140201065304-8md3g4d14l1b51ii
bzr revid: launchpad_translations_on_behalf_of_openerp-20140202060105-bnt8nw1mcbg2c3m3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140203055609-uxdqgnistwilvo2v
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204064835-qdcrcxldc5zsutio
 2014-02-04 06:48:35 +00:00
Gery Debongnie 9cdcf812a6 [MERGE] merge from trunk into local branch 
bzr revid: ged@openerp.com-20140130135251-ahk515cy0wc87kyr
 2014-01-30 14:52:51 +01:00
Gery Debongnie e96e86b314 [IMP] improves the reporting view Timesheet Sheet Analysis (add some measures to the table) in addon hr_timesheet_sheet 
bzr revid: ged@openerp.com-20140130132007-uyvddo0eq8yssft8
 2014-01-30 14:20:07 +01:00
Gery Debongnie a768f15038 [IMP] improves the reporting view Timesheet Analysis (add some measures to the table) in addon hr_timesheet_sheet 
bzr revid: ged@openerp.com-20140130131737-hibhsfqurtxe7weh
 2014-01-30 14:17:37 +01:00
Sunil Sharma (OpenERP) a267d86b29 [rem,imp]:hr:remove hr dashboard and improve hr view 
bzr revid: sunilsharma.sharma07@gmail.com-20140130064923-35tvo8q3sy4n09vx
 2014-01-30 12:19:23 +05:30
Launchpad Translations on behalf of openerp 3ce5e01eca Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
 2014-01-28 06:41:39 +00:00
Gery Debongnie 68a466e8a8 [IMP] improves the Timesheet Analysis reporting view : changes the axis, adds a 'this month' filter using the new pivot graph view (addon hr_timesheet_sheet) 
bzr revid: ged@openerp.com-20140127130351-iu422fkjnu8059wd
 2014-01-27 14:03:51 +01:00
Bharat R. Devnani (OpenERP) 28a33f3a8d [IMP] improved some warning messages 
bzr revid: bde@tinyerp.com-20140124123045-kgovbmuhkovax068
 2014-01-24 18:00:45 +05:30