06fe2460d6
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130624141838-mevmot56188pkoeo
2013-06-24 19:48:38 +05:30
e738adfafe
[FIX] sale, sale_stock: fixed calls to get_company taking an extra uid
...
bzr revid: tde@openerp.com-20130614143317-65mbgfugskxqnxp7
2013-06-14 16:33:17 +02:00
1a51e9b88d
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20130614141720-7qjo6fpkm83jhpm2
2013-06-14 16:17:20 +02:00
bc58a5a224
[CLEAN] Misc cleaning before merging.
...
bzr revid: tde@openerp.com-20130614141643-29z9zslusyhj4u5j
2013-06-14 16:16:43 +02:00
aa133b4d29
[MERGE] forward port of branch saas-1 up to revid 8745 chs@openerp.com-20130613181503-82234mo34wxb0oap
...
bzr revid: chs@openerp.com-20130614091924-z5ta02kwhmwcrgox
2013-06-14 11:19:24 +02:00
6a9adbca62
[MERGE] forward port of branch 7.0 up to revid 9236 mat@openerp.com-20130613160953-itt79mu5xrl7suv4
...
bzr revid: chs@openerp.com-20130613181503-82234mo34wxb0oap
2013-06-13 20:15:03 +02:00
ba46fc1116
[IMP] remove typo
...
bzr revid: mat@openerp.com-20130613160812-6nrz02oejrdl13tb
2013-06-13 18:08:12 +02:00
d38a1c54fd
[sale_stock] : Auto complete on Quotations with special product configuration(Case:593519)
...
bzr revid: dhs@tinyerp.com-20130613084441-gi9xkf2d2sl68a45
2013-06-13 14:14:41 +05:30
c99ac69e61
[IMP]improve message string
...
bzr revid: sgo@tinyerp.com-20130611083859-tamafus1vdohpjyg
2013-06-11 14:08:59 +05:30
3a296f5386
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608070127-tu3wr0ejaojeuizk
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061554-vunz3dsqv73j8io4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608074839-suk66wcjidodrzyu
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061704-e1t9mv2alygf4g38
bzr revid: launchpad_translations_on_behalf_of_openerp-20130608075116-643xgspj93t8g1y9
bzr revid: launchpad_translations_on_behalf_of_openerp-20130609061708-y08i6exqm5v36qg7
2013-06-09 06:17:08 +00:00
8c33eb76e1
[I18N] Synchronize translation templates with latest source code
...
bzr revid: odo@openerp.com-20130607194309-eysyrkxpr0dukm07
2013-06-07 21:43:09 +02:00
8f5433c990
[IMP]add group by warehouse in sales analysis
...
bzr revid: sgo@tinyerp.com-20130607115131-m72rx8ulr54sur9a
2013-06-07 17:21:31 +05:30
2bda4f7b3c
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130607113500-jzhet9cr98c0ss4s
2013-06-07 17:05:00 +05:30
5418e39573
[IMP]make warehouse required true and improve warning when there is no warehouse define for current company
...
bzr revid: sgo@tinyerp.com-20130607100129-vyvxbhbckakc7kr6
2013-06-07 15:31:29 +05:30
5deae04585
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130607054825-38kbw2umxndg1w3v
2013-06-07 05:48:25 +00:00
ccb38117ee
[MERGE] Forward porting of saas-1 until rev 8739
...
bzr revid: mat@openerp.com-20130605090453-e4mg37kms5j1r18n
2013-06-05 11:04:53 +02:00
b46d71a8bf
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130605050541-xoc766k3ylgspwim
2013-06-05 10:35:41 +05:30
bdeaa2c722
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130604053815-g0iohxg8vtgapt7p
2013-06-04 11:08:15 +05:30
38d9325f66
[MERGE] views: removed unnecessary `model` attribute used with `ref`.
...
bzr revid: vmt@openerp.com-20130603144446-ara6oli0her5rdm3
2013-06-03 16:44:46 +02:00
45d760773e
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130603131453-t3m0b9emuyp2tmsx
2013-06-03 18:44:53 +05:30
0f983a0146
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9183
...
rev-id launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll
bzr revid: odo@openerp.com-20130603121852-jdl6vlo9dmjk0rlc
2013-06-03 14:18:52 +02:00
e7072c5edf
[MERGE] merge with latest trunk
...
bzr revid: amb@tinyerp.com-20130531085856-k41mztip2gf92jea
2013-05-31 14:28:56 +05:30
ddc7e6c994
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130531070107-7d2k818beg8965ll
2013-05-31 07:01:07 +00:00
7f643d5540
[IMP] various changes
...
sale_stock: fix test to match new order
project: remove create button on view
procurement: allow grouping by reason
mrp: use property_ids for order line
account: allow grouping by template
bzr revid: mat@openerp.com-20130528131559-1u7t50sicpc3c6xe
2013-05-28 15:15:59 +02:00
2229e4d1d0
[FIX] correct test to match new ordering
...
bzr revid: mat@openerp.com-20130528130521-m09g4mhv3iyuefa2
2013-05-28 15:05:21 +02:00
2e0d8cd2bd
[FIX] revert change at revision 9172
...
bzr revid: mat@openerp.com-20130528130018-0yrh0fl3hz132tmm
2013-05-28 15:00:18 +02:00
28a4b350f4
[FIX] sale_stock: property_ids is in mrp
...
bzr revid: mat@openerp.com-20130528124849-u1uren6fjfe1pcxz
2013-05-28 14:48:49 +02:00
adda8323ab
[MERGE] [FIX] property_ids not used while creating a proc. order, courtesy of Davide Corio
...
lp bug: https://launchpad.net/bugs/926107 fixed
bzr revid: mat@openerp.com-20130528100600-fco5tayf4350s3v6
2013-05-28 12:06:00 +02:00
71df1a41bc
[FORWARD] Forward port of addons 7.0 until revision 9172
...
bzr revid: tde@openerp.com-20130528104500-ds3irrs2u0qpst37
2013-05-28 12:45:00 +02:00
983b17ea0a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130522052736-t0x1wh4cm1tqvfy2
2013-05-22 05:27:36 +00:00
727de3660d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130519061258-u0iw6lfwponrmlrp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130520063201-x6ngc83h4rru51rx
bzr revid: launchpad_translations_on_behalf_of_openerp-20130521054415-2s1mdz92ybpgx12d
2013-05-21 05:44:15 +00:00
23b50c8da1
[MERGE] sync with latest trunk
...
bzr revid: mat@openerp.com-20130515111755-af33z1frq6jc6hpo
2013-05-15 13:17:55 +02:00
99f7952c90
[FIX] MRP: Properties do not work
...
bzr revid: rgaopenerp-20130507121011-q8xywrlwhytdxzj8
2013-05-07 17:40:11 +05:30
a7a4f33d0f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130427063416-maq2j295cuj0d2j4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130429060435-zyumznnykvw92bfg
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051425-9uhm1n0nmvyus33i
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063526-tj5l5h3fger6llmw
bzr revid: launchpad_translations_on_behalf_of_openerp-20130501051533-veqndxlj87s13tnp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130502060901-j2v1cs2l31in4q6t
bzr revid: launchpad_translations_on_behalf_of_openerp-20130503062950-h0ojr1tlzqx5nu76
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071101-jh8a9d3cb8gcz34e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130505060428-4qacudpyuiez39b3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063544-ggq3rpht7nsoinxs
bzr revid: launchpad_translations_on_behalf_of_openerp-20130504071108-g8u3u06xpp3g4sks
bzr revid: launchpad_translations_on_behalf_of_openerp-20130506063552-lwxw1ldh3mbflzqf
2013-05-06 06:35:52 +00:00
07607f054b
[REM] more nonsensical @model + @ref
...
bzr revid: xmo@openerp.com-20130429125217-slmp1v9t7uri6ev6
2013-04-29 14:52:17 +02:00
3d0b5aa747
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130423053031-g501q3w9akfiro2d
2013-04-23 11:00:31 +05:30
33f27b362b
[MERGE] forward port of addons v7 up to revision 9045
...
bzr revid: qdp-launchpad@openerp.com-20130422153449-c62emljfa4a49758
2013-04-22 17:34:49 +02:00
26dd9bc343
[MERGE] Sync with 7.0
...
bzr revid: odo@openerp.com-20130418172123-2ofzftdo2a923nj1
2013-04-18 19:21:23 +02:00
dcd398d33e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130418060603-ondw9hx00c1rmh33
2013-04-18 06:06:03 +00:00
9ea1b238bf
[MRG] merge with lp:openobject-addons
...
bzr revid: tpa@tinyerp.com-20130417062640-0b8at1f087grtiu3
2013-04-17 11:56:40 +05:30
d1e17fbde0
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130417061434-zry7pxo7fb17063k
2013-04-17 11:44:34 +05:30
e69326ee3b
[REF] removed explicit model instanciations.
...
bzr revid: vmt@openerp.com-20130415102349-vgcrfok2k5y10cwz
2013-04-15 12:23:49 +02:00
3bd4cef043
[FIX] sale_stock: when creating invoices after delivery, use invoicing contact from SO + update test (reported by Joel Grand-Guillaume while reviewing bug 1160365)
...
The existing tests were modified to explicitly cover
the case where the "invoice partner" is set on the
Sales Order. This minimal change was done with a
!python block because !record triggers the on_change
calls on the SO and cause undesired changes.
This could be improved by creating a new customer
with a real invoicing contact and creating a new
SO.
bzr revid: odo@openerp.com-20130411145636-emmagu7uu5kis1aa
2013-04-11 16:56:36 +02:00
4da68cbc22
[FORWARD] Forward port of addons 7.0 until revision 9008
...
bzr revid: tde@openerp.com-20130411124446-73gzyw3eo925w3dv
2013-04-11 14:44:46 +02:00
8c8bfd706b
[FIX] purchase, sale_stock: fix computation of date_planned when no timezone is defined for the user
...
bzr revid: qdp-launchpad@openerp.com-20130409122530-svv1kpk57s2nrsa9
2013-04-09 14:25:30 +02:00
a7bf53ebaa
[FIX]error introduce in revid:odo@openerp.com-20130405151451-anjsdt18gmsxr01k
...
function date_to_datetime should return a date in server datetime format
bzr revid: csn@openerp.com-20130409091433-4u3nxejdrti7czu3
2013-04-09 11:14:33 +02:00
eb3ffc52ed
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130406063640-151b9f95w2tgiifb
bzr revid: launchpad_translations_on_behalf_of_openerp-20130407060111-hobhqctome9qtz6c
bzr revid: launchpad_translations_on_behalf_of_openerp-20130408062055-hzgkrbw8lvkfphxe
2013-04-08 06:20:55 +00:00
ed09272799
[MERGE] OPW 590221: sale_stock,purchase: fix timezone conversion error when scheduling delivery/procurement based on SO/PO date
...
The conversion code is duplicated in sale_stock and purchase
instead of being factored out in the fields.datetime class
because as of v7.0 users are able to selectively update
a single module without necessarily updating the base module
or the framework. This will be improved in next stable version.
lp bug: https://launchpad.net/bugs/1153107 fixed
bzr revid: odo@openerp.com-20130405151451-anjsdt18gmsxr01k
2013-04-05 17:14:51 +02:00
5b832d7738
[FIX] sale_stock: useless import due to previous commit + make sure test actually tests something, rather than x() == x()
...
bzr revid: odo@openerp.com-20130404123154-xtq4idqnnlugv0ui
2013-04-04 14:31:54 +02:00
ef84d5c421
[FIX] sale_stock,purchase: review help string + remove incorrect fallback to local TZ
...
See also http://bugs.python.org/issue7229
bzr revid: odo@openerp.com-20130404092134-0zt7blbl1kt3p0lz
2013-04-04 11:21:34 +02:00
Amit Bhavsar (Open ERP)
Thibault Delavallée
Christophe Simonis
Martin Trigaux
Dhruti Shastri (OpenERP)
sgo@tinyerp.com
Olivier Dony
Vo Minh Thu
Xavier Morel
Quentin (OpenERP)
Turkesh Patel (Open ERP)
Cedric Snauwaert