Commit Graph

955 Commits

Author SHA1 Message Date
Christophe Simonis 7dd69540e8 [MERGE] forward port of branch 7.0 up to 0c4bc1c 2014-06-03 19:11:44 +02:00
Josse Colpaert 9376d16938 [IMP] Put cost method only once, make sure extra moves get moves in consequent pickings, default buy route on template 2014-06-02 09:58:09 +02:00
Christophe Simonis fb650ee92e [MERGE] product: refactoring of product variants.
close PR #222
2014-05-30 10:22:36 +02:00
Denis Ledoux 65d7cc524d [FIX] purchase: Do not allow to delete a purchase order line which is validated
This restriction behavior copied from the sale.order model
Moreover, the purchase.order lines state were not set to cancel when the purchase order was cancelled.
This is now the case, this behavior is also coped from the sale.order model
When the purchase order is reset to draft, we also reset the order lines state to draft
2014-05-28 18:00:11 +02:00
Olivier Dony 04211015fc [MERGE] Forward-port of latest saas-4 fixes, up to 0452851 2014-05-27 20:49:49 +02:00
Olivier Dony fd21abd847 [MERGE] Forward-port latest saas-3 bugfixes, up to 30f43da 2014-05-27 17:18:43 +02:00
Olivier Dony 30f43daa3b [MERGE] Forward-port of latest 7.0 bugfixes, up to aeaa826 2014-05-27 16:50:02 +02:00
Christophe Matthieu 43977deb71 [IMP] product: refactoring of product variant. The main view became the view of product template and the product product (or product variant) are created with the variant values combinaison. Bom is splitted into bom and bom line and can use the variant combinaison. 2014-05-27 09:42:52 +02:00
JoshuaJan e6973e2c64 'invoiced' fields help message is wrong 2014-05-26 17:55:26 +08:00
Quentin (OpenERP) 70eb74a260 [MERGE] merged with trunk up to revision 9425. Needs to find another icon for Traceability on lot, though
bzr revid: qdp-launchpad@openerp.com-20140507182917-erjammra4okyei1c
2014-05-07 20:29:17 +02:00
Quentin (OpenERP) 661c109189 [FIX] procurement.rule._get_action() needs to be translatable
bzr revid: qdp-launchpad@openerp.com-20140507171431-jtyz901xmej6elmp
2014-05-07 19:14:31 +02:00
Gery Debongnie eb1d981435 [FIX] code cleanup (addon purchase)
simplify a few _count methods by removing useless try/except/pass and by using search_count when appropriate.  It allows us to remove two one2many fields as well.

bzr revid: ged@openerp.com-20140507144532-dgm9mfgt9k5p10jr
2014-05-07 16:45:32 +02:00
Gery Debongnie c941eb8ca4 [FIX] code cleanup (addon purchase)
remove useless one2many field in product.product, and improves the way
purchase_count is computed

