Commit Graph
26884 Commits
Author SHA1 Message Date
Rucha (Open ERP) 7cdc4ced42 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2
bzr revid: rpa@tinyerp.com-20110208121655-nthsxtqq9z3qd0w0
2011-02-08 17:46:55 +05:30
ron@tinyerp.com d92c83d632 [FIX]stock:production lot and shipping direct from Sales Order
lp bug: https://launchpad.net/bugs/713212 fixed

bzr revid: ron@tinyerp.com-20110208101754-2i109txqx7tkiv2y
2011-02-08 15:47:54 +05:30
ron@tinyerp.com 783d6d8807 [MERGE]Merged with trunk-dev-addons2
bzr revid: ron@tinyerp.com-20110204082442-5ah3mvlhbjoe83zq
bzr revid: ron@tinyerp.com-20110207043944-4k09do4yh4apuphi
bzr revid: ron@tinyerp.com-20110208043409-i8ffui3iwpzbr0dp
2011-02-08 10:04:09 +05:30
Rucha (Open ERP) f6ac1c8b3a [MERGE]: Merge with lp:openobject-addons/trunk
bzr revid: rpa@tinyerp.com-20110204051443-mgds0d0a2p0g929e
bzr revid: rpa@tinyerp.com-20110207044401-ta35237c3413x2u1
2011-02-07 10:14:01 +05:30
Launchpad Translations on behalf of openerp 89933f4c30 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205045946-ngssapvavvzymfc4
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045319-cjbcpcr7k0jw8v8f
bzr revid: launchpad_translations_on_behalf_of_openerp-20110205050201-5kxv4wvlb171y4ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20110206045419-syxas10vfjwq4nw9
bzr revid: launchpad_translations_on_behalf_of_openerp-20110207052017-1qsba36kfnjc0zkj
2011-02-07 05:20:17 +00:00
Olivier Dony 87a1392f99 [IMP] osv: added test for parent_store computations + fix for another edge case
The yaml test create a tree structure and modifies it by copying nodes
around and then moving them, checking that the child_of operator keeps
working afterwards. This test caught another edge case, as a follow-up
to the case of bug 708603

lp bug: https://launchpad.net/bugs/708603 fixed

bzr revid: odo@openerp.com-20110205004316-zaw9qqfke1bcw0s7
2011-02-05 01:43:16 +01:00
Olivier Dony 1eca241d52 [MERGE] merged latest fixes from 6.0, up to rev 3334
bzr revid: odo@openerp.com-20110203230023-o2a0b5tovewu0ft2
2011-02-04 00:00:23 +01:00
Olivier Dony 22a2fc6aa6 [FIX] orm.write: avoid miscalculation of parent_left/right when moving multiple records under same parent
This issue caused the parent_left and parent_right values to be correct
only for the first record being update as part of a batch update on several
children from the same parent. An example of the consequences is the linked
bug 708503.

lp bug: https://launchpad.net/bugs/708603 fixed

bzr revid: odo@openerp.com-20110203225102-a7v8bv90l2ph5ujh
2011-02-03 23:51:02 +01:00
Olivier Dony 4900c41842 [REVERT] account: reverted incorrect fix for bug 708603, this is in fact a server error
Commit reverted was merged in rev 3164.118.782 mra@mra-laptop-20110131082002-xzx4v2adzdvv8nmg

lp bug: https://launchpad.net/bugs/708603 fixed

