4916f258c7
[FIX] purchase_view move readonly from label to field
...
bzr revid: al@openerp.com-20140126195246-11vhbgasqq7p6kap
2014-01-26 20:52:46 +01:00
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
5d770d4b6f
[MERGE]with lp:~openerp-dev/openobject-addons/trunk-website-al and resolve conflicts.
...
bzr revid: dka@tinyerp.com-20140116145307-u3e6gio449md3u2v
2014-01-16 20:23:07 +05:30
9cf78e93cc
[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.
...
bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk
2014-01-16 11:39:10 +01:00
91aaaec0a5
[MERGE] forward port of branch saas-2 up to revid 9092 dle@openerp.com-20140115165506-yuux9km39gbv7k4n
...
bzr revid: chs@openerp.com-20140115214454-dhl8xzr429co0j5d
2014-01-15 22:44:54 +01:00
5649e0bbf2
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9770 revid:chs@openerp.com-20140116154645-sy4zhdgqc48xaqbx
...
bzr revid: dle@openerp.com-20131224112612-5gjit5uu1aaaqstx
bzr revid: dle@openerp.com-20140103094532-mbczi9ssr3gc90o1
bzr revid: dle@openerp.com-20140108105833-gblxqdw3if1gt35k
bzr revid: dle@openerp.com-20140115121441-bskbyxxbc09ubavh
bzr revid: dle@openerp.com-20140115165506-yuux9km39gbv7k4n
bzr revid: dle@openerp.com-20140116161415-0y9m0kgavcytzj9z
2014-01-16 17:14:15 +01:00
f39b8bb436
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060347-s1e2v9o33n1cxk2y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060418-cw791djr2ebt2wuy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140116060651-x8r0l0m27wcx0yav
2014-01-16 06:06:51 +00:00
2aa8a38447
[IMP] sale,purchase order: order the field based on date_order instead of name
...
This avoids getting irrelevent order based on sequences without padding (eg: SO10 between SO1 and SO2)
bzr revid: mat@openerp.com-20140115140527-pztwh3kl6y9y7jbe
2014-01-15 15:05:27 +01:00
5334330d9d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062126-ypg4xp33rspusnts
bzr revid: launchpad_translations_on_behalf_of_openerp-20140115062205-ov2axame3z00jkii
2014-01-15 06:22:05 +00:00
899166ecac
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9761 revid:dle@openerp.com-20140114164804-zhfy9lb308554kp1
...
bzr revid: dle@openerp.com-20140114173653-xhh85ubx27uu1306
2014-01-14 18:36:53 +01:00
8a729c10fa
[FIX] purchase: fix workflow for orders based on incoming shipments
...
Purchase orders Based on incoming shipments never ended in done stage
bzr revid: dle@openerp.com-20140114164804-zhfy9lb308554kp1
2014-01-14 17:48:04 +01:00
3ed5b49e7a
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20140110053216-23qk0vpm4hr5g1ig
2014-01-10 05:32:16 +00:00
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
49c0b7a820
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140106135700-rt0g44w5xmpbtxiu
2014-01-06 14:57:00 +01:00
b1af63310c
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131219061324-aw7yvvnjapbx5x1i
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053354-9ybfurq6yvrliqge
bzr revid: launchpad_translations_on_behalf_of_openerp-20131223054728-1db5iqqokg67bcyr
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052619-5szmeohg88k0m4xt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054325-pww3zkiyzxll4qy7
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054504-671epcsd8458kil8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062350-h5v8idg6hlix6rnx
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061853-bndte11d6k8po640
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054743-exo0ixnpjkfwfstl
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050440-fme1x3f2g4s1dxqk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140103062427-4v5wusiplrcj4jjd
bzr revid: launchpad_translations_on_behalf_of_openerp-20140104061934-r5xq4gfoy22w6nll
bzr revid: launchpad_translations_on_behalf_of_openerp-20140105054800-delmrxbtcvm3xxyw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140106050503-xu0r3lopkkfn20ca
2014-01-06 05:05:03 +00:00
e0951d6e18
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131227053952-0hms21l5679mfv9d
bzr revid: launchpad_translations_on_behalf_of_openerp-20131228053802-9q255pplfsr06jvf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131230050715-gywiu51n8ejcvnkp
bzr revid: launchpad_translations_on_behalf_of_openerp-20131231052701-yjrbqgyv2os2z8gt
bzr revid: launchpad_translations_on_behalf_of_openerp-20140101054400-7tz7obdh31v8log8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140102054530-gtwf0yp277zkqm0i
2014-01-02 05:45:30 +00:00
1508c5dd00
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb
...
bzr revid: tde@openerp.com-20131220162158-hbgktly09dv37958
bzr revid: dle@openerp.com-20131223155041-8zp8e08fihbr0ie2
bzr revid: dle@openerp.com-20131224112407-aw6dq2q92312kjbk
2013-12-24 12:24:07 +01:00
1aa92dbc46
[FORWARD] Forward port of saas-2 fixes until revision 9058 (revid tde@openerp.com-20131220162158-hbgktly09dv37958)
...
bzr revid: tde@openerp.com-20131220165519-2okhclp3qb3if1ey
2013-12-20 17:55:19 +01:00
6e71e067ca
[FIX] purchase: remove duplicate 'Warehouse' and 'Reference UOM' groupby filter in Purchase Analysis search view
...
bzr revid: xal@openerp.com-20131220085429-xxojh1oxjn1fo3a5
2013-12-20 09:54:29 +01:00
e6a46a855d
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131220053413-o3xa4nlpu9snoiq6
2013-12-20 05:34:13 +00:00
54be818a3b
[MERGE] forward port of latest saas-2 until rev 9051 dle@openerp.com-20131217142126-1lbim47d2m2x4bb0
...
bzr revid: mat@openerp.com-20131218155715-khb909yy99cbmna8
2013-12-18 16:57:15 +01:00
d9343e2d27
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
45e34f2f6b
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211053249-7onr7u94z5rfg60p
bzr revid: launchpad_translations_on_behalf_of_openerp-20131212051525-n6q6vsucee027ihr
2013-12-12 05:15:25 +00:00
7f00274384
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9691 rev-id: dle@openerp.com-20131211134120-fco4rlqjh258ba36
...
bzr revid: dle@openerp.com-20131210184409-cd9wy856v5bg0f17
bzr revid: dle@openerp.com-20131211134317-f0ev1vbinhrkgjf4
2013-12-11 14:43:17 +01:00
767207aa23
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062724-zxcigdht6w71xy7v
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062802-mh61vodnsw0sr8im
bzr revid: launchpad_translations_on_behalf_of_openerp-20131211062808-o9fkpg2cg9cb403z
2013-12-11 06:28:08 +00:00
b2eb65f04e
[FIX] purchase: set readonly on warehouse_id related field in stock.picking.in
...
bzr revid: dle@openerp.com-20131210165627-7uy323jt6k1302kz
2013-12-10 17:56:27 +01:00
6652856445
[FIX] website_sale: link; product: clean code and use product.template for supplierinfo
...
bzr revid: chm@openerp.com-20131209163254-k9dwxw48rcgz1hbs
2013-12-09 17:32:54 +01:00
4b96e85a30
[MERGE] [FORWARD] Forward port of saas-2 branch until revision 9036 (revid tde@openerp.com-20131209102019-kjeg0rx2au1d5e5v)
...
bzr revid: tde@openerp.com-20131209105031-17920wsidpqrwmxj
2013-12-09 11:50:31 +01:00
dc458033d5
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9678 rev-id: dle@openerp.com-20131206121552-xre6jj34cpfuldoa
...
bzr revid: dle@openerp.com-20131206121908-oomajjxqtsp8cipc
2013-12-06 13:19:08 +01:00
847ca65a23
[FIX] purchase: warning uom category different only if the changed field is product_uom itself.
...
Changing product_id with a different unit category does not trigger the uom category change warning
bzr revid: dle@openerp.com-20131206121552-xre6jj34cpfuldoa
2013-12-06 13:15:52 +01:00
379dc8bf98
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054445-5fy8zd7lvnn9mjp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055138-hq05otjnuktjpa48
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055601-tbzqqhperzffjbjt
bzr revid: launchpad_translations_on_behalf_of_openerp-20131204055642-0rwynvhgvs0r14b3
2013-12-04 05:56:42 +00:00
4fd98907ce
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
bzr revid: launchpad_translations_on_behalf_of_openerp-20131201054550-w0k8alfqs2bigurx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131202055222-2u7o99e48254dceu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131203061621-hyqqh11jt7g0ilqh
2013-12-03 06:16:21 +00:00
fd2821086f
[MERGE] sync with trunk
...
bzr revid: chm@openerp.com-20131202150925-eqsi0uu0fqtwimhj
2013-12-02 16:09:25 +01:00
289023d92f
[MERGE] forward port of branch saas-2 up to revid 9024 chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
...
It’s over NINE THOUSAAAAAAAND!
bzr revid: chs@openerp.com-20131130130725-9ntxdr5r7r04uoht
2013-11-30 14:07:25 +01:00
0ac4a8f696
[MERGE] forward port of branch 7.0 up to revid 9668 launchpad_translations_on_behalf_of_openerp-20131130053134-6u83vcd1133xs8yf
...
bzr revid: chs@openerp.com-20131130130014-hi5h5a00kjx0dbvp
2013-11-30 14:00:14 +01:00
556c7f03f0
[FIX] purchase: revert revision 7677 to set a default unit of measure to 'Unit'
...
This allows to field a purchase.order without showing the units of measure if not product is selected
Revision 7677 was integrated to fix lp:958897 (no change of uom when selecting a product whose uom is in the category 'Units'). This fix did not solve it properly (only for initial value) and introduced another problem. A better fix will be done on the onchange product.
bzr revid: mat@openerp.com-20131129143522-i85e4hvf0p4h3ynn
2013-11-29 15:35:22 +01:00
1fedbc18f5
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131126060718-7io3n16co82qp5pu
bzr revid: launchpad_translations_on_behalf_of_openerp-20131127053913-ypnlpggd4wt58pzx
bzr revid: launchpad_translations_on_behalf_of_openerp-20131128060603-kk12b8iu0uhhtist
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129052938-u0wq863etr3sl1cm
bzr revid: launchpad_translations_on_behalf_of_openerp-20131129053023-zlbrprsiq9e7vs39
2013-11-29 05:30:23 +00:00
26b351a285
[MERGE] [FIX] purchase: fix typo attr -> attrs in form view, courtesy of Joshua Jan (SHINEIT)
...
bzr revid: mat@openerp.com-20131128115239-yr0m9a1d2i39v6xm
2013-11-28 12:52:39 +01:00
361406fab8
[FIX]purchase: on invoice payment confirmation (during a reconciliation for example), 'invoice paid' is written on the purchase order of the invoice. Traceback when there was several purchase orders associated to the invoices confirmed
...
bzr revid: dle@openerp.com-20131128110937-gs6ko4djss3ffl3o
2013-11-28 12:09:37 +01:00
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
0d13df5a57
[MERGE] remove warnings
...
bzr revid: chs@openerp.com-20131127110552-3u2nxwu01gxj9i7m
2013-11-27 12:05:52 +01:00
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
370b4df6f3
[MERGE] {purchase,purchase_requisition}: choose the right warehouse when creating purchase orders from purchase order/requisition
...
bzr revid: chs@openerp.com-20131127104459-jb77x7quwcvtifm7
2013-11-27 11:44:59 +01:00
7c0c95b1a4
[FIX] sale, purchase: don't copy the customer/supplier reference when copying a SO/PO
...
bzr revid: qdp-launchpad@openerp.com-20131127084625-dqgoloz4q47zlpti
2013-11-27 09:46:25 +01:00
49fa5cab61
[FIX] purchase_requisition: copy method _get_warehouse from purchase module to avoid crash if purchase_requisition is updated but not purchase
...
bzr revid: chs@openerp.com-20131126180726-ng0gue9pedmuykj9
2013-11-26 19:07:26 +01:00
34832b4694
[FIX] purchase: at the validation of the PO, force the company in the context as the company on the PO in order to read property fields correctly. This patch is necessary to allow a user to confirm a PO belonging to another company (if he has the rights to do so).
...
bzr revid: qdp-launchpad@openerp.com-20131126170505-ttzuiaujpl1k24rg
2013-11-26 18:05:05 +01:00
b81c3897ee
[FIX] purchase: choose the right warehouse when creating purchase orders from procurement orders
...
bzr revid: chs@openerp.com-20131126135026-echb4fq37229g637
2013-11-26 14:50:26 +01:00
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
5f21b4bff9
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123062620-6obt60lwob64hi98
bzr revid: launchpad_translations_on_behalf_of_openerp-20131124054757-4w9nik6wieeqf0yg
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125060111-rf445xxiinvazinv
2013-11-25 06:01:11 +00:00
bba9e86c41
Launchpad automatic translations update.
...
bzr revid: launchpad_translations_on_behalf_of_openerp-20131123060118-7bayd565wi4mh8nk
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125053223-t2rb928yzma23a29
bzr revid: launchpad_translations_on_behalf_of_openerp-20131125053248-reb9oruqgxx0v61c
2013-11-25 05:32:48 +00:00
Antony Lesuisse
Thibault Delavallée
Darshan Kalola (OpenERP)
Christophe Simonis
Denis Ledoux
Launchpad Translations on behalf of openerp
Martin Trigaux
Xavier ALT
Christophe Matthieu
Quentin (OpenERP)