Commit Graph

2189 Commits

Author SHA1 Message Date
Raphael Collet 8537576b6f [MERGE] lp:904151 (sale: only sale manager have access to sale analysis)
bzr revid: rco@openerp.com-20111216150924-qbwlv1tr803no2o8
2011-12-16 16:09:24 +01:00
Raphael Collet 7e9a22268b [MERGE] merge from trunk
bzr revid: rco@openerp.com-20111216111520-wquvktxwt39v7gqf
2011-12-16 12:15:20 +01:00
Launchpad Translations on behalf of openerp 2d1baf3dda Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111216052448-trqaat8m6335nctw
bzr revid: launchpad_translations_on_behalf_of_openerp-20111216052507-5r7nig2ys4fyef7f
bzr revid: launchpad_translations_on_behalf_of_openerp-20111216060814-z34sm1fdvd230j37
2011-12-16 06:08:14 +00:00
Olivier Dony b98867779a [IMP] sale: used improved stock API added by previous commit
bzr revid: odo@openerp.com-20111215185434-s2mo587pl2a0s4ng
2011-12-15 19:54:34 +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
Divyesh Makwana (Open ERP) 9285b28374 [FIX] sale : remove the access to Sales Analysis to a Sales User
lp bug: https://launchpad.net/bugs/904151 fixed

bzr revid: mdi@tinyerp.com-20111215052037-vzk4n8jts4ycdbvk
2011-12-15 10:50:37 +05:30
Antony Lesuisse 14ad417909 [MERGE] Added modules icons for main apps mit
bzr revid: al@openerp.com-20111214182835-aw19ov6jrvxittit
2011-12-14 19:28:35 +01:00
Minh Tran a64d3dbcbc Added modules icons for main apps
bzr revid: mit@openerp.com-20111214144815-itsfpfo68l2m0jnx
2011-12-14 15:48:15 +01:00
Harry (OpenERP) dc3f27f4b3 [MERGE] merged with trunk-development-branch
bzr revid: hmo@tinyerp.com-20111214113236-4x6kbu8zw4toq0xi
2011-12-14 17:02:36 +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
Raphael Collet 0c1021806d [MERGE] trunk-user-groups-rco: add category_id to groups
bzr revid: rco@openerp.com-20111213141949-ohvn0c9iq6tcl7jj
2011-12-13 15:19:49 +01:00
Harry (OpenERP) 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
Harry (OpenERP) e4029d6055 [MERGE] merged with trunk development branch
bzr revid: hmo@tinyerp.com-20111213072552-f6ddfeeybx8ylie6
2011-12-13 12:55:52 +05:30
Fabien Pinckaers f27318c8af [IMP] Security Rule: removed duplicates due to inheritancies of groups
bzr revid: fp@tinyerp.com-20111212181113-mhnnbps3ip8ls6pp
2011-12-12 19:11:13 +01:00
Raphael Collet 00fbd705f6 [IMP] sale, sale_crm, share, stock: add group categories
bzr revid: rco@openerp.com-20111212141131-5yhvgd2pjx60seo1
2011-12-12 15:11:31 +01:00
Antony Lesuisse 9e66c39943 [FIX] main applications
bzr revid: al@openerp.com-20111212131245-ard8f2lh2zr91721
2011-12-12 14:12:45 +01:00
Harry (OpenERP) 6139f23fe9 [FIX] sale: demo data should has noupdate=1
bzr revid: hmo@tinyerp.com-20111212053720-pm3t050sevcs0ydc
2011-12-12 11:07:20 +05:30
Harry (OpenERP) 7a43016b3e [MERGE] merged with parent branch
bzr revid: hmo@tinyerp.com-20111212053351-71j829s9irz5niue
2011-12-12 11:03:51 +05:30
Harry (OpenERP) c569e1f708 [MERGE] merged with trunk-development-branch lp:~openobject-addons
bzr revid: hmo@tinyerp.com-20111212052943-ut6enyqnrlpx3ll4
2011-12-12 10:59:43 +05:30
Fabien Pinckaers 02cc517482 [IMP] useability and dasboards of sale and crm
bzr revid: fp@tinyerp.com-20111211110956-ygyrsdjo2ocq5wxn
2011-12-11 12:09:56 +01:00
Fabien Meghazi b457bcd153 [IMP] Improved some dashboards (add @creatable on actions)
bzr revid: fme@openerp.com-20111208164322-4h7yfmt5zwpwmc2b
2011-12-08 17:43:22 +01:00
Launchpad Translations on behalf of openerp 0199461509 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20111208053607-5eolhazj9nhu05j3
bzr revid: launchpad_translations_on_behalf_of_openerp-20111208060700-nb1yi7ecs4q7932m
2011-12-08 06:07:00 +00:00
Vo Minh Thu 706e732f49 [FIX] sale/mrp: revert previous commit, reestablish the setting of
the property_ids fields (which does not exist yet).