bzr revid: ged@openerp.com-20140506150732-e0ztuzqm7hqu183p
2014-05-06 17:07:32 +02:00
Gery Debongnie 5aa2fa150c [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140502130753-4z24z1to9pkrckvq
2014-05-02 15:07:53 +02:00
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
Gery Debongnie 0c24df7074 [MERGE] merge from trunk
bzr revid: ged@openerp.com-20140417065356-x7o3jg5bo5430zth
2014-04-17 08:53:56 +02:00
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
Gery Debongnie 569d9dc75a [FIX] move the purchase_ids, purchase_count fields defined in purchase.py from the model product.template to product.product to make them work correctly (addon purchase)
bzr revid: ged@openerp.com-20140415135411-428kxcysuy73soeu
2014-04-15 15:54:11 +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
Yogesh Parekh (OpenERP) 5e75ce212b [IMP]: Convert buttons into stat button in purchase module
bzr revid: ypa@tinyerp.com-20140326124002-lj4wd30vd6hy5k9x
2014-03-26 18:10:02 +05:30
Randhir Mayatra rma-openerp c086291ddd [MERGE] merge with latest trunk
bzr revid: rma@tinyerp.com-20140325135635-rev8asknqwk08svy
2014-03-25 19:26:35 +05:30
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
Randhir Mayatra rma-openerp 96ea9392aa [IMP] convert button into stat button for products
bzr revid: rma@tinyerp.com-20140324135621-13t191kmnn6t22jk
2014-03-24 19:26:21 +05:30
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
Bharat R. Devnani (OpenERP) 4da0f5460d [MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20140123063749-6lqhwdh34ln69pqu
2014-01-23 12:07:49 +05:30
Denis Ledoux 4f3a4dce3b [FIX] purchase: on unlink purchase order line, cancel procurements associated to the move of the purchase order line
bzr revid: dle@openerp.com-20140120170729-57fm8tluz5p4zdk5
2014-01-20 18:07:29 +01:00
Quentin (OpenERP) fc93025818 [MERGE] merged trunk
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
Cedric Snauwaert 49104e9108 [FIX]add PO name to origin field when generating picking from PO
lp bug: https://launchpad.net/bugs/1269353 fixed

bzr revid: csn@openerp.com-20140120103048-ebb2ow8rutn2gs21
2014-01-20 11:30:48 +01:00
Denis Ledoux 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
Thibault Delavallée 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
Martin Trigaux 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
Denis Ledoux 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
Denis Ledoux 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
Bharat R. Devnani (OpenERP) ac2ad8e029 [MERGE] merged with main addons
bzr revid: bde@tinyerp.com-20131231052502-k8uge2fxeulestpa
2013-12-31 10:55:02 +05:30
Quentin (OpenERP) 53f2e9ff7b [FIX] purchase: if the order line has a bigger quantity than the procurement it was for (manually changed or minimal quantity), then split the future stock move in two because the route followed may be different.
bzr revid: qdp-launchpad@openerp.com-20131218155647-kp78jdqel91iyroq
2013-12-18 16:56:47 +01:00
Thibault Delavallée d9343e2d27 [MERGE] Sync with trunk
bzr revid: tde@openerp.com-20131213094016-ylqkilyo4190g81w
2013-12-13 10:40:16 +01:00
Quentin (OpenERP) a5cc6d6aed [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20131211100354-hwlt65vk8p3xih9u
2013-12-11 11:03:54 +01:00
Quentin (OpenERP) 9aa559a3a1 [IMP] purchase: usability improvements + linked the stock move to the procurement that created the PO line, in order to be able to propagate any information on it
bzr revid: qdp-launchpad@openerp.com-20131210151326-rrlfgnx27114gbq0
2013-12-10 16:13:26 +01:00
Christophe Matthieu 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
Denis Ledoux 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
Denis Ledoux 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
Bharat R. Devnani (OpenERP) 598d420365 [IMP] improved the code
bzr revid: bde@tinyerp.com-20131203063806-vpu7ofijvaio1m79
2013-12-03 12:08:06 +05:30
Bharat R. Devnani (OpenERP) c88dbc8b01 [IMP] improved warning message
bzr revid: bde@tinyerp.com-20131203063423-ne1dwsy4q0vp53hj
2013-12-03 12:04:23 +05:30
Bharat R. Devnani (OpenERP) baa430d237 [IMP] improved warning messages
bzr revid: bde@tinyerp.com-20131202084204-r0br5ytoc12ysjrl
2013-12-02 14:12:04 +05:30
Christophe Simonis 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
Quentin (OpenERP) df2d5e148e [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20131129165644-fx0m3ok07l41o507
2013-11-29 17:56:44 +01:00
Martin Trigaux 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
Denis Ledoux 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
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 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
Quentin (OpenERP) 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
Christophe Simonis 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
Quentin (OpenERP) 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
Christophe Simonis 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
Quentin (OpenERP) d2d0184587 [IMP] pocurement, stock, purchase, sale_stock, stock_account: misc changes in usabilty, code refactoring and new option on procurement group propagation.
1) form view of procurement.order and procurement.rule reviewed
2) added buttons on procurement.order to jump on other procurements or pickings of same procurement.group
3) tracked some fields on procurement.order
4) used the short name of warehouse for the rule names
5) added a new choice for the procurement.group propagation in order to allow having only one reception picking for several po lines grouped in the same PO but belonging to different procurement.group at first
6) some code refactored for easiness, modularity, clarity and other obvious reasons

