Commit Graph

3600 Commits

Author SHA1 Message Date
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) 7f5a7031ac [REV] reverted commit 9606, as it was hiding a bug instead of fixing it
bzr revid: qdp-launchpad@openerp.com-20140327103733-ogralnp2ycr4kwsy
2014-03-27 11:37:33 +01:00
Josse Colpaert 2038e005dc [IMP] Copy_data instead of copy in duplicate yml
bzr revid: jco@openerp.com-20140326165619-bjn81jj9r40idzuc
2014-03-26 17:56:19 +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
Simon Lejeune 9556cadbff [MERGE] trunk
bzr revid: sle@openerp.com-20140324162043-dzdwcxdt32sfjy57
2014-03-24 17:20:43 +01:00
Christophe Simonis d93b79e6f4 [MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
2014-03-24 14:38:11 +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
Quentin (OpenERP) bde6b6d6e5 [REF] refactoring made during code review. Some optimization patches have been rewritten more clearly, others abandonned or kept. WIP
bzr revid: qdp-launchpad@openerp.com-20140319163359-2ea7tjn5ba1ggein
2014-03-19 17:33:59 +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 8c49378527 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140312123434-c6je2o30w3tmtez9
2014-03-12 13:34:34 +01:00
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
Quentin (OpenERP) da210e4b5e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20140311132813-0gmbof2u8nmgv9p3
2014-03-11 14:28:13 +01:00
Launchpad Translations on behalf of openerp e231045095 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061409-nvr56r44q6smklxz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140305055718-w3c9kzsncncpu12w
bzr revid: launchpad_translations_on_behalf_of_openerp-20140306061519-n2qbjt3fe7l104aw
2014-03-06 06:15:19 +00: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
Josse Colpaert 71ae87d5be [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140304093342-59s3t9mv2su060vh
2014-03-04 10:33:42 +01:00
Launchpad Translations on behalf of openerp b201dc79b7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140218054104-8egkh4jj7hiiwuih
bzr revid: launchpad_translations_on_behalf_of_openerp-20140219054048-688twg0fubtm2x2q
bzr revid: launchpad_translations_on_behalf_of_openerp-20140220054214-237ri67t9rw3l4fu
bzr revid: launchpad_translations_on_behalf_of_openerp-20140221063855-wniw42r27gyg3h6y
bzr revid: launchpad_translations_on_behalf_of_openerp-20140222073328-xpn7nwqz407yzumq
bzr revid: launchpad_translations_on_behalf_of_openerp-20140223074516-0r09cpmma58ylqji
bzr revid: launchpad_translations_on_behalf_of_openerp-20140224060319-535oheaq2w9u2ye3
bzr revid: launchpad_translations_on_behalf_of_openerp-20140225062420-zl7curej0e0warhz
bzr revid: launchpad_translations_on_behalf_of_openerp-20140226073146-3vzhw4hddr81olbs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140227062959-24e2rn98rqb9afpr
bzr revid: launchpad_translations_on_behalf_of_openerp-20140228072152-f9gm4ud1wu19ge27
bzr revid: launchpad_translations_on_behalf_of_openerp-20140301055205-r0df0fqz9yf5z66i
bzr revid: launchpad_translations_on_behalf_of_openerp-20140302052638-bjf11oumy7w15oco
bzr revid: launchpad_translations_on_behalf_of_openerp-20140304082704-k1z2te1tfud43zy3
2014-03-04 08:27:04 +00: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
Josse Colpaert 6694c3a094 [MERGE] Merge from trunk-wms
bzr revid: jco@openerp.com-20140303083411-wg6ilg9mft9qx3td
2014-03-03 09:34:11 +01:00
Quentin (OpenERP) f2194de731 [FIX] purchase: wrong reference in xml file (introduced with the last merge with trunk)
bzr revid: qdp-launchpad@openerp.com-20140302170646-r1megbxkhmgfqlzy
2014-03-02 18:06:46 +01:00
Quentin (OpenERP) 3b6d4d5eff [FIX] purchase: partial revert of preceeding commit where i messed with the merge with trunk and totally remove purchase/report while the psql view needs to be kept
bzr revid: qdp-launchpad@openerp.com-20140228163934-rrf3fsxcoo0nta0h
2014-02-28 17:39:34 +01:00
Quentin (OpenERP) e36b32a661 [MERGE] merged with main trunk (revision 9186)
bzr revid: qdp-launchpad@openerp.com-20140228131516-ihigousbe5p1nt68
2014-02-28 14:15:16 +01:00
Josse Colpaert 781de16020 [IMP] copy_data instead of copy for duplicate purchase order test
bzr revid: jco@openerp.com-20140226130156-c5pexmfjkisoxq30
2014-02-26 14:01:56 +01:00
Josse Colpaert 39c5e97588 [FIX] uom compare
bzr revid: jco@openerp.com-20140226112342-n702mbth1wfv4e7s
2014-02-26 12:23:42 +01:00
Josse Colpaert 3bb1e2d64d [IMP] Check purchase order line in reception to invoice
bzr revid: jco@openerp.com-20140224144835-0zvnrjv2dftf6vhg
2014-02-24 15:48:35 +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
Simon Lejeune 35b64811e9 [MERGE] trunk
bzr revid: sle@openerp.com-20140221095425-9043pbzjy7rtbxd1
2014-02-21 10:54:25 +01:00
Simon Lejeune fabc1cdd40 [FIX] renamed ir.actions.report.paperformat model to report.paperformat, renamed html_skeleton to html_container in report layouts and renamed paperformat.py file to report_paperformat.py
bzr revid: sle@openerp.com-20140218155347-tfxlndg9wgaw0bv1
2014-02-18 16:53:47 +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) 0e0443e2d2 [FIX] purchase: fixed workflow problem in purchase.order (if a PO was having its picking split, then its workflow wasn't listenning to the new move.. which lead to wrong PO state and 'shipped' boolean)
bzr revid: qdp-launchpad@openerp.com-20140217204244-78sui3bdzw2yl2wp
2014-02-17 21:42:44 +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
Launchpad Translations on behalf of openerp 5d2f1c68ac Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064134-tam102h50au851o1
bzr revid: launchpad_translations_on_behalf_of_openerp-20140215073800-2219ymc7ijxq57aa
bzr revid: launchpad_translations_on_behalf_of_openerp-20140216064223-17h9wz07b2siswzs
bzr revid: launchpad_translations_on_behalf_of_openerp-20140217060328-7qh928zk8ro30qzb
2014-02-17 06:03:28 +00:00
openerp-sle a88f73b3a5 [IMP] Purchase requisition converted to QWeb. Minor changes into purchase_* views
bzr revid: openerp-sle@openerp-sle.home-20140214165550-s4lffhih8107pehl
2014-02-14 17:55:50 +01:00
openerp-sle 8a72eff36b [FIX] Fix useless import following the removal of rml purchase reports
bzr revid: openerp-sle@openerp-sle.home-20140214150700-2zuukk4ahs4q1zhs
2014-02-14 16:07:00 +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) 9550c32409 [MERGE] usability improvements among several modules/screens
bzr revid: qdp-launchpad@openerp.com-20140214145712-j8dmf06wy49x9l50
2014-02-14 15:57:12 +01:00
openerp-sle 31cf553335 [IMP] Purchase quotation and purchase order converted to QWeb
bzr revid: openerp-sle@openerp-sle.home-20140214144627-se5x0alcl43gut4k
2014-02-14 15:46:27 +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
Cedric Snauwaert 73183be469 [FIX]when creating location for warehouse, use warehouse code as base name for location instead of warehouse name
bzr revid: csn@openerp.com-20140213094820-v76n4fuqd1omicvy
2014-02-13 10:48:20 +01:00
Olivier Dony bbd813e76e [MERGE] Forward-port of latest saas-2 (incl. 7.0) bugfixes, up to rev. 9127 odo@openerp.com-20140212122042-3m2tysmr31mtecnc
bzr revid: odo@openerp.com-20140212175141-i9yz8zlseglrk8sb
2014-02-12 18:51:41 +01:00
Launchpad Translations on behalf of openerp 9554c144ff Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140212062357-8n13ec90bnclm1ek
2014-02-12 06:23:57 +00:00
Launchpad Translations on behalf of openerp c00c424221 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140211064129-f1q7m95fq4tplc1s
2014-02-11 06:41:29 +00:00
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
Launchpad Translations on behalf of openerp 8d85c23e4a Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065003-9soyulgvssk8n5ci
bzr revid: launchpad_translations_on_behalf_of_openerp-20140208071621-b018rnkhyxmmm5jk
bzr revid: launchpad_translations_on_behalf_of_openerp-20140209065224-kih7tx56elds0zok
bzr revid: launchpad_translations_on_behalf_of_openerp-20140210055324-raxopm5ej680oc73
2014-02-10 05:53:24 +00:00