bzr revid: odo@openerp.com-20110203222026-ln6hmyivaj9bo11g
2011-02-03 23:20:26 +01:00
rpa (Open ERP) 071ded9a1c [MERGE]: Merge with lp:~openerp-commiter/openobject-addons/trunk-addons-aag
bzr revid: rpa@tinyerp.com-20110203133418-oxt6aqy06rrfgrgg
2011-02-03 19:04:18 +05:30
rpa (Open ERP) f5ee528cdd [MERGE]: Merge with lp:~openerp-dev/openobject-addons/ron-dev-addons2
bzr revid: rpa@tinyerp.com-20110203131953-9ozr4imdr1i0qwno
2011-02-03 18:49:53 +05:30
rpa (Open ERP) 3a9316b52a [MERGE]: Merge with lp:~openerp-dev/openobject-addons/ksa-addons2
bzr revid: rpa@tinyerp.com-20110203131511-dan3b3e2l876xxbt
2011-02-03 18:45:11 +05:30
rpa (Open ERP) d40ed41564 [MREGE]: Merge with lp:~openerp-commiter/openobject-addons/dev-addons2-rha1
bzr revid: rpa@tinyerp.com-20110203130753-bz7xrrif5ez1uh2j
2011-02-03 18:37:53 +05:30
aag (OpenERP) 7807995b54 [IMP] stock: Add context and chech for Read method
bzr revid: aag@tinyerp.co.in-20110203123747-0jcpq8xqlthstw2z
2011-02-03 18:07:47 +05:30
rpa (Open ERP) 23e5d00ed7 [MERGE]: Merge with lp:openobject-addons/trunk
bzr revid: ksa@tinyerp.co.in-20110202094655-rfuid6yr2g5r90hu
bzr revid: rpa@tinyerp.com-20110203123736-99ziw0tv74o1evy0
2011-02-03 18:07:36 +05:30
Jay Vora (OpenERP) df6f269daa [FIX] setup.py : typo corrected
lp bug: https://launchpad.net/bugs/710813 fixed

bzr revid: jvo@tinyerp.com-20110203074415-35mt5cl2bk5szzr4
2011-02-03 13:14:15 +05:30
Jay Vora (OpenERP) 153238a666 [FIX] setup.py : typo corrected
lp bug: https://launchpad.net/bugs/710813 fixed

bzr revid: jvo@tinyerp.com-20110203072943-vfath4rqrxhqwvdi
2011-02-03 12:59:43 +05:30
aag (OpenERP) 9689293daf [FIX] STOCK:Now Invoice Available Products in the Sale Order If It Has Not Available Products
lp bug: https://launchpad.net/bugs/708434 fixed

bzr revid: aag@tinyerp.co.in-20110203071144-0xbkqlf7h8ek9a7g
2011-02-03 12:41:44 +05:30
Launchpad Translations on behalf of openerp 1474483553 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203061642-vso4sr14t1g3p5sa
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203061718-vr6gj90b3pov038j
2011-02-03 06:17:18 +00:00
ksa (Open ERP) e58d1c6266 [FIX]:Internal Stock move have problem if wearhouse input location = Input
lp bug: https://launchpad.net/bugs/710717 fixed

