Josse Colpaert
8b84615de1
[MERGE] Merge from trunk test
...
bzr revid: jco@openerp.com-20140502130352-c3h1fk332eqyd78b
2014-05-02 15:03:52 +02:00
Olivier Dony
52480275c3
[IMP] purchase: invoice creation more modular/extensible through the introduction of a _prepare_invoice method()
...
This is similar to what was previously done for Sales Orders.
bzr revid: odo@openerp.com-20140430140103-hfumie3ndvlodgeh
2014-04-30 16:01:03 +02:00
Quentin (OpenERP)
e077a96cdd
[REF] purchase: cleaning the TODO messages
...
bzr revid: qdp-launchpad@openerp.com-20140425091128-13uuwk7txzjoos6z
2014-04-25 11:11:28 +02:00
Quentin (OpenERP)
7a6b00b651
[MERGE] merged with trunk up to revision 9381
...
bzr revid: qdp-launchpad@openerp.com-20140425090414-vpg4szws9y4fgznc
2014-04-25 11:04:14 +02:00
Quentin (OpenERP)
2e7579c54d
[MERGE] branch of jco with fix of orderpoint computation + small refactoring of action_cancel() of purchase.order
...
bzr revid: qdp-launchpad@openerp.com-20140423155557-t0gp3akhzb2y85cz
2014-04-23 17:55:57 +02:00
Josse Colpaert
6748d2818d
[IMP] Make sure procurement goes only in exception on cancel + simplify wkf
...
bzr revid: jco@openerp.com-20140423082808-2gjgowz6h89l5alu
2014-04-23 10:28:08 +02:00
Josse Colpaert
16adb0d75d
[WIP] Purchase order cancel or done results in procurement state being changed immediately
...
bzr revid: jco@openerp.com-20140422153400-5ei2c4h4hti7up1i
2014-04-22 17:34:00 +02:00
Bharat R. Devnani (OpenERP)
b8d4387d33
[MERGE] merged with main addons branch
...
bzr revid: bde@tinyerp.com-20140418061256-n53rymt5j8krzvr5
2014-04-18 11:42:56 +05:30
Quentin (OpenERP)
dd47f684f0
[FIX] sale_order_dates yml fixed + calls to fields.date.date_to_datetime function fixed + improved in order to use it in purchase as well
...
bzr revid: qdp-launchpad@openerp.com-20140416154830-ec6kbs3bupd4j5vt
2014-04-16 17:48:30 +02:00
Quentin (OpenERP)
fbd3255e37
[MERGE] merged trunk up to revision 9350
...
bzr revid: qdp-launchpad@openerp.com-20140416150551-lxpscdd74mgv99r1
2014-04-16 17:05:51 +02:00
Thibault Delavallée
fe8a745b02
[MERGE] Sync with trunk
...
bzr revid: tde@openerp.com-20140416082925-eph1x8vnwj6o31rt
2014-04-16 10:29:25 +02:00
Christophe Simonis
61da3f4aba
[MERGE] forward port of branch saas-3 up to revid 9409 dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
...
bzr revid: chs@openerp.com-20140415142934-rlka4vkxd34fkil8
2014-04-15 16:29:34 +02:00
Denis Ledoux
f8d5ef0f80
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 4174 revid:dle@openerp.com-20140415130732-bud8xb3pzgxw2imr
...
bzr revid: dle@openerp.com-20140415101427-a6r7lgy50x9bdah3
bzr revid: dle@openerp.com-20140415130951-ckuv8nsl17qkb300
2014-04-15 15:09:51 +02:00
Denis Ledoux
a701934ac7
[FIX] purchase: invoiced based on invoiced bool of purchase order line, instead of rate
...
invoiced bool of purchase order line is set to true on invoice validation, not on invoice creation
bzr revid: dle@openerp.com-20140415081211-jz6if0vzgq3inzzw
2014-04-15 10:12:11 +02:00
Thibault Delavallée
8178669795
[FIX] mail, mass_mailing
...
- mail: now trigger postprocess_sent_message in every case, being sent or not, as the state
is propagated in the method; udpated all addons accordingly;
- email_template: fixed URL to edit it in website + form view;
- mass_mailing: barchart now send jsonified value;
- mass_mailing: tweaking the form view with all options
bzr revid: tde@openerp.com-20140408124053-o9tb14k6v47s5mjd
2014-04-08 14:40:53 +02:00
Quentin (OpenERP)
b14883f10c
[MERGE] jco branch with few bugfixes
...
bzr revid: qdp-launchpad@openerp.com-20140407175001-g4rx6rft090ul2li
2014-04-07 19:50:01 +02:00
Josse Colpaert
d45fd02abd
[IMP] Push rules should try to find routes on warehouse first before searching anything
...
bzr revid: jco@openerp.com-20140403155735-y357mj3gtp7j3x7i
2014-04-03 17:57:35 +02:00
Quentin (OpenERP)
4077c91ce6
[FIX] purchase: this function isn't needed anymore
...
bzr revid: qdp-launchpad@openerp.com-20140403160213-l9mijzuohmz0o7ct
2014-04-03 18:02:13 +02:00
Quentin (OpenERP)
fe0e95d29b
[IMP] procurement: removed the schedule_range field on res.company which was error prone and not really usefull + made the scheduler run in SUPERUSER to avoid intercompany and access rights issues + made the run of procurement as SUPERUSER too for the same reasons
...
bzr revid: qdp-launchpad@openerp.com-20140403071010-5mrox75rkufur2nw
2014-04-03 09:10:10 +02:00
Quentin (OpenERP)
d381fd5d33
[FIX] purchase: cancellation of procurement linked to a purchase order line should only decrease quantity for PO in draft state + typo
...
bzr revid: qdp-launchpad@openerp.com-20140328134308-puycr1vf32l13mpu
2014-03-28 14:43:08 +01:00
Quentin (OpenERP)
23293e2b03
[FIX] cancelling a procurement with stacked purchase now decrease the quantity on the purchase line instead of cancelling it
...
bzr revid: qdp-launchpad@openerp.com-20140328102934-2qhryl2hkwodrbpv
2014-03-28 11:29:34 +01:00
Quentin (OpenERP)
b8b22532a6
[FIX] stock, sale_stock, purchase: fixed the dropshipping flow
...
bzr revid: qdp-launchpad@openerp.com-20140327121140-18yxvp8wcdlqvaa5
2014-03-27 13:11:40 +01:00
Quentin (OpenERP)
bf07b75045
[FIX] purchase: _get_picking_ids was wrong as it wasn't returning an empty list for purchase without results returned by the query
...
bzr revid: qdp-launchpad@openerp.com-20140327103855-8z4kpxth2ldgs1vw
2014-03-27 11:38:55 +01:00
Quentin (OpenERP)
e0b27b4ee8
[MERGE] merged trunk up to revision 9251
...
bzr revid: qdp-launchpad@openerp.com-20140326152751-b6bo0fawrzmd71f0
2014-03-26 16:27:51 +01:00
Thibault Delavallée
7185a68775
[MERGE] Sync with trunk.
...
bzr revid: tde@openerp.com-20140325090209-w1qtcswiao01gqlu
2014-03-25 10:02:09 +01:00
Simon Lejeune
9556cadbff
[MERGE] trunk
...
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +01:00
Simon Lejeune
b6bd0e8b8a
[FIX] fix the print purchase button
...
bzr revid: sle@openerp.com-20140320154226-tpx3d8a0xrmuxwrr
2014-03-20 16:42:26 +01:00
Thibault Delavallée
44e8722cc3
[FIX] portal_sale, purchase: fixed inherit of _postprocess_sent_message, now taking a new argument
...
mail_sent telling whether the email has effectively been sent (because mail.state
is not available du to transient state).
bzr revid: tde@openerp.com-20140319084748-um13u2mr9u2qt23s
2014-03-19 09:47:48 +01:00
Denis Ledoux
cac0c9600a
[MERGE] Forward-port of latest saas-2 bugfixes, up to rev. 9154 revid:dle@openerp.com-20140318151824-sscl4m8p87emjl8s
...
bzr revid: chs@openerp.com-20140318120024-mcxmkncn1xktjs7v
bzr revid: dle@openerp.com-20140318152621-l6jxc0bbbofm7fzg
2014-03-18 16:26:21 +01:00
Denis Ledoux
02459f8d4a
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9929 revid:dle@openerp.com-20140325104921-x8zjx5p71l1o3uif
...
bzr revid: dle@openerp.com-20140310133913-465x5t3n1bo7fu98
bzr revid: dle@openerp.com-20140311164146-2s599kogbqj8e94l
bzr revid: dle@openerp.com-20140312111149-u6y036aej3ywq7et
bzr revid: dle@openerp.com-20140312121145-06s1jvct9v4m7l6s
bzr revid: mat@openerp.com-20140313084409-c0kckxemy3in0mlo
bzr revid: chs@openerp.com-20140313163420-ifa4hyixj722d6jo
bzr revid: chs@openerp.com-20140314102034-g0nzryvwhrpzdas9
bzr revid: chs@openerp.com-20140314104803-19c5snl2fcuih91o
bzr revid: odo@openerp.com-20140314143519-x6rzcfkkqxwc0e1g
bzr revid: chs@openerp.com-20140318110229-y8098w3shdpmoig2
bzr revid: dle@openerp.com-20140318151824-sscl4m8p87emjl8s
bzr revid: dle@openerp.com-20140320112618-yfyihlwz66ryeqf5
bzr revid: dle@openerp.com-20140320161003-j01cc6sqves2wnp2
bzr revid: dle@openerp.com-20140320181252-4gqcog22p1ex0pz7
bzr revid: dle@openerp.com-20140321140450-8ulnhr76qybiadks
bzr revid: dle@openerp.com-20140324104743-ubvu8st7emq9pg1q
bzr revid: dle@openerp.com-20140325112413-xs5z7y81rhyjt0rd
2014-03-25 12:24:13 +01:00
Denis Ledoux
1225c8b530
[FIX] purchase: for drop shipping po, the supplier of the picking was the customer address, which is obviously wrong, it should be the supplier of the po
...
bzr revid: dle@openerp.com-20140318151456-qw896i1t55wgwhkm
2014-03-18 16:14:56 +01:00
Quentin (OpenERP)
e202c84b27
[REF] stock: assign picking by batch on confirmation of stock moves. This new version will work for confirmed move from elsewhere than the sale order
...
bzr revid: qdp-launchpad@openerp.com-20140318115746-fixnxghkrlth38ze
2014-03-18 12:57:46 +01:00
Josse Colpaert
ed978bb905
[IMP] Only check pickings of purchases when state goes to done and optimize query
...
bzr revid: jco@openerp.com-20140224134126-jmk38b3gxtvbh1ru
2014-02-24 14:41:26 +01:00
Quentin (OpenERP)
17b17b34b9
[MERGE] merged the branch that add the possibility to sum quantities in PO lines for the same product and UoM (when triggering a purchase to solve a procurement) and that contains several fixes on the purchase and purchase_requisition modules (workflow, shipped boolean, procurement resolution...) + a fix on the 'waiting' state of stock moves that was wrongly never set before
...
bzr revid: qdp-launchpad@openerp.com-20140217231230-6vc9ojo0jxz0yfss
2014-02-18 00:12:30 +01:00
Quentin (OpenERP)
25048c6958
[FIX] purchase: shipped boolean on purchase order should be set to True when the goods are received in 'input' location
...
bzr revid: qdp-launchpad@openerp.com-20140217170459-ftfqojviyxe9nbl6
2014-02-17 18:04:59 +01:00
Quentin (OpenERP)
7623bb29f0
[FIX] purchase: picking should be created with the supplier as partner
...
bzr revid: qdp-launchpad@openerp.com-20140214150637-xcebrk8ogodtw5g4
2014-02-14 16:06:37 +01:00
Quentin (OpenERP)
4ad9811a90
[FIX] mrp: fixed phantom bom
...
lp bug: https://launchpad.net/bugs/1278891 fixed
bzr revid: qdp-launchpad@openerp.com-20140214150330-an2my0n8vjdf38vx
2014-02-14 16:03:30 +01:00
Quentin (OpenERP)
20bfab5c30
[IMP] purchase: sum the quantities of same product/uom in place of adding a new line in existing PO, when a PO line is about to be added from procurement resolution. Also modified the action_piking_create in order to create one incomming shipment for all products ordered, that will spread into several as soon as received in input location
...
bzr revid: qdp-launchpad@openerp.com-20140214141202-kfdvpd0ebq9g1hwi
2014-02-14 15:12:02 +01:00
Quentin (OpenERP)
6afae4da34
[FIX] purchase: don't copy twice the PO line when copying a PO
...
lp bug: https://launchpad.net/bugs/1279365 fixed
bzr revid: qdp-launchpad@openerp.com-20140214090934-4n4id411c6ekeowu
2014-02-14 10:09:34 +01:00
Cedric Snauwaert
ffa78c9739
[FIX]when duplicate purchase line, don't duplicate procurement
...
bzr revid: csn@openerp.com-20140213143956-u7jtdvd9l6ytbd00
2014-02-13 15:39:56 +01:00
Bharat R. Devnani (OpenERP)
9e102b6b24
[MERGE] merged with main addons
...
bzr revid: bde@tinyerp.com-20140212064422-4thlmyk5psff9lth
2014-02-12 12:14:22 +05:30
Cedric Snauwaert
d1abe6a4cc
[FIX]move: action_confirm now returns ids of move (needed for bom_explode)
...
bzr revid: csn@openerp.com-20140210145446-djwfreh3f0pdcfet
2014-02-10 15:54:46 +01:00
Quentin (OpenERP)
d096e9f1b8
[FIX] purchase: unlink of a PO line now correctly canl the linked procurement. Yaml test fixed as well (there is no stock.move created anymore untill the PO is confirmed). These errors were introduced with the last merge with trunk
...
bzr revid: qdp-launchpad@openerp.com-20140204090901-xakhcchof90fh73h
2014-02-04 10:09:01 +01:00
Quentin (OpenERP)
753f7541db
[MERGE] main trunk
...
bzr revid: qdp-launchpad@openerp.com-20140203173000-mk092iw2wz3y0e3e
2014-02-03 18:30:00 +01:00
Quentin (OpenERP)
72f4cdc3b1
[MERG€] purchase: stock move created by a PO hadn't any reference to the PO as origin
...
lp bug: https://launchpad.net/bugs/1269353 fixed
bzr revid: qdp-launchpad@openerp.com-20140130103722-q919n0j0otu0jczs
2014-01-30 11:37:22 +01:00
Christophe Simonis
c202dc1c52
merge upstream
...
bzr revid: chs@openerp.com-20140129190834-xfcat3ulfbg5omhn
2014-01-29 20:08:34 +01:00
Denis Ledoux
6cc096aebc
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9798 revid:dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
...
bzr revid: dle@openerp.com-20140129171022-wf6244k90lpncmah
2014-01-29 18:10:22 +01:00
Denis Ledoux
08dfda9ec6
[FIX] purchase: on po confirm, avoid to write location_id on the chained stock move if the move is done
...
On purchase order confirmation, if the order_line comes from a procurement order created by a sale order,
it tried to write on the location_id, whatever the move state was, even done.
Or, sometimes, the stock move associated to the procurement order (from the so) was already done, for example because we forced the availability of the stock move.
It makes sense to not write the location_id if the move is already done, because the location_id is already good.
bzr revid: dle@openerp.com-20140129163238-1s1t9oc814z4z7f3
2014-01-29 17:32:38 +01:00
Bharat R. Devnani (OpenERP)
28a33f3a8d
[IMP] improved some warning messages
...
bzr revid: bde@tinyerp.com-20140124123045-kgovbmuhkovax068
2014-01-24 18:00:45 +05:30
Denis Ledoux
1fb1a6f2af
[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9789 revid:dle@openerp.com-20140124120102-we2yxio553ws2yz4
...
bzr revid: dle@openerp.com-20140120174449-tui0a24zgn9bien2
bzr revid: dle@openerp.com-20140121125538-ke7i6kaz486hwgl8
bzr revid: dle@openerp.com-20140122134115-0ogjemlqe327xoac
bzr revid: dle@openerp.com-20140123103655-mf2zslfbgue97ed2
bzr revid: dle@openerp.com-20140124121027-uk9zy4dx9tqlsblr
2014-01-24 13:10:27 +01:00