Commit Graph

852 Commits

Author SHA1 Message Date
Christophe Simonis fb650ee92e [MERGE] product: refactoring of product variants.
close PR #222
2014-05-30 10:22:36 +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