Commit Graph

172 Commits

Author SHA1 Message Date
Rucha (Open ERP) 4eb76030a6 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120726053855-8j8c70xqc0ynikx1
2012-07-26 11:08:55 +05:30
Raphael Collet 0e681f8f5e [FIX] sale: in create invoice wizard, reintroduce field qtty (used in tests)
bzr revid: rco@openerp.com-20120723161426-rwk22j4tm71z863b
2012-07-23 18:14:26 +02:00
Rucha (Open ERP) 64137a63cf [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120716090657-r7mlld3rsufel2ge
2012-07-16 14:36:57 +05:30
Fabien Pinckaers 5256356f46 [FIX] note on invoices
bzr revid: fp@openerp.com-20120714221200-zdwhp48812cixfei
2012-07-15 00:12:00 +02:00
Rucha (Open ERP) 85177961c6 [FIX]: sale: Fixed yml of sale based on changes in demo
bzr revid: rpa@tinyerp.com-20120712111613-1grfmyg1qqszd11a
2012-07-12 16:46:13 +05:30
Rucha (Open ERP) 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
Rucha (Open ERP) 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
Rucha (Open ERP) 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
Rucha (Open ERP) 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
Raphael Collet 33deda8f83 [MERGE] from trunk
bzr revid: rco@openerp.com-20120427131241-6gf7x3lzhux5qnnh
2012-04-27 15:12:41 +02:00
Raphael Collet 017c5f8290 [MERGE] from trunk
bzr revid: rco@openerp.com-20120403082756-egpot17iztniu8tr
2012-04-03 10:27:56 +02:00
Sanjay Gohel (Open ERP) 1e7213e03b [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20120402053506-murku1s7cn96rwde
2012-04-02 11:05:06 +05:30
Sbh (Openerp) deedfe2034 [IMP] sale: rename address_id with parnter_id
bzr revid: sbh@tinyerp.com-20120330075032-wmbw3kv21h44u60i
2012-03-30 13:20:32 +05:30
Turkesh Patel (Open ERP) f5f9d458b6 [FIX] improved code in edi and l10n_ch modules.
bzr revid: tpa@tinyerp.com-20120322061846-021c8rb9yfkespr4
2012-03-22 11:48:46 +05:30
Raphael Collet da3e32700a [MERGE] trunk-v62_config_sale-uco (new sale config wizard)
bzr revid: rco@openerp.com-20120321152751-9okrox08jmd2wrxu
2012-03-21 16:27:51 +01:00
Kuldeep Joshi (OpenERP) f54017daeb [Fix] sale: Fix edi issue
bzr revid: kjo@tinyerp.com-20120321132007-618c7dirzqtlu3ob
2012-03-21 18:50:07 +05:30
Sanjay Gohel (Open ERP) 976f7319e7 [MERGE]
bzr revid: sgo@tinyerp.com-20120321101521-kfb67vhspm6uzo5d
2012-03-21 15:45:21 +05:30
Raphael Collet 0e526bd329 [FIX] sale config: use model sale.config.settings instead of res.config.settings
bzr revid: rco@openerp.com-20120320135002-0gsazmlgock4gmnl
2012-03-20 14:50:02 +01:00
Bhumika (OpenERP) 2e402d5c3e [MERGE] Merge with lp:openobject-addons
bzr revid: sbh@tinyerp.com-20120320052258-4g8zcpd248do6tw9
2012-03-20 10:52:58 +05:30
Raphael Collet d11ba5806e [IMP] product, sale, purchase, mrp, account: change unit label 'PCE' into 'Unit'
bzr revid: rco@openerp.com-20120308144439-yg2txflpu12zcord
2012-03-08 15:44:39 +01:00
Ujjvala Collins (OpenERP) de835f766d [IMP]: Improved all modules to change according to new changes on server. Added res.config.settings object for all configurations.
bzr revid: uco@tinyerp.com-20120307054440-uu1nrjhqbanj0sjb
2012-03-07 11:14:40 +05:30
Sanjay Gohel (Open ERP) 9d3411ee54 [IMP]remove comments unused code
bzr revid: sgo@tinyerp.com-20120306063302-thlryjejp9idkjq3
2012-03-06 12:03:02 +05:30
Kuldeep Joshi (OpenERP) 50997f9fe8 [Fix]sale: remove res.address.partner.address
bzr revid: kjo@tinyerp.com-20120305132543-92ba124cpg4zbrix
2012-03-05 18:55:43 +05:30
Ujjvala Collins (OpenERP) 05477792a4 [IMP]: Improved code to use new object res.config.settings for application settings.
bzr revid: uco@tinyerp.com-20120305051133-rj71925yxncp432a
2012-03-05 10:41:33 +05:30
Ujjvala Collins (OpenERP) adc65d5cfa [IMP]: Improved code: added functionality to the respected modules. Added get and set methods.
bzr revid: uco@tinyerp.com-20120229095021-ogpd1s4nyxa7wdns
2012-02-29 15:20:21 +05:30
Turkesh Patel (Open ERP) 9493fb1dda [FIX] fix the yml error in account/account/test/test_edi_invoice.ymlsale/test/edi_sale_order.yml and sale module
bzr revid: tpa@tinyerp.com-20120227114130-ctllm9ci3v180j7t
2012-02-27 17:11:30 +05:30
Ujjvala Collins (OpenERP) 49b2920b82 [IMP]: Improved code.
bzr revid: uco@tinyerp.com-20120227055635-ugxsh4rh6flw3ryu
2012-02-27 11:26:35 +05:30
Quentin (OpenERP) 0466c59aba [FIX] fixed error in yaml test
bzr revid: qdp-launchpad@openerp.com-20111229170811-6ekfvxssilc3y6hn
2011-12-29 18:08:11 +01:00
Raphael Collet cd79031279 [FIX] sale: test wrongly compares an invoice's journal with an arbitrary sales journal
bzr revid: rco@openerp.com-20111222095621-1pt1di80qt1k65oe
2011-12-22 10:56:21 +01:00
Harry (OpenERP) 92db677123 [MERGE] merged with trunk-development-branch
bzr revid: hmo@tinyerp.com-20111215133509-i1p207nzy6sfmg0c
2011-12-15 19:05:09 +05:30
Harry (OpenERP) 24595ccae6 [REF] procurement: revert solution on issue if mrp is not install, procurement gone in idle state and sale order is not close and also invoice is not created if postpaid policy and put tag TOFIX to mention other issues
bzr revid: hmo@tinyerp.com-20111215105520-3h9ndu1i4zby1r99
2011-12-15 16:25:20 +05:30
Ujjvala Collins (OpenERP) dab7684448 [FIX] sale,stock_location: Fixed runbot errors.
bzr revid: uco@tinyerp.com-20111214061451-7dv4fut2d4y0lway
2011-12-14 11:44:51 +05:30
Harry (OpenERP) 1a29e26cd8 [FIX] sale: forgot to add new yml files
bzr revid: hmo@tinyerp.com-20111201103051-vscqfi3d2hlt2nri
2011-12-01 16:00:51 +05:30
Harry (OpenERP) 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
Harry (OpenERP) 47d741f8ff [REF] sale: YML of order_process split into different file base on invoice policy.
bzr revid: hmo@tinyerp.com-20111201082344-093f9s8e509umeye
2011-12-01 13:53:44 +05:30
Harry (OpenERP) ebb2795c95 [IMP] sale: add more assert in test case of order process
bzr revid: hmo@tinyerp.com-20111201072045-5ja34buw31tgtglh
2011-12-01 12:50:45 +05:30
Harry (OpenERP) 47ffee6acd [FIX] sale: UOM qty should be consider if UOS is not specified on creating shipment.
bzr revid: hmo@tinyerp.com-20111201050547-qrn3y9ttl43szrqe
2011-12-01 10:35:47 +05:30
DBR (OpenERP) e13d886bdc [IMP]sale: Improve some assert
bzr revid: dbr@tinyerp.com-20111130122404-uhdqop2yinqjnkhj
2011-11-30 17:54:04 +05:30
DBR (OpenERP) 2bee08352e [IMP]sale : remove extra spaces
bzr revid: dbr@tinyerp.com-20111130092833-l4yq3g1rou4slk72
2011-11-30 14:58:33 +05:30
Harry (OpenERP) 4976c908c5 [FIX] sale: put comment in test cases where failure occur. it should be remove after resolve it.
bzr revid: hmo@tinyerp.com-20111130064504-5f5bd227ql1bcr3q
2011-11-30 12:15:04 +05:30
Harry (OpenERP) 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
DBR (OpenERP) cce6af950c [IMP]sale: Minor changes in cancel_order.yml
bzr revid: dbr@tinyerp.com-20111125115705-mlwr15nvaz1tghac
2011-11-25 17:27:05 +05:30
Ujjvala Collins (OpenERP) ee90bb92a5 [REF] sale: Corrected typo.
bzr revid: uco@tinyerp.com-20111125103558-d55tc9nzwegj38n4
2011-11-25 16:05:58 +05:30
DBR (OpenERP) fd26803911 [IMP]sale: Minor changes of extra space
bzr revid: dbr@tinyerp.com-20111125094350-1u2trx3ptn76vidi
2011-11-25 15:13:50 +05:30
DBR (OpenERP) 54e907c737 [IMP]sale: Minor changes
bzr revid: dbr@tinyerp.com-20111125070817-9ximbzkagdpwyi1g
2011-11-25 12:38:17 +05:30
DBR (OpenERP) f4292f0d03 [IMP]sale: Define the propar state
bzr revid: dbr@tinyerp.com-20111125063143-jnlkpwpgeiqfck37
2011-11-25 12:01:43 +05:30
DBR (OpenERP) f74b9565c7 [IMP]sale: Improve code and add msg string
bzr revid: dbr@tinyerp.com-20111125052938-tlydiz9d8taijl38
2011-11-25 10:59:38 +05:30
DBR (OpenERP) f375cbadaa [IMP]sale: Improve code for cancel_order process
bzr revid: dbr@tinyerp.com-20111124133821-ujizre2sbg0hdkbg
2011-11-24 19:08:21 +05:30
DBR (OpenERP) b95ab0a421 [IMP]sale: Improve code for cancel_order.yml
bzr revid: dbr@tinyerp.com-20111124114219-0fitkol4pwvdyaqu
2011-11-24 17:12:19 +05:30
DBR (OpenERP) fa6165902c [IMP]sale: Improve code for cancel_order.yml
bzr revid: dbr@tinyerp.com-20111124073729-bd2hfampmz5jkqss
2011-11-24 13:07:29 +05:30