fc93025818
[MERGE] merged trunk
...
bzr revid: qdp-launchpad@openerp.com-20140120144243-5kw535p28t1x7yeg
2014-01-20 15:42:43 +01:00
bea411bb98
[IMP] Backport one feature from website: this feature allows to specify a file
...
path on the field tag fetching the right file instead of using the base64
encoded file in the field.
<field name="image" type="base64" file="base/static/img/main_partner-image.png" />
bzr revid: stw@openerp.com-20140109154550-a04qybctzaaqtrlr
2014-01-09 16:45:50 +01:00
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
83053a16e3
[FIX] some tests in sale_Stock
...
bzr revid: fp@openerp.com-20130804175722-71ov6xopn7nu0y5s
2013-08-04 19:57:22 +02:00
1202f9c6d5
[MERGE]sync with trunk
...
bzr revid: sgo@tinyerp.com-20130605072213-cwxmjtzt36434mgt
2013-06-05 12:52:13 +05:30
57fdf11635
[IMP] salesteams: add demo data
...
bzr revid: chm@openerp.com-20130419103600-71j6munkzygnffe4
2013-04-19 12:36:00 +02:00
cf6595baf2
[IMP]remove total sale.shop from sales
...
bzr revid: sgo@tinyerp.com-20130121100542-36qmkrd82md97phv
2013-01-21 15:35:42 +05:30
1fcdb5adbe
[FIX]
...
Original location of the field has been changed. Maximum sales, events, and
fields. If not specified the Aformentioned fields runbot 'still doesn' t ' t
like it.
bzr revid: vmt@openerp.com-20121115140337-4tqplv17th4hs0l5
2012-11-15 15:03:37 +01:00
d1f49ab27a
[IMP] removing some warnings (those one are generated by tests).
...
bzr revid: vmt@openerp.com-20121115115916-6i2ljxn7s9qz4rlv
2012-11-15 12:59:16 +01:00
04eef2c7a0
[IMP] sale: somewhat better wording for demo messages (reported by the en_US police)
...
bzr revid: odo@openerp.com-20121017094903-ckuo2s2twe01rq66
2012-10-17 11:49:03 +02:00
c439bdb3c0
[FIX] sale: put back the button 'View Invoice' on sale orders (removed for no reason) + reorganized files to reduce the diff with trunk
...
bzr revid: qdp-launchpad@openerp.com-20120920131711-hu825gunt4cbtzin
2012-09-20 15:17:11 +02:00
eb28892a3a
[IMP]: MOVE PROCUREMENT CHANGES INTO PROCUREMENT..
...
bzr revid: atp@tinyerp.com-20120909101156-9pna66qbx28px2ii
2012-09-09 15:41:56 +05:30
652300eb89
[MERGE]: Merged with lp:openobject-addons
...
bzr revid: atp@tinyerp.com-20120814061700-k4swskeiz9r3ypn5
2012-08-14 11:47:00 +05:30
ecfe4cbba1
[FIX]: mrp,sale: Fixed field name for image
...
bzr revid: rpa@tinyerp.com-20120809102841-sbz3bu28hbqkl8dc
2012-08-09 15:58:41 +05:30
bab2f1959f
[FIX]: Fix menu and workflow problem
...
bzr revid: atp@tinyerp.com-20120727062841-cg5qtd34nnll8n5r
2012-07-27 11:58:41 +05:30
0ba2495536
[MERGE]: Merged with addons
...
bzr revid: atp@tinyerp.com-20120727045234-7jti0rs51z5beb8a
2012-07-27 10:22:34 +05:30
06c0ead10d
[ADD]: Add dependency
...
ii) move wizard , yaml file
iii) move stock method into sale_stock.
iv) add security into sale_stock module.
bzr revid: atp@tinyerp.com-20120726205659-xiyx39r3dibshyjs
2012-07-27 02:26:59 +05:30
780bdb4a29
[IMP]: product: Changed xml_id of product in data file from product_product_0 to product_product_consultant to identify this record easily when accessing from py
...
bzr revid: rpa@tinyerp.com-20120726113914-gvpo9rx7fan77w3f
2012-07-26 17:09:14 +05:30
50164cdb7e
[IMP]: Added images for products in some modules like membership, hr_expense...
...
bzr revid: rpa@tinyerp.com-20120719092738-jlnadpulm88kc032
2012-07-19 14:57:38 +05:30
a94ef120e5
[FIX]: sale, project_mrp: Fixed some product demo for yml test case
...
bzr revid: rpa@tinyerp.com-20120713060436-mdurmx2keel4hmpg
2012-07-13 11:34:36 +05:30
69fe598901
[IMP]: sale: Added unit price of product in sale line demo
...
bzr revid: rpa@tinyerp.com-20120712103540-3figxu3uo149uvhb
2012-07-12 16:05:40 +05:30
4061a1e1d4
[IMP]: sale: Improvement in demo data of sale orders and shop
...
bzr revid: rpa@tinyerp.com-20120711130603-f5j6jzdpi1ymxnue
2012-07-11 18:36:03 +05:30
4321bcdf30
[IMP]: sale: Improved xml_id reference names for sale order and order lines (work in progress)
...
bzr revid: rpa@tinyerp.com-20120711103549-67ne83p5jw188k3h
2012-07-11 16:05:49 +05:30
d259c31449
[IMP]: product: Improved reference name for UoM hour and day to make it consistent with other demo reference name
...
bzr revid: rpa@tinyerp.com-20120703104559-3yew39vtv7ayop64
2012-07-03 16:15:59 +05:30
40f83805c5
[IMP]: product: Improved reference of demo product xml_id from static names to number (work in progress)
...
bzr revid: rpa@tinyerp.com-20120629110424-xykxjjq7sn50ovww
2012-06-29 16:34:24 +05:30
237173eeff
[IMP]: product: Improvement in product category demo, improved xml_id refereneces (work in progress)
...
bzr revid: rpa@tinyerp.com-20120628093001-k113siqn5sbp3xf2
2012-06-28 15:00:01 +05:30
e7dc59c238
[IMP]: Improved references of demo data based on changes of server to improve demo
...
bzr revid: rpa@tinyerp.com-20120625065432-jsv90srvwuky0ali
2012-06-25 12:24:32 +05:30
0aaef8a06e
[IMP]: Improved partner demo xml_id referenced based on changes in server
...
bzr revid: rpa@tinyerp.com-20120620120305-g88c9cp55csnsvoc
2012-06-20 17:33:05 +05:30
189fd8e390
[IMP]: (Work in progress)* Changed demo references according to changes in server, Aim is to add more common names and easy demo.
...
* Improved xml_id of demo like res_partner_1 instead of specific record name like res_partner_asus so in future we can change that record value easily avoiding confusions in names
bzr revid: rpa@tinyerp.com-20120619071624-3d9mcl9m76gp2s0c
2012-06-19 12:46:24 +05:30
b7210951a4
[IMP] Improved code for advance invoice.
...
bzr revid: tpa@tinyerp.com-20120510110205-bbuu7wddtpeez7k6
2012-05-10 16:32:05 +05:30
1e7213e03b
[MERGE]merge with trunk
...
bzr revid: sgo@tinyerp.com-20120402053506-murku1s7cn96rwde
2012-04-02 11:05:06 +05:30
976f7319e7
[MERGE]
...
bzr revid: sgo@tinyerp.com-20120321101521-kfb67vhspm6uzo5d
2012-03-21 15:45:21 +05:30
2e402d5c3e
[MERGE] Merge with lp:openobject-addons
...
bzr revid: sbh@tinyerp.com-20120320052258-4g8zcpd248do6tw9
2012-03-20 10:52:58 +05:30
fa3f4f180f
[IMP]Add demo data record which is deleted
...
bzr revid: sgo@tinyerp.com-20120315063341-7jsvfbttbsrvpw0v
2012-03-15 12:03:41 +05:30
84102aa105
[FIX] sale: fixed demo data in order to make runbot green. Having mrp and mrp_jit installed was causing an assertion failure in sale/test/cancel_order.yml because the sale.order was not in shipping exception (as the procurement was automatically confirmed). As i guess this _is_ the wanted behavior where working in just in time, i just changed the demo data in order to have the test working in 'make to stock'
...
bzr revid: qdp-launchpad@openerp.com-20120314111055-49jiz4z3p87lqos1
2012-03-14 12:10:55 +01:00
9d3411ee54
[IMP]remove comments unused code
...
bzr revid: sgo@tinyerp.com-20120306063302-thlryjejp9idkjq3
2012-03-06 12:03:02 +05:30
50997f9fe8
[Fix]sale: remove res.address.partner.address
...
bzr revid: kjo@tinyerp.com-20120305132543-92ba124cpg4zbrix
2012-03-05 18:55:43 +05:30
c7166b7fdb
[FIX]Sale:Simplify the picking and the invoice policy on Sale order edit order policy and set invoice on as per needed
...
bzr revid: sgo@tinyerp.com-20120302064709-430idkcoq18t6q4x
2012-03-02 12:17:09 +05:30
09f1515ea9
[FIX] procurement: return False in check_move_done if service product
...
[REF] procurment: check_produce method to take main supplier in one line if supply method is not produce
[IMP] project_mrp: improve yml, demo with service product "Advance" and order "order7"
bzr revid: hmo@tinyerp.com-20111213132904-ibxh3yjszps3q3ee
2011-12-13 18:59:04 +05:30
6139f23fe9
[FIX] sale: demo data should has noupdate=1
...
bzr revid: hmo@tinyerp.com-20111212053720-pm3t050sevcs0ydc
2011-12-12 11:07:20 +05:30
54aeedcc34
[FIX] sale: regression in sale_demo.xml
...
bzr revid: hmo@tinyerp.com-20111201103754-d5ibm2d9t9jx9g2u
2011-12-01 16:07:54 +05:30
61dde65bbe
[MERGE] merged cleanup work on sales from dbr branch:
...
Summary
=======
account/account_invoice.py
* [FIX] warning: 'type' field is not exits in 'account.move'. so removed stuff to set Type in action_move_create() and pay_and_reconsile() method.
mrp/mrp_workflow.xml and procurement/procurement_workflow.xml
* [FIX] bug: procurement is not closed if supply_method is 'procude' without installation of MRP.
sale/sale.py
* [FIX] warning: 'property_ids' field is not exits anymore.
* [FIX] bug: In creation of move line, If UOS is not specified, UOS qty should be assign with UOM Qty
* [REF] ship_recreate: move stuff to re-create shipment into internal function.
sale/sale_demo.xml
* [IMP] modify demo with values.
[REM]
* advance_invoice.yml [move this into manual_order_policy.yml]
* so_make_invoice.yml [move this into manual_order_policy.yml]
* so_make_line_invoice.yml [move this into manual_order_policy.yml]
* sale_procurement.yml [move this into picking_order_policy.yml]
* sale_report.yml [move this into picking_order_policy.yml]
* invoice_on_ordered_qty.yml
* invoice_on_shipped_qty.yml
[IMP]
* manual_order_policy.yml
* picking_order_policy.yml
* postpaid_order_policy.yml
* prepaid_order_policy.yml
* sale_order_demo.yml
[ADD]
* cancel_order.yml
* delete_order.yml
bzr revid: hmo@tinyerp.com-20111201102823-bf6809i0s938hvue
2011-12-01 15:58:23 +05:30
e13d886bdc
[IMP]sale: Improve some assert
...
bzr revid: dbr@tinyerp.com-20111130122404-uhdqop2yinqjnkhj
2011-11-30 17:54:04 +05:30
85e40ff69f
[IMP] sale: improve yml to test process of sale
...
bzr revid: hmo@tinyerp.com-20111129133352-p7taekbdakaketph
2011-11-29 19:03:52 +05:30
57b90b39f5
[IMP]sale: Update quantity in demo data and some minor changes regarding spaces
...
bzr revid: dbr@tinyerp.com-20111125070123-lv7ae5b1gb93pvqn
2011-11-25 12:31:23 +05:30
f375cbadaa
[IMP]sale: Improve code for cancel_order process
...
bzr revid: dbr@tinyerp.com-20111124133821-ujizre2sbg0hdkbg
2011-11-24 19:08:21 +05:30
fa6165902c
[IMP]sale: Improve code for cancel_order.yml
...
bzr revid: dbr@tinyerp.com-20111124073729-bd2hfampmz5jkqss
2011-11-24 13:07:29 +05:30
35e53a8495
[MOVE,IMP]sale:
...
Move scheduler file in to process folder and Improve some test cases
bzr revid: dbr@tinyerp.com-20111116064843-iubv9la5kufttuuo
2011-11-16 12:18:43 +05:30
ba2fea7899
[MOVE, IMP] Sale:
...
[MOVE] sale/test/data_test.yml => sale/test/ui/delete_order.yml
[IMP] delete_order.yml
[IMP] onchange_events.yml
[IMP] __openerp__.py
bzr revid: dbr@tinyerp.com-20111104074308-pn918dm7sux3osdd
2011-11-04 13:13:08 +05:30
d9077030a2
[IMP]sale :
...
Improve yml code on the bases of different order_type
bzr revid: dbr@tinyerp.com-20111103100220-bsacub1b6dthcbj7
2011-11-03 15:32:20 +05:30
Quentin (OpenERP)
Stephane Wirtel
Josse Colpaert
Fabien Pinckaers
sgo@tinyerp.com
Christophe Matthieu
Vo Minh Thu
Olivier Dony
Atul Patel (OpenERP)
Rucha (Open ERP)
Turkesh Patel (Open ERP)
Sanjay Gohel (Open ERP)
Bhumika (OpenERP)
Kuldeep Joshi (OpenERP)
Harry (OpenERP)
DBR (OpenERP)