Christophe Simonis
d504764eff
[MERGE] forward port of branch saas-3 up to revid 9298 chm@openerp.com-20140311130852-3ft0v1mc9ht1any6
...
bzr revid: chs@openerp.com-20140311145205-s56fj113fsrnisc3
2014-03-11 15:52:05 +01:00
Denis Ledoux
6deae9e9ea
[FIX] *: replace various widgets selection by option no_create, as the purpose of these widgets selection were to actually hide the create and edit and quick create
...
bzr revid: dle@openerp.com-20140306113021-r280g41vkdyf5ew8
2014-03-06 12:30:21 +01:00
Launchpad Translations on behalf of openerp
9863dbe5c8
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304075238-yra39uwmwahmrnf3
2014-03-04 07:52:38 +00:00
Launchpad Translations on behalf of openerp
6400ffb5e5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204055105-bumib76esi2di1lu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140204061211-5sehiztcrv9vrxp6
2014-02-04 06:12:11 +00:00
Antony Lesuisse
033c38c304
[MERGE] trunk
...
bzr revid: al@openerp.com-20140129021916-ckb3rplmcpjbqel3
2014-01-29 03:19:16 +01:00
Launchpad Translations on behalf of openerp
3ce5e01eca
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140128064139-6fjg3b236v5d790j
2014-01-28 06:41:39 +00:00
Thibault Delavallée
38d64147d5
[IMP] product: only template child / multiple template childs form view improvements
...
- added a is_only_child field on product.product, telling whether the
product is the only child of the product.template
- improved the product form view, to set readonly all fields coming fgrom
the template when the product is not the only child. This way, the user
is more aware that changing a value in the template changes the value
for all child products. He will have to do those changes on the template
form. A link to the template has been added in the product form view.
bzr revid: tde@openerp.com-20140122095826-8k0wl7af57iiyify
2014-01-22 10:58:26 +01:00
Darshan Kalola (OpenERP)
a9e87b56ce
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al.
...
bzr revid: dka@tinyerp.com-20140108093659-c9it34gll0ipcll2
2014-01-08 15:06:59 +05:30
Launchpad Translations on behalf of openerp
67e479e96e
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131225060225-zss93rqqqz3holkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131226060540-odnnltlm0bobiqp9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227052235-xq201ghozcgucfuq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228051943-jo247cfuiyx4w767
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230043947-d1jcf2vpf9go93ec
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231044745-8v24a0fydnvde3js
2013-12-31 04:47:45 +00:00
Christophe Simonis
0521d1aab3
[MERGE] forward port of branch saas-2 up to revid 9017 chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
...
bzr revid: chs@openerp.com-20131127111208-iclt7a9ib7oucumh
2013-11-27 12:12:08 +01:00
Christophe Simonis
0d13df5a57
[MERGE] remove warnings
...
bzr revid: chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
2013-11-27 12:05:52 +01:00
Christophe Simonis
6b05beecc1
[MERGE] forward port of branch 7.0 up to revid 9651 chs@openerp.com-20131127104459-jb77x7quwcvtifm7
...
bzr revid: dle@openerp.com-20131126171210-jovr7e7efehuq3s2
bzr revid: chs@openerp.com-20131127110046-4ow36dkuuyzgf1pl
2013-11-27 12:00:46 +01:00
Christophe Simonis
465d83e880
[FIX] procurement: procurement orders does not have a `warehouse_id` field
...
bzr revid: chs@openerp.com-20131126134952-cotbhc8s60zj44ts
2013-11-26 14:49:52 +01:00
Christophe Simonis
bb1e256f5b
[MERGE] forward port of branch saas-2 up to revid 9010 dle@openerp.com-20131125143003-vjtzj1c5051pdnk3
...
bzr revid: chs@openerp.com-20131125150054-b135qshkx6icakgk
2013-11-25 16:00:54 +01:00
Martin Trigaux
00f7b3b1f1
[REF] procurement: remove legacy code in scheduler from 6.1
...
bzr revid: mat@openerp.com-20131121153048-n1hxpuu8jg3ayyhw
2013-11-21 16:30:48 +01:00
Martin Trigaux
8b35f23701
[ADD] procurement: add skip_exception parameter on scheduler allowing to have more frequent scheduler only testing confirmed picking
...
bzr revid: mat@openerp.com-20131121152823-vphwy0jv9b02ajk2
2013-11-21 16:28:23 +01:00
Christophe Simonis
6f67143908
[FIX] *: do not call deprecated method LocalService()
...
bzr revid: chs@openerp.com-20131121120611-06h1pki3460tzj1s
2013-11-21 13:06:11 +01:00
Launchpad Translations on behalf of openerp
271ed43e7b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121054848-007arsnnoa8fs65e
bzr revid: launchpad_translations_on_behalf_of_openerp-20131121063838-blqn6j0yfmrlw5vp
2013-11-21 06:38:38 +00:00
Olivier Dony
44664076da
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
...
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
2013-11-20 15:43:18 +01:00
Olivier Dony
a382e0cc2e
[FIX] procurement: magic bypass transition was incomplete and preventing pulled flows from working
...
The procurement workflow has a magic `bypass` transition
that acts as a fallback for MTO procurements in case the
necessary modules are not (yet) installed. For example
it will consider a MTO+Buy procurement directly satisfied
if the Purchase module is not yet installed.
However this bypass transition did not properly take
"internal pulled flows" into account, which are added
by the `stock_location` module as a third kind of procurement
type. In this case the bypass would match and never
give stock_location the chance to run.
In order to be consistent with the other procurement
methods, the bypass transition needs to be adapted.
Also updated the check_move() method to make it more
explicit rather than a side-effect.
bzr revid: odo@openerp.com-20131112151747-da67h4yavhz3k29c
2013-11-12 16:17:47 +01:00
Olivier Dony
fe2fd41d7d
[FIX] procurement: order points must procure goods in the specifiedt warehouse
...
The default warehouse picked by procurements only works
for companies that only have on warehouse
bzr revid: odo@openerp.com-20131112130612-brmazfdghrh1ck7x
2013-11-12 14:06:12 +01:00
Launchpad Translations on behalf of openerp
2160342cea
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131116062538-hsi3j63m1pw01qem
bzr revid: launchpad_translations_on_behalf_of_openerp-20131117054515-0jw3bd84wk546u6j
bzr revid: launchpad_translations_on_behalf_of_openerp-20131118055319-wz4qa3cxwowlonxt
2013-11-18 05:53:19 +00:00
Martin Trigaux
7a752f5f03
[FIX] procurement: add condition check_move for transition confirm_mto->ready in procurement workflow
...
When no other module is installed, no change of behaviour (check_move returns None, always True)
When stock_location is installed, depending of the order of evaluation of the conditions, could go to ready without passing by move activity, avoid this
Courtesy of Mohammad Alhashash
lp bug: https://launchpad.net/bugs/1193779 fixed
bzr revid: mat@openerp.com-20131114162553-5yzgp4hy9dqdan5t
2013-11-14 17:25:53 +01:00
Launchpad Translations on behalf of openerp
108ccbf108
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114062958-ies8xa3pft7n59ms
bzr revid: launchpad_translations_on_behalf_of_openerp-20131106055135-r0xt2vr04710jh1t
bzr revid: launchpad_translations_on_behalf_of_openerp-20131107055120-r8z445ergt50erlx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131108062620-bvfofx1jl1wb1csh
bzr revid: launchpad_translations_on_behalf_of_openerp-20131110064525-ioceogsmu0nmx2qj
bzr revid: launchpad_translations_on_behalf_of_openerp-20131111053908-gbrp09ast5fhr6iw
bzr revid: launchpad_translations_on_behalf_of_openerp-20131112062316-5uf2bvbzdhkq1b7k
bzr revid: launchpad_translations_on_behalf_of_openerp-20131113060841-bkjcuz4e9rtzn6f9
bzr revid: launchpad_translations_on_behalf_of_openerp-20131114063058-rrm2q5lxkyawuvpz
2013-11-14 06:30:58 +00:00
Launchpad Translations on behalf of openerp
40c309024c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026062529-74ir3upguunr9mw3
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027061317-d9s440jzv1juvswi
bzr revid: launchpad_translations_on_behalf_of_openerp-20131028054233-15znliqv2eh2jq0i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131029051429-rcytejyrg2s4t9db
bzr revid: launchpad_translations_on_behalf_of_openerp-20131030055438-gp0hyend0jooi941
2013-10-30 05:54:38 +00:00
Amit Bhavsar (Open ERP)
14a48f5d98
[MERGE] merge with latest trunk.
...
bzr revid: amb@tinyerp.com-20131028050353-drsu5i945d0d2m7n
2013-10-28 10:33:53 +05:30
Launchpad Translations on behalf of openerp
2f3c517054
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026060436-zq7lmz0wyaf2or7c
bzr revid: launchpad_translations_on_behalf_of_openerp-20131022044413-i5f1hxr3y23buz38
bzr revid: launchpad_translations_on_behalf_of_openerp-20131023043450-hbi0snv6o0qpl0ne
bzr revid: launchpad_translations_on_behalf_of_openerp-20131026054646-gklydoly8cq62jbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131027055002-ldfxtxmdm5wpc65b
2013-10-27 05:50:02 +00:00
Launchpad Translations on behalf of openerp
8bc457816f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131024052057-4ai7sltsmuoke8l5
bzr revid: launchpad_translations_on_behalf_of_openerp-20131025060100-ua2rf6g9urivk8bm
2013-10-25 06:01:00 +00:00
Amit Bhavsar (Open ERP)
415e64f5cd
[MERGE] merge with latest trunk.
...
bzr revid: amb@tinyerp.com-20131023190249-gzlccl97xa0351d5
2013-10-24 00:32:49 +05:30
Christophe Simonis
3e04036aa5
[MERGE] forward port of branch saas-1 up to revid 8794 chs@openerp.com-20131021141431-5bdk9waai17julkb
...
bzr revid: chs@openerp.com-20131021145334-i9gtbk52mre1bu1x
2013-10-21 16:53:34 +02:00
Christophe Simonis
9a775cd3f5
[MERGE] forward port of branch 7.0 up to revid 9535 odo@openerp.com-20131021124748-x4jnibwyab4gam23
...
bzr revid: chs@openerp.com-20131021141431-5bdk9waai17julkb
2013-10-21 16:14:31 +02:00
Martin Trigaux
6ba45e5cbf
[FIX] procurement: change SQL query to be compatible with both postgres 8.4 and 9.3
...
bzr revid: mat@openerp.com-20131021095735-yz9pb5pphfdgl44j
2013-10-21 11:57:35 +02:00
Amit Bhavsar (Open ERP)
2cf5c977ae
[MERGE] merge with latest trunk.
...
bzr revid: amb@tinyerp.com-20131021072954-i41newfty914azna
2013-10-21 12:59:54 +05:30
Launchpad Translations on behalf of openerp
16fd47c3e1
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131019052801-ouw53m70o0eabxnv
bzr revid: launchpad_translations_on_behalf_of_openerp-20131020050509-ar8koyz20p82rdjq
bzr revid: launchpad_translations_on_behalf_of_openerp-20131021045723-bkmqoimoalwb3lzq
2013-10-21 04:57:23 +00:00
Denis Ledoux
a7e05f1af4
[MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8793 rev-id: dle@openerp.com-20131018124037-v3501acvv4fh1077
...
bzr revid: dle@openerp.com-20131018125818-1k168nlo2ferj25w
2013-10-18 14:58:18 +02:00
Denis Ledoux
1a555475cc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9529 rev-id: mat@openerp.com-20131018120428-2vdmdm2th8rz57zr
...
bzr revid: dle@openerp.com-20131018121236-zp221von16vekthp
2013-10-18 14:12:36 +02:00
Martin Trigaux
b60da2a9a3
[IMP] procurement: track only once the change of state to exception and confirmed
...
bzr revid: mat@openerp.com-20131017113521-5u2k9glb3o7cnmmk
2013-10-17 13:35:21 +02:00
Martin Trigaux
b98f935d27
revert change of workflow
...
bzr revid: mat@openerp.com-20131017104426-260y7v0113q8iue9
2013-10-17 12:44:26 +02:00
Martin Trigaux
c4370b47f8
[IMP] procurement: redifine workflow to avoid going back to confrmed state
...
bzr revid: mat@openerp.com-20131017074635-qp1n3x8955bf3aqd
2013-10-17 09:46:35 +02:00
Martin Trigaux
b801e6eab9
[IMP] procurement: better workflow
...
bzr revid: mat@openerp.com-20131016150335-oikqm6twbukp666t
2013-10-16 17:03:35 +02:00
Darshan Kalola (OpenERP)
c1c71c522e
[IMP]search,tree and kanban view of product and added search view of product template.
...
bzr revid: dka@tinyerp.com-20131014094614-m32bm0npqxblz1k0
2013-10-14 15:16:14 +05:30
Launchpad Translations on behalf of openerp
566af6033f
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131011052941-f4x7ued38x0siu4u
bzr revid: launchpad_translations_on_behalf_of_openerp-20131013053842-x6nja74l8by5vd1q
bzr revid: launchpad_translations_on_behalf_of_openerp-20131014053313-j22u5qen55na9js8
2013-10-14 05:33:13 +00:00
Olivier Dony
8ac110c4dd
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 5098 rev-id: odo@openerp.com-20131011123914-7zuvd9mch21yxgj8
...
bzr revid: dle@openerp.com-20131009131902-a93nsbou4w8y0vlx
bzr revid: chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
bzr revid: dle@openerp.com-20130918160049-fo88fl7uyhfoofkv
bzr revid: dle@openerp.com-20130924130544-kmkyr0d73cusvdav
bzr revid: odo@openerp.com-20131011134433-nyfjipvlql4xu127
2013-10-11 15:44:33 +02:00
Darshan Kalola (OpenERP)
3cb95d2227
[IMP] add menu Product Template and improve the form view of product template.
...
bzr revid: dka@tinyerp.com-20131011110641-q3dcnsfqihbjnfs1
2013-10-11 16:36:41 +05:30
Christophe Simonis
273face907
[MERGE] forward port of branch saas-1 up to revid 8791 chs@openerp.com-20131009175454-j06y1ngylfbqyrpj
...
bzr revid: chs@openerp.com-20131009180337-cxgdt6zzd1z68ga9
2013-10-09 20:03:37 +02:00
Martin Trigaux
4c0c18b803
[FIX] purchase: avoid getting trigger loop (again), apply same fix on procurement to be consistent
...
bzr revid: mat@openerp.com-20131004153915-2urkq50bp8rnddnt
2013-10-04 17:39:15 +02:00
Launchpad Translations on behalf of openerp
3a4a093ba7
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130930054304-7r885mda98p411ax
bzr revid: launchpad_translations_on_behalf_of_openerp-20130928055410-zlzdspq6yjqrkq33
bzr revid: launchpad_translations_on_behalf_of_openerp-20130929054547-erco56ru1eyc6iq7
bzr revid: launchpad_translations_on_behalf_of_openerp-20130930054318-brbtsqs7pdngwg51
2013-09-30 05:43:18 +00:00
Launchpad Translations on behalf of openerp
23620b2e54
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130925054843-vx0nogr2rpf5amw4
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055416-ubjv2v9mogsb49f3
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061626-2rcumswg0tc4e10e
bzr revid: launchpad_translations_on_behalf_of_openerp-20130926055451-072mn28h3ew4cwfp
bzr revid: launchpad_translations_on_behalf_of_openerp-20130927061658-4svrcqcw04av1e5w
2013-09-27 06:16:58 +00:00
Launchpad Translations on behalf of openerp
fa502fd9bd
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130924063729-1k9xlx0630vx6is5
2013-09-24 06:37:29 +00:00
Launchpad Translations on behalf of openerp
5d89ca5f6d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20130919045555-o80w0vjyl4g3d2qn
bzr revid: launchpad_translations_on_behalf_of_openerp-20130920060115-eauj5wlxmkpyxwys
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053444-ai66yjl1419gee8h
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053502-xuqx6gazdvsak6e5
bzr revid: launchpad_translations_on_behalf_of_openerp-20130921055928-8y21w291t5w0k13o
bzr revid: launchpad_translations_on_behalf_of_openerp-20130922053456-pcgrwl35kk8b7ff8
bzr revid: launchpad_translations_on_behalf_of_openerp-20130923053531-3twd4g12gj4iqmv3
2013-09-23 05:35:31 +00:00