3d9b149dcc
[imp] merge + cleaning: contract managemeent, not perfect yet, but good enough -> to replace static email one day
...
bzr revid: fp@tinyerp.com-20111108225337-5muyehnvgqasv44i
2011-11-08 23:53:37 +01:00
6f77ce98c7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105055805-1lmgpe8dot0mqkd3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111105060437-gd0ilsg6cdytkvq2
2011-11-05 06:04:37 +00:00
e3ffcd94d6
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019044609-vzsrc1a6nn17ahbo
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019055343-7s4rmkn8lpxvyt4n
bzr revid: launchpad_translations_on_behalf_of_openerp-20111019060521-3smagczfoys4j5wl
2011-10-19 06:05:21 +00:00
7a06e4c05d
[MERGE] base_setup dynamic introspecting ir_module_module
...
bzr revid: al@openerp.com-20111005165504-ohkyy7edqhykirei
2011-10-05 18:55:04 +02:00
3dc8168974
[FIX] Set the categories
...
bzr revid: stw@openerp.com-20111005141902-72du0lku4x176ix9
2011-10-05 16:19:02 +02:00
3fe0d08772
[FIX] some catgories and complexity
...
bzr revid: al@openerp.com-20111004231832-8hx5233nm031nuhs
2011-10-05 01:18:32 +02:00
1ba826a4ea
[REF] Rename the categories
...
bzr revid: stw@openerp.com-20110928141258-9hfn5rfhboar2e5z
2011-09-28 16:12:58 +02:00
bdfaf1e37d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110928052022-bf10e5c48galbsqj
bzr revid: launchpad_translations_on_behalf_of_openerp-20110929043652-10gfn8flzy6x79n3
2011-09-29 04:36:52 +00:00
6f7fea4b22
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110927044752-uiboscqhxxr0qmit
2011-09-27 04:47:52 +00:00
d101d3fbaa
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110916043614-dx3d800b9sj5wm7b
2011-09-16 04:36:14 +00:00
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
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
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
65c43a1946
[MERGE] trunk
...
bzr revid: al@openerp.com-20110805211034-hc8z53m6zzwksipu
2011-08-05 23:10:34 +02:00
0b4d547900
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110805142118-0z8k0f897xfu2zll
2011-08-05 16:21:18 +02:00
6aeed3c0d9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110805044024-q7ugk62igzbg3qjo
2011-08-05 04:40:24 +00:00
56d7786d46
[MERGE] move menu Automated Actions
...
bzr revid: rco@openerp.com-20110804143305-e2ws5yb7q5w2shzu
2011-08-04 16:33:05 +02:00
be1a659658
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110803043726-ofn4l3px2ooldl00
bzr revid: launchpad_translations_on_behalf_of_openerp-20110804043456-fnef8uwgur5od0en
2011-08-04 04:34:56 +00:00
be0809a670
[MERGE] remove address_id from user
...
bzr revid: rco@openerp.com-20110803100602-75dcx4dqsh3sragi
2011-08-03 12:06:02 +02:00
101fdbd738
[usability],automated action menu come at adminstration menu
...
bzr revid: amb@tinyerp.com-20110728070432-bwi7d0o0a1n1xvtr
2011-07-28 12:34:32 +05:30
caa3c07094
email.addresss_id_repalce_by_user_email
...
bzr revid: rmu@tinyerp.com-20110728061156-swmn5jz78zb3w4vd
2011-07-28 11:41:56 +05:30
292b4683b6
[MERGE] add field 'complexity' in modules
...
bzr revid: rco@openerp.com-20110708100307-5axn5hnn92qm8qiw
2011-07-08 12:03:07 +02:00
adafbc707a
[MERGE] from trunk
...
bzr revid: rco@openerp.com-20110708092232-mlezo4330k2j8vvw
2011-07-08 11:22:32 +02:00
1f5aa0643f
[IMP]: module is defined by its complexity
...
bzr revid: han@tinyerp.com-20110706122928-xvcpdu5inpkganfy
2011-07-06 17:59:28 +05:30
48e5f7b773
[FIX] base_action_rule: dumb patch to avoid repeated calls to related cron task
...
base.action.rule uses a trick to piggyback on the
first execution of ir.cron's poolJobs() to register
its ORM hooks. It was currently doing that every
single time poolJobs() was called, leading to
incessant querying the ORM objects for which a
base action rule exist.
Now it will do it only once, and then respect the
scheduled executions.
Soon this mechanism will be removed and replaced
by a proper event handler for some 'ORM finished init'
event, to be fired by the server.
bzr revid: odo@openerp.com-20110624102419-safqqq1hcc5v1tau
2011-06-24 12:24:19 +02:00
6c57b9ddc1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110601043809-ocpn3eaostvtf4mx
2011-06-01 04:38:09 +00:00
e23b1cd050
[MERGE] move menu 'Automated Actions' to Administration/Customization
...
bzr revid: rco@openerp.com-20110519145312-7awlwys2opzy8bva
2011-05-19 16:53:12 +02:00
fca888b1c8
[usability],change in manu automated action
...
bzr revid: amb@tinyerp.com-20110519123747-ysmde794md2m1esg
2011-05-19 18:07:47 +05:30
61aa21b90c
[usability] move action rules into administration, base_action_rule_view
...
bzr revid: amb@tinyerp.com-20110518122409-3dpyvfdq0fai5hmj
2011-05-18 17:54:09 +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
5be7bbd5c3
[MERGE] merged with trunk development branch
...
bzr revid: hmo@tinyerp.com-20110428111210-llk36qlgkdz1ls54
2011-04-28 16:42:10 +05:30
2f1607c786
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110422043906-4a4yeks4mzl3sfef
bzr revid: launchpad_translations_on_behalf_of_openerp-20110423045345-9xga4elfyud8nsec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110424043747-9x0ffekdqw8ldcc1
bzr revid: launchpad_translations_on_behalf_of_openerp-20110425045050-3owniws6mcmmclll
bzr revid: launchpad_translations_on_behalf_of_openerp-20110426044154-jrf1eg82ie49zl0r
2011-04-26 04:41:54 +00:00
8fee569a7b
[REF] Clean up
...
bzr revid: stephane@openerp.com-20110422113706-kyeoyfb79uvc5899
2011-04-22 13:37:06 +02:00
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
ad0ececa4e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110412043500-p2dr3313fnqonqsm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110413044003-7pujurdq9cldrqkm
bzr revid: launchpad_translations_on_behalf_of_openerp-20110415050633-iw3b088ogvp5c34f
2011-04-15 05:06:33 +00:00
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
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
cf7c73310d
[MERGE] merged with trunk addods development branch
...
bzr revid: hmo@tinyerp.com-20110329122736-78igudbed2jz7lf4
2011-03-29 17:57:36 +05:30
d8ca559b5d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110329044041-qyy3q7u1em74acq9
2011-03-29 04:40:41 +00:00
55a226ef3a
[MERGE] Resynchronized with trunk.
...
bzr revid: nicolas.vanhoren@openerp.com-20110325102413-7xjgusazsow7nwaf
2011-03-25 11:24:13 +01:00
28bb0168f2
[IMP]: Detailed descriptions added.
...
bzr revid: vro@tinyerp.com-20110322132141-nlms978ymg4mom1g
2011-03-22 18:51:41 +05:30
8c5349a683
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20110320044558-ev1jrkafe83u2pxc
bzr revid: launchpad_translations_on_behalf_of_openerp-20110321044719-jq7brro8iejzgpqq
bzr revid: launchpad_translations_on_behalf_of_openerp-20110322043613-5hvgnsn9xs2glqfx
2011-03-22 04:36:13 +00:00
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
cf07e58016
[MERGE] Other improvements of descriptions in module manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318140618-jg2jumv3gyacfb74
2011-03-18 15:06:18 +01:00
437ed909c2
[IMP]: Module descriptions.
...
bzr revid: vro@tinyerp.com-20110318114737-znh9wtipt84hc5jd
2011-03-18 17:17:37 +05:30
a898038b47
[MERGE] Merged module screenshots and improvements to module descriptions.
...
bzr revid: nicolas.vanhoren@openerp.com-20110318110816-f8bnmmlfzc9eqyu7
2011-03-18 12:08:16 +01:00
edbb2d7168
[MERGE] Improvements to manifests.
...
bzr revid: nicolas.vanhoren@openerp.com-20110317122126-q1vxxy287aykxv6h
2011-03-17 13:21:26 +01:00
117d3f75a0
[MERGE]: Merge with latest trunk
...
bzr revid: rpa@tinyerp.com-20110317095800-l0sc4mj3uktsm8wa
2011-03-17 15:28:00 +05:30
3e6ec6f679
[ADD]: Images: base_action_rule, base_calendar, base_contact, base crypt
...
bzr revid: vro@tinyerp.com-20110314121708-xzia08gel40uvygp
2011-03-14 17:47:08 +05:30
Fabien Pinckaers
Launchpad Translations on behalf of openerp
Antony Lesuisse
Stephane Wirtel
Olivier Dony
Raphael Collet
Amit Bhavsar (Open ERP)
RavishchanraMurari (Open ERP)
Hardik Ansodariy (OpenERP)
Harry (OpenERP)
Stephane Wirtel
Rifakat Haradwala (Open ERP)
niv-openerp
vro
Rucha (Open ERP)