bzr revid: vmt@openerp.com-20111207145854-p334skwo93fy124l
2011-12-07 15:58:54 +01:00
Ujjvala Collins (OpenERP) 186562710b [FIX] sale: Removed print statement.
bzr revid: uco@tinyerp.com-20111207052402-jalzxljhg21lqekn
2011-12-07 10:54:02 +05:30
Vo Minh Thu 4660ee4990 [FIX] clean some warnings.
bzr revid: vmt@openerp.com-20111206105758-j00f9b67jfvp5dxh
2011-12-06 11:57:58 +01:00
Fabien Pinckaers 8e6a398e20 [FIX] select address on SO
bzr revid: fp@tinyerp.com-20111205102729-30rk5kphl1it1xk2
2011-12-05 11:27:29 +01:00
Quentin (OpenERP) cbc1d93ce3 [MERGE] merged the dev branch with formatting of the addresses that depends on the country
bzr revid: qdp-launchpad@openerp.com-20111201164131-8exdiwodwn631zq1
2011-12-01 17:41:31 +01:00
Raphael Collet 4ac4fbceb7 [MERGE] lp:897227 (fix dashboard layout in hr, hr_timesheet_sheet, mrp, project, project_scrum, sale, stock)
bzr revid: rco@openerp.com-20111201161609-wuwqxq6mu8u289w4
2011-12-01 17:16:09 +01:00
Quentin (OpenERP) 645e15577d [IMP] changed the use of display_address function in reports
bzr revid: qdp-launchpad@openerp.com-20111201154505-ps3b3m56dza0vjfl
2011-12-01 16:45:05 +01:00
Quentin (OpenERP) 40037e238f [MERGE] merged with main addons trunk
bzr revid: qdp-launchpad@openerp.com-20111201153857-qq99hs12nubiwzkm
2011-12-01 16:38:57 +01:00
Harry (OpenERP) 54aeedcc34 [FIX] sale: regression in sale_demo.xml
bzr revid: hmo@tinyerp.com-20111201103754-d5ibm2d9t9jx9g2u
2011-12-01 16:07:54 +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
Rucha (Open ERP) 5f11b17a03 [FIX]: sale: Fixed layout of sale manager dashboard
bzr revid: rpa@tinyerp.com-20111201092913-7cvz4ko4p19n0swn
2011-12-01 14:59:13 +05:30
Harry (OpenERP) 8f6511e4f0 [FIX] sale: remove setting of company_id field in sequnece of sale order
bzr revid: hmo@tinyerp.com-20111201082443-5svlv2ukm3gjxakd
2011-12-01 13:54:43 +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
Raphael Collet 04e8ef77dc [MERGE] lp:883927 (sale: add quantity in UoS in sale order lines)
bzr revid: rco@openerp.com-20111130091527-3n2wtmvzx3lwtdtq
2011-11-30 10:15:27 +01:00
Harry (OpenERP) d7ededc964 [MERGE] merged with trunk development main branch
bzr revid: hmo@tinyerp.com-20111130064805-mh0dwijtdlols5z1
2011-11-30 12:18:05 +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
Harry (OpenERP) 68e6dab2c1 [FIX] sale: property_ids field is not extis so remove it on creating procurement
bzr revid: hmo@tinyerp.com-20111129093141-uzmnhf4u4a99p80o
2011-11-29 15:01:41 +05:30
Fabien Pinckaers 5ed9e528d4 [FIX] default values for domain
bzr revid: fp@tinyerp.com-20111125170906-utelua25g25yde8x
2011-11-25 18:09:06 +01:00
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) 0809ef942b [IMP] sale: Removed/Corrected extra lines.
bzr revid: uco@tinyerp.com-20111125105237-uetukp6qx5oqujj2
2011-11-25 16:22:37 +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