Olivier Dony
196c11d41e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110913132843-eo7vevh8h9924hm2
2011-09-13 15:28:43 +02:00
Quentin (OpenERP)
16a0c5514e
[IMP] account_followup: added dependency to account_accountant module (otherwise the menu to send followups is not visible)
...
bzr revid: qdp-launchpad@openerp.com-20110913070847-4kkp36wp5pyepq6h
2011-09-13 09:08:47 +02:00
Olivier Dony
983a7d2fd2
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110912123152-xswj0jlmhp7qpoz8
2011-09-12 14:31:52 +02:00
Xavier Morel
178fec5c64
[FIX] str 'in' str (singletons missing tuple-building comma), in @colors attributes. Replace by string equality
...
bzr revid: xmo@openerp.com-20110911135025-v9yct8pnjfj21tyj
2011-09-11 15:50:25 +02:00
Olivier Dony
f42126df0e
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110906080846-lyi3haucchsaz7uo
2011-09-06 10:08:46 +02:00
752df5acbd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110905055933-cld0r3vv3jmiu5bx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110906044018-ajk9u7zfqoiatufs
2011-09-06 04:40:18 +00:00
Antony Lesuisse
71443ad49f
[MERGE] trunk
...
bzr revid: al@openerp.com-20110827211948-kmap692ves3ixo4k
2011-08-27 23:19:48 +02:00
ae7b1699cb
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110823050537-7q5lx6k2wq8n70ld
bzr revid: launchpad_translations_on_behalf_of_openerp-20110824043728-ri9o75i5hp2tss1x
2011-08-24 04:37:28 +00:00
Olivier Dony
4fcb67bef1
[MERGE] latest trunk
...
bzr revid: odo@openerp.com-20110822171856-1zkyunpjyz5ffdth
2011-08-22 19:18:56 +02:00
Olivier Dony
8f9f45ea94
[IMP] all: next pass of review/renaming for new mail API
...
bzr revid: odo@openerp.com-20110822171659-zxho36a6n628i10q
2011-08-22 19:16:59 +02:00
063e28a83d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110820045348-7oh5zs7l4lr3zsq1
2011-08-20 04:53:48 +00:00
b93ee681aa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110819043543-y0ffrzj9o2vtuktx
2011-08-19 04:35:43 +00:00
ac9c0e55b0
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110818043608-kjmi6rgmnpk2d36r
2011-08-18 04:36:08 +00:00
Olivier Dony
50507512cb
[MERGE] latest trunk
...
This was a helluva merge, with hundreds of conflicts resolved manually!!
I hope I did not break too many things, but a full review of the mail-related
features (where most of the conflicts occurred) must still be done before
this feature branch can be merged.
bzr revid: odo@openerp.com-20110809234428-3dsvxrt6t54ju0cf
2011-08-10 01:44:28 +02:00
Antony Lesuisse
ebf66d36ac
[MERGE] ir.config rework xmo
...
bzr revid: al@openerp.com-20110804120957-9kzz0xacktzihmlv
2011-08-04 14:09:57 +02:00
1bb79ca921
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110730050033-h7utz09178tvvetl
bzr revid: launchpad_translations_on_behalf_of_openerp-20110731043831-gj2tw6sdh1e8sf34
bzr revid: launchpad_translations_on_behalf_of_openerp-20110801043943-wwcxg26n160r0o21
2011-08-01 04:39:43 +00:00
Xavier Morel
09cf4d40d0
[FIX] convert ir.actions.todo fields to match model definition changes
...
* type = special => type = automatic
* type = recurring | normal => type = normal
* default type special => normal
* state = hidden => state = done
bzr revid: xmo@openerp.com-20110729140324-0nxus4p8ufj46z9y
2011-07-29 16:03:24 +02:00
Xavier Morel
cc13113641
[REF] reformat xml files before applying automated search&replace on them
...
bzr revid: xmo@openerp.com-20110729134810-oiqptqs2omvo7o7c
2011-07-29 15:48:10 +02:00
Xavier Morel
5a41a68bc2
[MERGE] from trunk
...
bzr revid: xmo@openerp.com-20110726111218-umzudy6z5wrn63j9
2011-07-26 13:12:18 +02:00
Xavier Morel
a5fdb75ad6
[FIX] ir.actions.todo are now unskippable
...
bzr revid: xmo@openerp.com-20110714103725-6r6j35qegobhvx5u
2011-07-14 12:37:25 +02:00
Raphael Collet
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
Hardik Ansodariy (OpenERP)
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
Quentin (OpenERP)
664ba7bba3
[MERGE] merge with main addons branch
...
bzr revid: qdp-launchpad@openerp.com-20110630133009-i0qxzrn9up9e0bog
2011-06-30 15:30:09 +02:00
mayur maheshwari (Open ERP)
1ec27aad78
[IMP]account_followup:now space is again removed
...
bzr revid: mma@tinyerp.com-20110620123854-fn19aswk1g49as05
2011-06-20 18:08:54 +05:30
mayur maheshwari (Open ERP)
5b101f9111
[IMP]account_followup:now space is removed
...
bzr revid: mma@tinyerp.com-20110620120622-51a36xuv6m3b80qk
2011-06-20 17:36:22 +05:30
mayur maheshwari (Open ERP)
cd31269299
[IMP]account_followup:adding a menu tip in serch view
...
bzr revid: mma@tinyerp.com-20110620112756-fmjh4omi1pkp0orv
2011-06-20 16:57:56 +05:30
0ca42c7805
[IMP] account_followup: usability improvements
...
bzr revid: qdp-launchpad@openerp.com-20110615095134-pxkhuky6el04zp62
2011-06-15 11:51:34 +02:00
Rucha (Open ERP)
ea0a0c3345
[ADD]: *: Added category for missing wizards;
...
bzr revid: rpa@tinyerp.com-20110610093516-lzy4i276s6xr3e8n
2011-06-10 15:05:16 +05:30
552afb10c5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110603044017-yoke5zwvpebyo93o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110604045342-rkt8o6e65uyj8kjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20110605043539-vvllkcbozllrdlg7
bzr revid: launchpad_translations_on_behalf_of_openerp-20110606043718-0i2770ro7c0oho9t
2011-06-06 04:37:18 +00:00
aag (OpenERP)
78fa60047c
[IMP]account_followup: Improvement in yml is Done for constraint
...
bzr revid: aag@tinyerp.co.in-20110511053607-6sio6yeb23zatsqj
2011-05-11 11:06:07 +05:30
aag (OpenERP)
fc48af90b3
[IMP]account_followup: Improvement is Done
...
bzr revid: aag@tinyerp.co.in-20110510135557-m0fr3ba4ugwcvnrd
2011-05-10 19:25:57 +05:30
aag (OpenERP)
fc2dff1f19
[IMP]account_followup: Add Sequence Fields to account_followup
...
bzr revid: aag@tinyerp.co.in-20110509100620-lhkd3cvw3h1zqqq0
2011-05-09 15:36:20 +05:30
aag (OpenERP)
f47615d0f8
[ADD]account_followup:Add new Configure Follow-Ups config Wizard
...
bzr revid: aag@tinyerp.co.in-20110506124715-juqaut5dkijvr89y
2011-05-06 18:17:15 +05:30
aag (OpenERP)
ed0314292e
[IMP]account_followup:Improvement in view is Done
...
bzr revid: aag@tinyerp.co.in-20110506122819-1yavcr27fvqxqblm
2011-05-06 17:58:19 +05:30
d553615695
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110429055618-q15rvfmlvfsl2im5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110430045341-qzlphdlvqf2aa1zx
bzr revid: launchpad_translations_on_behalf_of_openerp-20110501045420-py2vl38b1o3mfs7o
bzr revid: launchpad_translations_on_behalf_of_openerp-20110502043731-ym2tvgj2djoitk8f
2011-05-02 04:37:31 +00:00
Harry (OpenERP)
0577796333
[MERGE] merged addons trunk development branch after resolving conflicts
...
bzr revid: hmo@tinyerp.com-20110421080156-3c8gg29i01089rgo
2011-04-21 13:31:56 +05:30
Quentin (OpenERP)
b1310a9814
[MERGE] merged project branch for multi currency compliance on account_followup
...
bzr revid: qdp-launchpad@openerp.com-20110407123631-cqcqi9b1szpay8g5
2011-04-07 14:36:31 +02:00
Quentin (OpenERP)
bae6364c24
[IMP] account_followup: improved report
...
bzr revid: qdp-launchpad@openerp.com-20110407123515-s56jq5qtwxoddevr
2011-04-07 14:35:15 +02:00
838512af0b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110401044755-ox0af9npzekocmtk
bzr revid: launchpad_translations_on_behalf_of_openerp-20110402045547-u88jxku3jz7ejycg
bzr revid: launchpad_translations_on_behalf_of_openerp-20110403044009-x9bqq57ukyqvp6ia
bzr revid: launchpad_translations_on_behalf_of_openerp-20110404044757-3uw7ib92gpv7ezu1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405044706-ew5moemiz1wxra7h
2011-04-05 04:47:06 +00:00
Rifakat Haradwala (Open ERP)
47a85e9f8f
[IMP] mail: rename module email to mail because of parsing error
...
bzr revid: rha@tinyerp.com-20110404094552-j2rdq2sbeqrbffgn
2011-04-04 15:15:52 +05:30
Rifakat Haradwala (Open ERP)
9a9c100595
[Merge]: merge with lp:~openerp-dev/openobject-addons/emails-framework-addons
...
bzr revid: rha@tinyerp.com-20110330092614-sgnniorxit17zvxn
2011-03-30 14:56:14 +05:30
Quentin (OpenERP)
7c77f450ab
[MERGE] merged with main branch
...
bzr revid: qdp-launchpad@openerp.com-20110329130049-9icvwthzyb4h3gsl
2011-03-29 15:00:49 +02:00
Harry (OpenERP)
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
9e4ae35beb
[IMP]Account followup:Improvement of report style and shape
...
bzr revid: ron@tinyerp.com-20110325124235-2niq7ivqgirr6vv0
2011-03-25 18:12:35 +05:30
niv-openerp
55a226ef3a
[MERGE] Resynchronized with trunk.
...
bzr revid: nicolas.vanhoren@openerp.com-20110325102413-7xjgusazsow7nwaf
2011-03-25 11:24:13 +01:00
Quentin (OpenERP)
cf33670162
[FIX][IMP] account_followup: improved the layout and overal shape of report + fixed the way to display amount in currency other than company (should use amount_currency field instead of (debit-credit * rate))
...
bzr revid: qdp-launchpad@openerp.com-20110323144341-425n7h1rkrpj4s1s
2011-03-23 15:43:41 +01:00
33ad8a8ad9
[MERGE]Merged with lp:addons
...
bzr revid: ron@tinyerp.com-20110322113035-ue0seiainl3y3vuq
2011-03-22 17:00:35 +05:30
915451ba16
[IMP]:Account:multi currency report feature improvement(send follow ups)
...
bzr revid: ron@tinyerp.com-20110322111023-d3phue8nql33gdwr
2011-03-22 16:40:23 +05:30
vro
1ea7f3bd99
[IMP]: Images & Descriptions.
...
bzr revid: vro@tinyerp.com-20110321133747-k7z4yistfi19rplm
2011-03-21 19:07:47 +05:30
Rifakat Haradwala (Open ERP)
2fe7c51e36
[REM] email.smtp_server: removed email.smtp_server and did changes in email module
...
bzr revid: rha@tinyerp.com-20110321133156-y57yw6sekshnw9ns
2011-03-21 19:01:56 +05:30
Olivier Dony