bzr revid: ksa@tinyerp.co.in-20110203055640-cg0uasduxxgafttp
2011-02-03 11:26:40 +05:30
aag (OpenERP) a441411bea [MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: aag@tinyerp.co.in-20110201054531-dyvqca6vanmcnwt2
bzr revid: aag@tinyerp.co.in-20110203045727-9n7kgcajlnrl0563
2011-02-03 10:27:27 +05:30
Launchpad Translations on behalf of openerp bbfa775055 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110202044205-3ws4pqp0lavgg5c5
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203044526-s8t9nmtqd7do7yy4
2011-02-03 04:45:26 +00:00
Launchpad Translations on behalf of openerp 38daed5a03 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110203044306-8k55djcscwbpuis6
2011-02-03 04:43:06 +00:00
Jay Vora (OpenERP) e8a052cbf2 [FIX] Document_ftp : Correction on ftp_browse wizard for URL (Ref : Maintenance case 3889)
bzr revid: jvo@tinyerp.com-20110202145507-vqaoq77rjip164ga
2011-02-02 20:25:07 +05:30
Thibault Francois 59b7e608f0 [FIX] base_calendar : timezone False sent to server for write
bzr revid: tfr@openerp.com-20110202143557-9cefs1eyu2yekh04
2011-02-02 15:35:57 +01:00
ron@tinyerp.com e38be2c715 [FIX]project_mrp :Task summary is not interpretable when Tasks are created from Manufacturing Order
lp bug: https://launchpad.net/bugs/711236 fixed

bzr revid: ron@tinyerp.com-20110202132437-zeetkjbnoqsb896g
2011-02-02 18:54:37 +05:30
ksa (Open ERP) 024cd2ca5b [MERGE]: Merge with lp:openobject-trunk-dev-addons2
bzr revid: ksa@tinyerp.co.in-20101231122806-q1uysyi1i1aaeqjf
bzr revid: ksa@tinyerp.co.in-20110202124117-ueaw3i60ub19uyhb
2011-02-02 18:11:17 +05:30
rha@tinyerp.com a54b002a98 [Fix]: stock: cancelling move availability doesn't change packing
lp bug: https://launchpad.net/bugs/707031 fixed

bzr revid: rha@tinyerp.com-20110202121737-y0mqh83pnetbwv9f
2011-02-02 17:47:37 +05:30
ron@tinyerp.com b231171089 [MERGE]Merged with trunk-dev-addons2
bzr revid: ron@tinyerp.com-20110128044812-s6rjuc4wuog6j9gi
bzr revid: ron@tinyerp.com-20110201055654-17qqjosv0rs5efyy
bzr revid: ron@tinyerp.com-20110202115820-znjzk5kwl2vyu97x
2011-02-02 17:28:20 +05:30
Launchpad Translations on behalf of openerp de2e08f4aa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110202054408-8b2iwfb5fgdibeom
2011-02-02 05:44:08 +00:00
rha@tinyerp.com f9211cdef0 [MERGE]: Merge with lp:~openerp-dev/openobject-addons/trunk-dev-addons2
bzr revid: rha@tinyerp.com-20110202043008-0yuwc9obes684mxd
2011-02-02 10:00:08 +05:30
Olivier Dony d4c473f502 [REVERT] fields: revert previous fix, until tests and addons are checked for compatibility
bzr revid: odo@openerp.com-20110201210140-gmr25730fiuvq7e5
2011-02-01 22:01:40 +01:00
Thibault Francois daa1b72973 [FIX] widget selection replace by m2o because the domain is dynamic
bzr revid: tfr@openerp.com-20110201160622-gc75h8fwp0c4vz7o
2011-02-01 17:06:22 +01:00
qdp-launchpad@tinyerp.com de6c15049e [MERGE] merged dev2 branch
bzr revid: qdp-launchpad@tinyerp.com-20110201155635-1kfct183b9btdlnj
2011-02-01 16:56:35 +01:00
qdp-launchpad@tinyerp.com 40e7342e28 [MERGE] merged the dev3 branch
bzr revid: qdp-launchpad@tinyerp.com-20110201155023-bhmz3wby39n868eq
2011-02-01 16:50:23 +01:00
Olivier Dony 1da43ed8ba [MERGE] merged latest bugfixes from 6.0 into trunk (up to rev 4375)
bzr revid: odo@openerp.com-20110201142528-5w9ns20flxmetf3i
2011-02-01 15:25:28 +01:00
rha@tinyerp.com f76e0fc097 [Fix]: product: Pricelist with base price set to 0
lp bug: https://launchpad.net/bugs/710521 fixed

bzr revid: rha@tinyerp.com-20110201132750-lvp43mmvs0kxqwif
2011-02-01 18:57:50 +05:30
Olivier Dony 145c74b270 [REVERT] fields: revert previous fix, until tests and addons are checked for compatibility
bzr revid: odo@openerp.com-20110201130721-q368qznven3vbmty
2011-02-01 14:07:21 +01:00
Mustufa Rangwala 9259b22c59 [MERGE] project_planning: corrected value of 'date_to' field in the demo data
bzr revid: mra@mra-laptop-20110201125856-2xto32mgkwtptv13
2011-02-01 18:28:56 +05:30
Mustufa Rangwala cda4bc7204 [REVERT] Analytic: changes reverted for rev 4927 (act window on analytic form)
bzr revid: mra@mra-laptop-20110201125345-t9jxwatp239l0w5w
2011-02-01 18:23:45 +05:30
mtr d4214987f8 [MERGE] branch merged with lp:~openerp-dev/openobject-addons/trunk-dev-addons3
bzr revid: mtr@mtr-20110201124651-lrhtpwo9jpgo7zd2
2011-02-01 18:16:51 +05:30
Mustufa Rangwala 19cf9e1054 [IMP] hr_holidays: case_id on holidays object type changed from char to m2o (crm.meeting)
bzr revid: mra@mra-laptop-20110201124038-fwehl3uq7qo3tp6v
2011-02-01 18:10:38 +05:30
Olivier Dony c1b440143b [FIX] product: name_search() should only look for exact product codes
bzr revid: odo@openerp.com-20110201123428-jr2gqkci3s63rih9
2011-02-01 13:34:28 +01:00
mtr c336a9979a [IMP] project_planning:changed value of 'date_to' field in the demo data
bzr revid: mtr@mtr-20110201122038-ghg9xnaku5eco56a
2011-02-01 17:50:38 +05:30
Jay Vora (OpenERP) d8205b1d94 [FIX] Project_planning : Corrected Demo data
bzr revid: jvo@tinyerp.com-20110201115825-50eh2y3dbu7xiox8
2011-02-01 17:28:25 +05:30
Olivier Dony 3ec7a4b2d9 [FIX] many2one: return (id,name) instead of only id also for osv_memory
By doing this small change we save clients the trouble of explicitly having to call
name_get() for each m2o field in osv_memory objects, which they cannot trivially batch
and represents a large dealy for wizards with possibly large numbers of child o2m records.
An example is the linked bug, where partial picking of several hundred move lines would
lead to as many separate name_get RPC calls, causing a noticeable delay.

lp bug: https://launchpad.net/bugs/709567 fixed

bzr revid: odo@openerp.com-20110201112447-i00sn3ih6qgj3wlh
2011-02-01 12:24:47 +01:00
Olivier Dony 3293581e24 [FIX] many2one: return (id,name) instead of only id also for osv_memory
By doing this small change we save clients the trouble of explicitly having to call
name_get() for each m2o field in osv_memory objects, which they cannot trivially batch
and represents a large dealy for wizards with possibly large numbers of child o2m records.
An example is the linked bug, where partial picking of several hundred move lines would
lead to as many separate name_get RPC calls, causing a noticeable delay.

lp bug: https://launchpad.net/bugs/709567 fixed

bzr revid: odo@openerp.com-20110201112322-2yw0wxc63wvt7ves
2011-02-01 12:23:22 +01:00
Jay Vora (OpenERP) 488efd39d9 [Fix] Account_payment : Correction on method of functional field for date fields (Ref: SaaS Maintenance Case 3882)
bzr revid: jvo@tinyerp.com-20110201110430-6wmi444tpk6nsu3m
2011-02-01 16:34:30 +05:30
Jay (Openerp) 64061cbad6 [FIX] Account_payment : Corrected context on creation of new payment line for an unsaved payment order
bzr revid: mra@mra-laptop-20110201104402-rkxr1e0moyxo7hm6
2011-02-01 16:14:02 +05:30
Jay Vora (OpenERP) 175606ceeb [FIX] Account_payment : Corrected context on creation of new payment line for an unsaved payment order
bzr revid: jvo@tinyerp.com-20110201103853-shnh8a3h8nf1gqkz
2011-02-01 16:08:53 +05:30