70eb74a260
[MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
...
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
5aa2fa150c
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
d0e9ba289f
[MERGE] from trunk
...
bzr revid: rim@openerp.com-20140429124452-5cvpmtpyz2daj8w2
2014-04-29 14:44:52 +02:00
ce17cb6d14
[MERGE][REM] List views removed in reporting menu (from membership and project_timesheet) as new graph view is now self-sufficient
...
bzr revid: rim@openerp.com-20140428130238-vcetovnq6lhuraoq
2014-04-28 15:02:38 +02:00
57cebaaac6
[MERGE] merged trunk up to revision 9365.
...
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
2014-04-22 11:28:15 +02:00
fa60b90c1f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
2014-04-22 07:52:47 +00:00
cccc7a3d0c
[MERGE]sync with trunk.
...
bzr revid: dka@tinyerp.com-20140417132329-sd2skyprb3nt88uw
2014-04-17 18:53:29 +05:30
f57b767361
[MERGE] merge from trunk
...
bzr revid: ged@openerp.com-20140415150146-5ovdjzta58t5dhd2
2014-04-15 17:01:46 +02:00
d6a3d9d089
[FIX] change the timesheet stat button in project form view to not display the number of hours (addon project_timesheet)
...
bzr revid: ged@openerp.com-20140415125715-slkpgg4mpqhw1mh0
2014-04-15 14:57:15 +02:00
398d96f273
[MERGE] merged trunk up to revision 9327
...
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
2014-04-14 11:47:43 +02:00
e82fbf7d91
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
2014-04-12 08:31:53 +00:00
99d9022830
[MERGE] merge with latest trunk
...
bzr revid: rma@tinyerp.com-20140411102703-6yglfuicsyx5gjoh
2014-04-11 15:57:03 +05:30
2e9ee9c76e
[MERGE] merge from rma branch
...
bzr revid: ged@openerp.com-20140410145131-fj17mdpi13wa5a9m
2014-04-10 16:51:31 +02:00
ff4726ea7d
[MERGE] merged trunk up to revision 9281
...
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
2014-04-03 10:14:27 +02:00
51aa261b44
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
2014-03-27 07:35:04 +00:00
fbb5eea4ba
[IMP] convert button into stat button for project
...
bzr revid: rajmyt@gmail.com-20140320094614-53ix0c0fdgrzbmsc
2014-03-20 15:16:14 +05:30
da210e4b5e
[MERGE] trunk
...
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
84ed653322
[IMP] remove tree view from task_hours_per_month report
...
bzr revid: rajmyt@gmail.com-20140304122931-ektojfe9yvlxeiba
2014-03-04 17:59:31 +05:30
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
b3c6e20e36
[MERGE]sync with trunk and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140210084803-rjkt9e4rhni8nhlt
2014-02-10 14:18:03 +05:30
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
bfe20de386
[FIX] project_timesheet: supply_method is implemented in the module
...
'procurement' but this one is not in the dependencies of project_timesheet.
bzr revid: stw@openerp.com-20140113162901-0ykp7nlrxdiydmv5
2014-01-13 17:29:01 +01:00
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
960924195e
[MERGE]merged with main addons
...
bzr revid: dka@tinyerp.com-20131030052926-i9c25mf6wpseioh3
2013-10-30 10:59:26 +05:30
65966940c8
[MERGE] merged with main trunk
...
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
11308f37dd
[FIX] test: avoid getting error when trying to send an email to the newly created user (email replaced by login)
...
bzr revid: mat@openerp.com-20131003143234-8tu732aa4rmycoif
2013-10-03 16:32:34 +02:00
9dba69ba48
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130912064018-3vecn03jcu9fm1m8
2013-09-12 06:40:18 +00:00
30f27b8cbb
[IMP] Move route_ids from product from stock_location to stock and remove supply_method (change with route)
...
bzr revid: jco@openerp.com-20130909115515-7z6ixaxe7bpxxe73
2013-09-09 13:55:15 +02:00
cb8f9c5a0d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130903054857-i15nhvtthlho7chm
2013-09-03 05:48:57 +00:00
b1611b9fa7
[IMP] Remove procure_method in timesheet (branch bde)
...
bzr revid: jco@openerp.com-20130829095327-jn9b06q1b3g3n07i
2013-08-29 11:53:27 +02:00
54631bda2a
[MERGE] trunk
...
bzr revid: fp@openerp.com-20130803175004-ivqkxtsd7vh4npwe
2013-08-03 19:50:04 +02:00
9b39fd9f7f
[Process]remove process module and all process views
...
bzr revid: darshankalola@gmail.com-20130730072623-bf1u8y1z0lo4cwrw
2013-07-30 12:56:23 +05:30
63111b6510
[WIP] cost_method moved to stock_account + stock_account implementation of stock valuation
...
bzr revid: qdp-launchpad@openerp.com-20130712141407-amspq13axc7x58l1
2013-07-12 16:14:07 +02:00
f35f2d01dc
[FIX] project_timesheet: still tracking references to stage management.
...
bzr revid: tde@openerp.com-20130627133221-o2or8el0dlxf89cv
2013-06-27 15:32:21 +02:00
e362775853
[FIX] project_timesheet: removed reference to state field of task
...
bzr revid: tde@openerp.com-20130627130950-wguigeottgr2dck4
2013-06-27 15:09:50 +02:00
8c6ff33bef
[IMP] Improve typos in warning (Grammar mistake, Capitalize title, Typos)
...
bzr revid: chm@openerp.com-20130607102359-is19utzap127nwr4
2013-06-07 12:23:59 +02:00
37fb148346
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130604091042-6aethn2pmxtniqaw
2013-06-04 11:10:42 +02:00
a26c8d76b9
[MERGE] from trunk
...
bzr revid: chm@openerp.com-20130503140029-vv7u9gjmax73qyta
2013-05-03 16:00:29 +02:00
07607f054b
[REM] more nonsensical @model + @ref
...
bzr revid: xmo@openerp.com-20130429125217-slmp1v9t7uri6ev6
2013-04-29 14:52:17 +02:00
3b73e2b2a4
[IMP]Removed space before Exclamation marks [!]
...
bzr revid: ggh@tinyerp.com-20130429071557-vnxo5nni03vc886j
2013-04-29 12:45:57 +05:30
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
84ac4daf19
[IMP] crm_case_section: add js libraries JustGage
...
bzr revid: chm@openerp.com-20130412161730-lrx5tqr6wn784glq
2013-04-12 18:17:30 +02:00
44514ced89
[REF] project_timesheet: removed openerp.pooler imports.
...
bzr revid: vmt@openerp.com-20130327125922-6dl0331b8h9600hk
2013-03-27 13:59:22 +01:00
4ce8d2697d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130316055338-ogfw01ap8fh1hlaj
bzr revid: launchpad_translations_on_behalf_of_openerp-20130317045918-zi1230lgxjbkqw3x
bzr revid: launchpad_translations_on_behalf_of_openerp-20130318044640-ts2tr31y2gl25rev
2013-03-18 04:46:40 +00:00
72f29d98b8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130315055412-luy9qg1pkdjnqlud
2013-03-15 05:54:12 +00:00
2f5c8b2ccb
[IMP] typo
...
bzr revid: fp@openerp.com-20130312125616-eqowv5xpeydyyf7x
2013-03-12 13:56:16 +01:00
e333fab181
[IMP] project_timesheet and hr, Updated employee name and emails.
...
bzr revid: tta@openerp.com-20130312103011-6oyvqjykks36u1z4
2013-03-12 16:00:11 +05:30
Quentin (OpenERP)
Gery Debongnie
Josse Colpaert
Richard Mathot (OpenERP)
Randhir Mayatra (OpenERP)
Launchpad Translations on behalf of openerp
Darshan Kalola (OpenERP)
Randhir Mayatra (OpenERP)
Stephane Wirtel
Martin Trigaux
Fabien Pinckaers
Darshan Kalola
Thibault Delavallée
Christophe Matthieu
Xavier Morel
ggh-openerp
Vo Minh Thu
Tejas Tank