odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity
88,980 Commits 3 Branches 0 Tags 961 MiB
Commit Graph

924 Commits

Author SHA1 Message Date
Christophe Simonis b1c0bc0b46 [MERGE] forward port of branch saas-4 up to 65f68c1 2014-06-03 19:45:19 +02:00
Christophe Simonis 65f68c1f65 [MERGE] forward port of branch saas-3 up to 7dd6954 2014-06-03 19:14:22 +02:00
Christophe Simonis 7dd69540e8 [MERGE] forward port of branch 7.0 up to 0c4bc1c 2014-06-03 19:11:44 +02:00
Denis Ledoux 7a157dd35e [FIX] delivery: allow to add delivery method in quotation if quotation in quotation sent stage 
opw-607920
 2014-06-03 17:12:07 +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
buke 1971141dc5 Fixed delivery grid get_price 
It's wrong for cal weight in delivery gird . It's use product.weight * qty.
 2014-05-26 17:12:38 +08:00
Olivier Dony 2af03e1b6e [MERGE] Forward-port latest 7.0 bugfixes, up to f8671cb 2014-05-22 16:44:33 +02:00
Martin Trigaux 0efc066aa6 Add sequence field with handle in tree view 2014-05-22 14:56:33 +02:00
Martin Trigaux 4e34e3bce5 Add < and > operators to allow rules without gap (eg: until 100 & above 100) 2014-05-22 14:55:26 +02:00
Olivier Dony 02035b27b8 [RESTORE] Restore *.sxw files, skipped during bzr-to-git conversion to discard older binary blobs 2014-05-22 14:07:15 +02:00
Wolfgang Taferner fd223b1d5d Add quantity in variable factor too... 
I forgot to add the changes before committing
 2014-05-17 16:02:15 +02:00
Wolfgang Taferner 65cd88d216 [IMP] Added quantity as type and variable_factor + sequence for flexibility to delivery grid line 2014-05-17 09:08:25 +02:00
Launchpad Translations on behalf of openerp f173d926c8 Launchpad automatic translations update. 2014-05-13 06:28:52 +00:00
Olivier Dony 083108a624 [IMP] delivery,stock,mrp: minor cleanup/spellchecking/nit-picking while reviewing 
bzr revid: odo@openerp.com-20140507165951-th4iqsrp6l67dvve
 2014-05-07 18:59:51 +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
Antony Lesuisse 7e25b9ae55 [MERGE] saas-4 report_webkit missing dependency on report 
bzr revid: al@openerp.com-20140501152604-4cobh5ui47dt4pem
bzr revid: al@openerp.com-20140501155633-gefnc3zqcsr2rhaz
bzr revid: al@openerp.com-20140501161156-4wbsvhh8gz4r22h3
 2014-05-01 18:11:56 +02:00
Denis Ledoux 79d4c57877 [MERGE] Forward-port of latest saas-3 bugfixes, up to rev. 9439 revid:dle@openerp.com-20140429112147-hqfqd0y487s817n7 
bzr revid: dle@openerp.com-20140429112738-y2el246dmd2o2zy9
 2014-04-29 13:27:38 +02:00
Launchpad Translations on behalf of openerp fdfcb6bf47 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh
 2014-04-29 06:41:21 +00:00
Denis Ledoux b54e49b291 [FIX] website_sale, website_sale_delivery, delivery: price computation on quantity change 
bzr revid: dle@openerp.com-20140425152541-qiabb4sa7y2skgql
 2014-04-25 17:25:41 +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
Launchpad Translations on behalf of openerp c7565cd540 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140424063249-gwnojb5kvlq544nz
 2014-04-24 06:32:49 +00:00
Launchpad Translations on behalf of openerp d64b172b3b Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423065826-x7fmgc85ckhi9s8u
bzr revid: launchpad_translations_on_behalf_of_openerp-20140423070300-k249yxs2ghd1vaof
 2014-04-23 07:03:00 +00:00
Bharat Devnani (Open ERP) 3a0c820dfd [MERGE][IMP] More explicit error messages (in delivery, hr_timesheet_sheet, purchase, purchase_requisition, sale_stock, stock) 
bzr revid: rim@openerp.com-20140422123022-22zef462lts0qyqi
 2014-04-22 14:30:22 +02:00
Richard Mathot (OpenERP) 71560225a9 [MERGE] from trunk 
bzr revid: rim@openerp.com-20140422093002-5mset34e3o1jkadr
 2014-04-22 11:30:02 +02:00