bzr revid: qdp-launchpad@openerp.com-20131107112053-knracfslqkfitg8b
2013-11-07 12:20:53 +01:00
Quentin (OpenERP) b5645d2386 [FIX] stock_account, purchase: the standard price of a product may not be compatible with the decimal precision 'Account' or the coinage of the main currency, so we need to take care of that when creating the stock valuation entries
bzr revid: qdp-launchpad@openerp.com-20131104164939-jupkxy1zrqqq3lpq
2013-11-04 17:49:39 +01:00
Denis Ledoux 0cf57bdee2 [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8800 rev-id: dle@openerp.com-20131031162241-goga1hsvwgyqigzd
bzr revid: chs@openerp.com-20131031142325-vo84hk5co2e2phg0
bzr revid: dle@openerp.com-20131031143133-wfus2hag57e73by2
bzr revid: dle@openerp.com-20131031162928-8gpom1ralccy07uc
2013-10-31 17:29:28 +01:00
Martin Trigaux 7f9b84150f [FIX] purchase: apply same fix to invoice paid
bzr revid: mat@openerp.com-20131029093404-hw95lpcjsnok2wxa
2013-10-29 10:34:04 +01:00
Martin Trigaux 44d117398a [FIX] purchase: post message on purchase order as admin if have no read access (would block validating invoice, opw #596294)
bzr revid: mat@openerp.com-20131029092353-yg0wxl42352yu2rb
2013-10-29 10:23:53 +01:00
Quentin (OpenERP) 2a982d199e [MERGE] merged with trunk
bzr revid: qdp-launchpad@openerp.com-20131028093247-8eegjl3zle5aoqae
2013-10-28 10:32:47 +01:00
Quentin (OpenERP) 177abaeccf [IMP] purchase: removed debug statement
bzr revid: qdp-launchpad@openerp.com-20131023100005-30p2uo874zsdaum6
2013-10-23 12:00:05 +02:00
Quentin (OpenERP) 4d8a5750de [IMP] purchase: cancellation of a procurement related to a PO + some usability changes
bzr revid: qdp-launchpad@openerp.com-20131022085856-i9m00f1hh0qkrkk9
2013-10-22 10:58:56 +02:00
Quentin (OpenERP) e0b7ff8de6 [IMP] stock, procurement, purchase, mrp: cancelation of a procurement now propagate the cancellation upstream if the rule says so
bzr revid: qdp-launchpad@openerp.com-20131021151235-y0kjr9vy06a3curr
2013-10-21 17:12:35 +02:00
Quentin (OpenERP) 0f0d6cad63 [FIX] purchase: purhcase_id field on stock.picking doesn't exist anymore
bzr revid: qdp-launchpad@openerp.com-20131021112518-2gwjvmoehlzxherf
2013-10-21 13:25:18 +02:00
Quentin (OpenERP) 9f2d0cc781 [MERGE] misc things: replacement of picking_ids on purchase.order by a fields.function; adding of a button on stock.warehouse to see all the routes related; usability improvement in stock.warehouse form view; bugfix in creation of picking/stock moves from purchase.order confirmation; view all picking-related from button on purchase.order instead of just the incoming shipment
bzr revid: qdp-launchpad@openerp.com-20131017160725-fjphdok34is6q4bc
2013-10-17 18:07:25 +02:00
Quentin (OpenERP) eddd2f3575 [MERGE] merged with main feature branch
bzr revid: qdp-launchpad@openerp.com-20131017121349-xyip1fn6j0itiz56
2013-10-17 14:13:49 +02:00
jke-openerp 66b0500f3c Task misc -Step 2
bzr revid: jke@openerp.com-20131014142540-udu9mn3lu99alir2
2013-10-14 16:25:40 +02:00
jke-openerp 7dde2be791 task : misc - part 1
bzr revid: jke@openerp.com-20131011160423-arlw8cb809us4c9f
2013-10-11 18:04:23 +02: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
Quentin (OpenERP) 65966940c8 [MERGE] merged with main trunk
bzr revid: qdp-launchpad@openerp.com-20131010133212-t058auv973pvvmjm
2013-10-10 15:32:12 +02:00
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 6bd70af1de [IMP] purchase: put back sql request to set exception message and avoid context hack
bzr revid: mat@openerp.com-20131009122714-rqhciu8ozy059pyn
2013-10-09 14:27:14 +02:00
Quentin (OpenERP) 5ee7193c9c [MERGE] jke's branch with usability stuff and merge of PO
bzr revid: qdp-launchpad@openerp.com-20131008123659-4g1bggnhfgepghaz
2013-10-08 14:36:59 +02:00
Martin Trigaux 18528adaff [FIX] purchase: block workflow when supplier check fails, even if already has set an error message
lp bug: https://launchpad.net/bugs/1236191 fixed

bzr revid: mat@openerp.com-20131007081014-8p0u7s0svx7gokg1
2013-10-07 10:10:14 +02:00
Martin Trigaux cdd5b4f130 [FIX] purchase: use the correct variable, finally
bzr revid: mat@openerp.com-20131004155600-vqasj1w07uhnvdmy
2013-10-04 17:56:00 +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
Martin Trigaux e827454d1d [FIX] purchase: avoid workflow trigger infinite loop
bzr revid: mat@openerp.com-20131004150710-mtecvsj9ad7qrisc
2013-10-04 17:07:10 +02:00
Martin Trigaux 376d390914 [IMP] purchase: don't send messages at all when exception, already logged in message field
bzr revid: mat@openerp.com-20131004144029-rp0j2z53zxt7ddh5
2013-10-04 16:40:29 +02:00
Martin Trigaux dbac14474f [FIX] purchase: reduce the number of mail messages sent to when procurement in exception
lp bug: https://launchpad.net/bugs/1233730 fixed

bzr revid: mat@openerp.com-20131004140602-8gic5ojgadso5801
2013-10-04 16:06:02 +02:00
Quentin (OpenERP) 6d6c095a7e [FIX] purchase: now the procurement is linked to the purchase order line, not the purchase order anymore
bzr revid: qdp-launchpad@openerp.com-20131003144614-2v3ps0dxxyihhp0a
2013-10-03 16:46:14 +02:00
Quentin (OpenERP) 6cfd4d8856 [IMP] purchase: some usabiltiy concerns related to previous commit
bzr revid: qdp-launchpad@openerp.com-20131003132221-2hy217ly3v3dpmg9
2013-10-03 15:22:21 +02:00
Quentin (OpenERP) 5898738b36 [IMP] purchase: on procurement triggering a PO, try to link the new line first to an existing draft PO
bzr revid: qdp-launchpad@openerp.com-20131003131448-q1iayy0um5xpy82p
2013-10-03 15:14:48 +02:00
Quentin (OpenERP) c6799b414b [FIX] stock_complex_routes: fixed yaml test + removed debug statements
bzr revid: qdp-launchpad@openerp.com-20131003121554-babfhuyjkwwom0ki
2013-10-03 14:15:54 +02:00
Quentin (OpenERP) 11fa96bbbd [FIX] fixed find_suitable_rule, fixed data for main warehouse and added debug statement for crashing yaml test
bzr revid: qdp-launchpad@openerp.com-20131003091709-q4boyc5dwz2ec7ho
2013-10-03 11:17:09 +02:00
Quentin (OpenERP) b1d9c439d2 [DEBUG] debug statement
bzr revid: qdp-launchpad@openerp.com-20131003071733-ubx5ejm3n430hb5t
2013-10-03 09:17:33 +02:00
Quentin (OpenERP) db0b40111e [DEBUG] debug statement
bzr revid: qdp-launchpad@openerp.com-20131002215745-9l5spf55ec6nr6ti
2013-10-02 23:57:45 +02:00
Quentin (OpenERP) 380a64b6b4 [DEBUG] debug statement
bzr revid: qdp-launchpad@openerp.com-20131002213141-m7uu4yga6hlzp4lt
2013-10-02 23:31:41 +02:00
Quentin (OpenERP) 25ead59713 [DEBUG] debug statement
bzr revid: qdp-launchpad@openerp.com-20131002211040-s5tglavh3g8hok6w
2013-10-02 23:10:40 +02:00
Quentin (OpenERP) 15765de7d0 [DEBUG] debug statement
bzr revid: qdp-launchpad@openerp.com-20131002204624-g1h9lylck0cx8bww
2013-10-02 22:46:24 +02:00
Quentin (OpenERP) 66652b2fd5 [DEBUG] debug statement
bzr revid: qdp-launchpad@openerp.com-20131002201425-ti74znmwqiefmkjx
2013-10-02 22:14:25 +02:00
Quentin (OpenERP) 8530fc623a [FIX] attempt to fix the runbot
bzr revid: qdp-launchpad@openerp.com-20131002194237-hggdv3git151p09d
2013-10-02 21:42:37 +02:00
jke-openerp f13f1ebbce WMS usability (part) + WMS Merge PO
bzr revid: jke@openerp.com-20131002134242-w76s6p03p66wbk16
2013-10-02 15:42:42 +02:00
Quentin (OpenERP) 033d442a81 [IMP] purchase: usability of picking_type_id field
bzr revid: qdp-launchpad@openerp.com-20130927122148-y4b0054ljjm7f0jv
2013-09-27 14:21:48 +02:00
Denis Ledoux db84e912bd [MERGE] Forward-port of latest saas-1 bugfixes, up to rev. 8781 rev-id: dle@openerp.com-20130923165651-0jt823r5wy37enw6
bzr revid: dle@openerp.com-20130923171310-mav1riq3d2rebmv2
2013-09-23 19:13:10 +02:00
Denis Ledoux 955276a684 [FIX]purchase: It was no possible to validate invoices of several purchase orders due to a message_post with a list of more than 1 id
bzr revid: dle@openerp.com-20130920115431-ub87n3wgobuq4ic3
2013-09-20 13:54:31 +02:00
Cedric Snauwaert de01bca260 [FIX]cosmetics on different views
bzr revid: csn@openerp.com-20130919141319-4b2iquo74w9qcr66
2013-09-19 16:13:19 +02:00
Josse Colpaert 01c98d49e5 [IMP] Picking of purchase order should have its picking type.
bzr revid: jco@openerp.com-20130919095757-ng16zkboiz0y5fh8
2013-09-19 11:57:57 +02:00
Josse Colpaert 0a158cf672 [IMP] Only do partial operations for available moves, domain on lot, fix group moves in purchase procurement group
bzr revid: jco@openerp.com-20130918153204-ettifcuet4sysbac
2013-09-18 17:32:04 +02:00
Josse Colpaert ec42279960 [IMP] group push rules by purchase, purchase order line has procurements, one route on product
bzr revid: jco@openerp.com-20130913094216-lyfj84amuxlcnpq9
2013-09-13 11:42:16 +02:00
Josse Colpaert d207edc369 [IMP] Move sale_stock_workflow towards sale_workflow and make sure project_mrp tests pass
bzr revid: jco@openerp.com-20130910154822-u2if98d4r32rtibi
2013-09-10 17:48:22 +02:00
Josse Colpaert 30f27b8cbb [IMP] Move route_ids from product from stock_location to stock and remove supply_method (change with route)
bzr revid: jco@openerp.com-20130909115515-7z6ixaxe7bpxxe73
2013-09-09 13:55:15 +02:00
Quentin (OpenERP) 70d2733d1b [FIX] stock_account, purchase: updating the standard price of products in cost method == 'average' on receptions
bzr revid: qdp-launchpad@openerp.com-20130905103435-ch505yi7qyvxz0pz
2013-09-05 12:34:35 +02:00
Quentin (OpenERP) 7fe0d4f840 [FIX] purchase: workflow of PO wasn't correctly updated
bzr revid: qdp-launchpad@openerp.com-20130904150137-og2bu4ineae2o2ax
2013-09-04 17:01:37 +02:00
Cedric Snauwaert eaa49c3d12 [FIX]purchase: view_picking should eval action_view context with picking_type_id instead of active_id
bzr revid: csn@openerp.com-20130904094922-73y9cbjckq8ecfwg
2013-09-04 11:49:22 +02:00
Josse Colpaert cc3dfdd3c0 [IMP] Change warehouse to picking_type_id on purchase + put destination address after picking type + adapt packaging
bzr revid: jco@openerp.com-20130903134600-7jraor07pqp8ijpo
2013-09-03 15:46:00 +02:00