Quentin (OpenERP) 57cebaaac6 [MERGE] merged trunk up to revision 9365. 
bzr revid: qdp-launchpad@openerp.com-20140422092815-f4tlfmo8zj1nogbl
 2014-04-22 11:28:15 +02:00
Launchpad Translations on behalf of openerp fa60b90c1f Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140422075247-nxfftok20ltlnea6
 2014-04-22 07:52:47 +00: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) 398d96f273 [MERGE] merged trunk up to revision 9327 
bzr revid: qdp-launchpad@openerp.com-20140414094743-hv0u7qhigv1to2uc
 2014-04-14 11:47:43 +02:00
Launchpad Translations on behalf of openerp e82fbf7d91 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140412083153-3ona1js7o6z421vg
 2014-04-12 08:31:53 +00:00
Rakesh Sindhav (OpenERP) f081a5e441 [IMP]account,purchse,warehouse,sale: view improvement in addons modules 
bzr revid: rsi@tinyerp.com-20140411131842-9zppvrs2szqa4o47
 2014-04-11 18:48:42 +05:30
Christophe Simonis 0fad8159f3 [MERGE] forward port of branch saas-3 up to revid 9380 chs@openerp.com-20140407144439-10n8fs6zovodwwtx 
bzr revid: chs@openerp.com-20140407163318-hh3jwfkj3o2c83lk
 2014-04-07 18:33:18 +02:00
Denis Ledoux 368afae722 [FIX] website_sale: order data refresh problem 
bzr revid: dle@openerp.com-20140404102512-72x74ys4k6whk8ss
 2014-04-04 12:25:12 +02:00
Launchpad Translations on behalf of openerp 8f174e13bd Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070722-99m3lomg172fzapc
bzr revid: launchpad_translations_on_behalf_of_openerp-20140404070759-302tyo6k09v8arhz
 2014-04-04 07:07:59 +00:00
Quentin (OpenERP) ff4726ea7d [MERGE] merged trunk up to revision 9281 
bzr revid: qdp-launchpad@openerp.com-20140403081427-7xpn57wdfv08v2al
 2014-04-03 10:14:27 +02:00
Launchpad Translations on behalf of openerp 16ce262c33 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140329073038-m7q4sxpb8tprh00r
bzr revid: launchpad_translations_on_behalf_of_openerp-20140330061549-r3t0pecngy76c2rw
bzr revid: launchpad_translations_on_behalf_of_openerp-20140331064021-x3wjc8s4oa0ncq95
bzr revid: launchpad_translations_on_behalf_of_openerp-20140401065325-w3viflz7c33n4uis
bzr revid: launchpad_translations_on_behalf_of_openerp-20140402064459-d7e3d8nwo8famjh6
 2014-04-02 06:44:59 +00:00
Launchpad Translations on behalf of openerp 51aa261b44 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140327073504-l0fydwct329jhirh
 2014-03-27 07:35:04 +00:00
Josse Colpaert 801d6201b2 [IMP] Remove yml test for report 
bzr revid: jco@openerp.com-20140318135346-0mv3b8ieuky0rp0m
 2014-03-18 14:53:46 +01:00
Josse Colpaert 58cef1286f [ADD] Shipping report extension 
bzr revid: jco@openerp.com-20140318125154-k0a0bc031lb4g2us
 2014-03-18 13:51:54 +01:00
Josse Colpaert 90b2be3676 [IMP] Delivery module report implementation in the existing picking report 
bzr revid: jco@openerp.com-20140318121823-12d36hihg7yyfejl
 2014-03-18 13:18:23 +01:00
Launchpad Translations on behalf of openerp 596cc96b7e Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140318062135-gqvoka8hm41pe762
 2014-03-18 06:21:35 +00: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 f166daf065 Launchpad automatic translations update. 
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065427-0he29w0cqe07xmc8
bzr revid: launchpad_translations_on_behalf_of_openerp-20140308065421-4udfyb7xcfq5h1zy
bzr revid: launchpad_translations_on_behalf_of_openerp-20140309060314-64jktl10pkq3inv4
 2014-03-09 06:03:14 +00: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
Cedric Snauwaert 97004a22d1 [FIX]undo delete attribute name on delivery view 
bzr revid: csn@openerp.com-20140213124036-7grmw3aq0os2qtft
 2014-02-13 13:40:36 +01:00
Cedric Snauwaert 50b2c041aa [FIX]delivery form view + some label 
bzr revid: csn@openerp.com-20140212141302-g08x29wejo2om79o
 2014-02-12 15:13:02 +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 9502276166 [FIX]work on view for better usability 
bzr revid: csn@openerp.com-20140210100727-1q2q61t3c3nxfd10
 2014-02-10 11:07:27 +01:00