Commit Graph

3076 Commits

Author SHA1 Message Date
Amit Patel (OpenERP) 08449aca2c [MERGE]:merged with trunk.
bzr revid: apa@tinyerp.com-20120803051416-omqxsq5dp0meccmu
2012-08-03 10:44:16 +05:30
Antonin Bourguignon a7730a5346 [WIP] continue work on accounting config wizard
bzr revid: abo@openerp.com-20120803002744-0ergip6znzb57gec
2012-08-03 02:27:44 +02:00
Antonin Bourguignon c522d94080 [WIP] continue work on accounting config wizard
bzr revid: abo@openerp.com-20120802153719-7fh9p2qs3f1fxzj5
2012-08-02 17:37:19 +02:00
Stephane Wirtel 5ee6c09b31 [FIX] sale: Change some layouts
bzr revid: stw@openerp.com-20120802145430-ebmecs6ise4h6na0
2012-08-02 16:54:30 +02:00
Stephane Wirtel 7639597d21 [FIX] sale: Don't copy the sale orders when we duplicate a partner
bzr revid: stw@openerp.com-20120802140343-3xv3vkmwov1h52by
2012-08-02 16:03:43 +02:00
Antonin Bourguignon ec5f2fe5d3 [FIX] several typos
rephrase some labels
fix capital letters
add missing spaces (mainly before parentheses)

bzr revid: abo@openerp.com-20120801154701-9jvsd9iyihx5phyn
2012-08-01 17:47:01 +02:00
Amit Patel (OpenERP) ec8761c31a [IMP]:typo
bzr revid: apa@tinyerp.com-20120801122501-r73xrapnob9bn61o
2012-08-01 17:55:01 +05:30
Randhir Mayatra (OpenERP) 3c2b2818e4 [IMP] make changes into the sale wizard
bzr revid: rma@tinyerp.com-20120801101910-hsfmv8xq4tjjtedj
2012-08-01 15:49:10 +05:30
Rucha (Open ERP) 01bea180bb [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120801064738-vcjdjnt3s57i2hgc
2012-08-01 12:17:38 +05:30
pso (OpenERP) 773c2d5c63 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120801064711-y90iik5ialfdnfft
2012-08-01 12:17:11 +05:30
Amit Patel (OpenERP) c5eae6dec7 [MERGE]:merged with trunk
bzr revid: apa@tinyerp.com-20120801054207-8cfqqna4wauzarkb
2012-08-01 11:12:07 +05:30
Launchpad Translations on behalf of openerp e845e2350c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120801044335-2llntxn2tfj8m7yt
bzr revid: launchpad_translations_on_behalf_of_openerp-20120801044411-aoxlecq42a8czbf8
2012-08-01 04:44:11 +00:00
Quentin (OpenERP) e1b50e304d [MEGUEZ] merged the clean search view branch
bzr revid: qdp-launchpad@openerp.com-20120731150358-jqd3eoz06imzlx01
2012-07-31 17:03:58 +02:00
help c5427f3faa [IMP]improved exception warnings as per suggestion
bzr revid: help-20120731124210-7vjw7puesjm3884p
2012-07-31 18:12:10 +05:30
Twinkle Christian (OpenERP) cb1c6c08af [IMP]Improve search view in all modules
bzr revid: tch@tinyerp.com-20120731112804-a0akxtqr1z0uew6w
2012-07-31 16:58:04 +05:30
Sanjay Gohel (Open ERP) 9c63ddb992 [MERGE]merge with trunk
bzr revid: sgo@tinyerp.com-20120731054300-j6ax39hs18svscgz
2012-07-31 11:13:00 +05:30
Fabien Pinckaers d14c62fbe8 [IMP] copywriting summary of modules
bzr revid: fp@openerp.com-20120730132840-bchv2hmp40uqkwvb
2012-07-30 15:28:40 +02:00
vta vta@openerp.com 264d2c3365 [MERGE] Trunk.
bzr revid: vta@openerp.com-20120730123628-49rirhupbwqfzr0r
2012-07-30 14:36:28 +02:00
Rucha (Open ERP) 9be1dc63e5 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120730052105-tjzeohx0hyi43qi4
2012-07-30 10:51:05 +05:30
Fabien Pinckaers 9dec7e4110 [IMP] small change in copywriting of intro messages
bzr revid: fp@openerp.com-20120729044721-m1raabv882heiog8
2012-07-29 06:47:21 +02:00
Launchpad Translations on behalf of openerp 0c581831b8 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120728045741-hrbggtt37yutrbpx
bzr revid: launchpad_translations_on_behalf_of_openerp-20120729043802-x7m56po0nxue0jb0
2012-07-29 04:38:02 +00:00
Rucha (Open ERP) 450c60762c [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120727045438-740vzcigf5phqqej
2012-07-27 10:24:38 +05:30
Rucha (Open ERP) 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
Ajay Chauhan (OpenERP) 0d84cf6755 [IMP]sale : made send buttons red at draft state
bzr revid: cha@tinyerp.com-20120726090125-50nwqvimqgb82lej
2012-07-26 14:31:25 +05:30
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 df723a0b6c [MERGE] from trunk
bzr revid: rco@openerp.com-20120725133932-0cvvngral6nt8ixj
bzr revid: rco@openerp.com-20120725151612-lp3bozy0xb0gjrvp
2012-07-25 17:16:12 +02:00
pso (OpenERP) e5da0e191b [MERGE] Merged with main branch
bzr revid: pso@tinyerp.com-20120725125332-7qe6b3l0fjryast2
2012-07-25 18:23:32 +05:30
Amit Patel (OpenERP) fa012f5f6a [MERGE]
bzr revid: apa@tinyerp.com-20120725112648-920akzwzi7z4leoj
2012-07-25 16:56:48 +05:30
Saurang Suthar(OpenERP) 4c4055a4e0 [IMP] Improved warning messages for Sale module
bzr revid: pso@tinyerp.com-20120725110702-xyoyjt0i3t2nsej8
2012-07-25 16:37:02 +05:30
Stephane Wirtel ac580aeae0 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_devs-stw
bzr revid: stw@openerp.com-20120725105833-3bdcb66bzd9l5pg7
2012-07-25 12:58:33 +02:00
Raphael Collet 187b132fc8 [IMP] crm, sale, accounting: add OpenChatter notification after module installation
bzr revid: rco@openerp.com-20120725102051-0klnt7rka2xxn8i3
2012-07-25 12:20:51 +02:00
Stephane Wirtel b814c3f772 [MERGE] lp:~openerp-dev/openobject-addons/trunk-module_description_review-stw
bzr revid: stw@openerp.com-20120725094848-ztd2t2a79q9xqdnz
2012-07-25 11:48:48 +02:00
Amit Patel (OpenERP) 1e9b9fb769 [MERGE]
bzr revid: apa@tinyerp.com-20120725070355-vxe0ek7d1fq1du97
2012-07-25 12:33:55 +05:30
Amit Patel (OpenERP) 0f46eb3271 [MERGE]:merged reviews comments on pad.
bzr revid: apa@tinyerp.com-20120725070029-cuvogipmd3bwk4vy
2012-07-25 12:30:29 +05:30
Rucha (Open ERP) 953cd056b4 [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120725053226-e67t7qdy472jc3ev
2012-07-25 11:02:26 +05:30
Raphael Collet 612ecc3660 [MERGE] from trunk
bzr revid: rco@openerp.com-20120724151719-ug2xytsf1ih347du
2012-07-24 17:17:19 +02:00
Raphael Collet f0fa9cd2e3 [IMP] sale: turn the sale order lines into an editable list
bzr revid: rco@openerp.com-20120724135814-xubsoe5c7o9g7yp8
2012-07-24 15:58:14 +02:00
Stephane Wirtel 7a2d441c50 [MERGE] lp:~openerp-dev/openobject-addons/trunk-addons_issue_stock-mdi/
bzr revid: stw@openerp.com-20120724134313-p8yimd1j5tinuzbo
2012-07-24 15:43:13 +02:00
Stephane Wirtel 41617e1100 [FIX] sale: Hide the state field on the sale order lines
bzr revid: stw@openerp.com-20120724133858-a38ovfjt6gklbz3t
2012-07-24 15:38:58 +02:00
Foram Katharotiya (OpenERP) 66f6d78432 [IMP] improve Sales Configuration in sale config wizard
bzr revid: fka@tinyerp.com-20120724132652-k0p3psesr0lvrkmw
2012-07-24 18:56:52 +05:30
Raphael Collet 4753bf8d74 [FIX] sale: add field state in the lines of sale order form, for the web client to process modifiers correctly
bzr revid: rco@openerp.com-20120724132309-myn4wcezcqmu40zt
2012-07-24 15:23:09 +02:00
Divyesh Makwana (Open ERP) 28d9a6e28d [IMP] sale : If the user create a new recod, the invoice control should be 'To Be Invoiced' by default (only from this view).
bzr revid: mdi@tinyerp.com-20120724123057-2dwy52a9xmd55515
2012-07-24 18:00:57 +05:30
Divyesh Makwana (Open ERP) 43b8224341 [IMP] sale : Rename 'Partner' into 'Contact'.
bzr revid: mdi@tinyerp.com-20120724120905-t6e8keib9l69kcvx
2012-07-24 17:39:05 +05:30
Stephane Wirtel 9f299d9a20 [MERGE] lp:~openerp-dev/openobject-addons/trunk-review_module_desc-psi
bzr revid: stw@openerp.com-20120724080711-6655pbbfubiau3li
2012-07-24 10:07:11 +02:00
Stephane Wirtel fa0b196382 [MERGE] lp:~openerp-dev/openobject-addons/trunk-tooltip_imp-psi
bzr revid: stw@openerp.com-20120724075723-qdvvhhpfdt1rzvnl
2012-07-24 09:57:23 +02:00
Turkesh Patel (Open ERP) 77f3bdb321 [IMP] improved view in sale.
bzr revid: tpa@tinyerp.com-20120724061615-jk6gi4fe91vhs51l
2012-07-24 11:46:15 +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
Raphael Collet 396f5fdc9e [IMP] sale: merge the actions 'Create Final Invoice' and 'Advance Invoice' into a single wizard
bzr revid: rco@openerp.com-20120723152841-643jvecafb5eqqnm
2012-07-23 17:28:41 +02:00
Raphael Collet 395fa84aa1 [IMP] sale: clean up code to open view on invoices
bzr revid: rco@openerp.com-20120723132538-n2pppeiszt79xutq
2012-07-23 15:25:38 +02:00
Raphael Collet bcb9508f83 [IMP] sale: clean up code for manual invoicing
bzr revid: rco@openerp.com-20120723131453-go0iqxxe6ueqjfil
2012-07-23 15:14:53 +02:00
Twinkle Christian (OpenERP) 8423b4a8d4 [IMP]improved search view of sale module
bzr revid: tch@tinyerp.com-20120723125947-3cmelgf50eqjizhj
2012-07-23 18:29:47 +05:30
Amit Patel (OpenERP) a0c19a8b3c [IMP]:improved config wizard for account
bzr revid: apa@tinyerp.com-20120723111511-v0sc4y146mhqainm
2012-07-23 16:45:11 +05:30
Raphael Collet 57088483e8 [IMP] sale: restrict field properties on sale order lines to a group enabled by settings
bzr revid: rco@openerp.com-20120723102736-9w2yew9j64hsekts
2012-07-23 12:27:36 +02:00
Ajay Chauhan (OpenERP) 3bd4cb5e0e [IMP]sale : make Allow Charging Shipping Costs option always visible
bzr revid: cha@tinyerp.com-20120723100213-vpikgjh2pddn7hwk
2012-07-23 15:32:13 +05:30
Twinkle Christian (OpenERP) e9e8d02f55 [IMP]improved search view of sale module
bzr revid: tch@tinyerp.com-20120723082845-5bvbhq5q93ql1vx2
2012-07-23 13:58:45 +05:30
Amit Patel (OpenERP) 594a4f01e0 [IMP/MERGE]:sale config wizard
bzr revid: apa@tinyerp.com-20120723063455-ab3ci2gm0jfd74an
2012-07-23 12:04:55 +05:30
Amit Patel (OpenERP) 500ab01076 [MERGE]:merged with parent
bzr revid: apa@tinyerp.com-20120723051848-3rmbt5zodc7g2euq
2012-07-23 10:48:48 +05:30
pso (OpenERP) 8be94b1e93 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120722082152-l24vpuuxjb34126g
2012-07-22 13:51:52 +05:30
Launchpad Translations on behalf of openerp 31acc737fa Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20120721050832-zkzeqskzl40kn2b8
2012-07-21 05:08:32 +00:00
Antonin Bourguignon 612e22c12e [MERGE] latest trunk
bzr revid: abo@openerp.com-20120720153558-v2t3ywn5k6iujmy6
2012-07-20 17:35:58 +02:00
Antonin Bourguignon 69806324a6 [FIX] 'Sales' top menu items sequence
bzr revid: abo@openerp.com-20120720153520-gahyk0uj6il3ia0h
2012-07-20 17:35:20 +02:00
Quentin (OpenERP) ebdc4ebb62 [MERGE] label VAT to Tax
bzr revid: qdp-launchpad@openerp.com-20120720151554-fp5t5nsddjyb81jr
2012-07-20 17:15:54 +02:00
Foram Katharotiya (OpenERP) 4511c9180b [IMP] remove extra div
bzr revid: fka@tinyerp.com-20120720120013-pzbjbz02b6qfhxqy
2012-07-20 17:30:13 +05:30
Purnendu Singh (OpenERP) d5ec4a6535 [IMP] update pot files
bzr revid: psi@tinyerp.com-20120720114402-yipigtjmk4j7qk1r
2012-07-20 17:14:02 +05:30
Foram Katharotiya (OpenERP) e031752232 [IMP] remove col in sales config wizard
bzr revid: fka@tinyerp.com-20120720113714-95bck1w2yoazjnu7
2012-07-20 17:07:14 +05:30
Raphael Collet 75abad6a61 [MERGE] trunk-module-summary (add field 'summary' on modules)
bzr revid: rco@openerp.com-20120720100339-sk3mx0qucujeqsxe
2012-07-20 12:03:39 +02:00
Raphael Collet 93f24defa8 [IMP] crm, sale: improve inheritance of partner kanban view
bzr revid: rco@openerp.com-20120720083629-c27ye9ufo3r12n19
2012-07-20 10:36:29 +02:00
Foram Katharotiya (OpenERP) acb9039944 [IMP] remove static string in label & space in sales config wizard
bzr revid: fka@tinyerp.com-20120720065901-5rpoc0gh8z0k2s35
2012-07-20 12:29:01 +05:30
Purnendu Singh (OpenERP) 7a8ac01d31 [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120720061520-fzq1vhfyn88z8q3d
2012-07-20 11:45:20 +05:30
Purnendu Singh (OpenERP) ec27d7e44f [MERGE] merge with main branch
bzr revid: psi@tinyerp.com-20120720061203-c6cpwc7f8uaa939n
2012-07-20 11:42:03 +05:30
Rajesh Prajapati (OpenERP) 0c1dc06331 [MERGE] merge with parent branch
bzr revid: rpr@tinyerp.com-20120720055401-hu537f6dua4px1d3
2012-07-20 11:24:01 +05:30
Rucha (Open ERP) 0145655e8c [MERGE]: Merge with latest trunk-addons
bzr revid: rpa@tinyerp.com-20120720051100-gdofz4jfu3a0ggs9
2012-07-20 10:41:00 +05:30
Amit Patel (OpenERP) bdf735585d [MERGE]:merged with parent
bzr revid: apa@tinyerp.com-20120720050524-n3nv8eqjkqcso43m
2012-07-20 10:35:24 +05:30
Antonin Bourguignon a4fba2145b [MERGE] latest trunk
bzr revid: abo@openerp.com-20120718131530-a90b062c769y0u0e
bzr revid: abo@openerp.com-20120719164208-xj75h0socxc3p6jb
2012-07-19 18:42:08 +02:00
Ajay Chauhan (OpenERP) ba073f6c9c [Merge] Merge with main addons.
bzr revid: cha@tinyerp.com-20120719104628-dpfleilhxcyvevyv
2012-07-19 16:16:28 +05:30
Quentin (OpenERP) 7b8c3788b1 [MERGE] trunk
bzr revid: qdp-launchpad@openerp.com-20120719095420-llgnafgasfcwbwu9
2012-07-19 11:54:20 +02:00
Quentin (OpenERP) e1d6ecb015 [IMP] sale, sale_margin: better name for <group> tag
bzr revid: qdp-launchpad@openerp.com-20120719093414-eqsw86hkj8qunxir
2012-07-19 11:34:14 +02:00
Rucha (Open ERP) 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
pso (OpenERP) 8048661b01 [MERGE] Merge with main branch
bzr revid: pso@tinyerp.com-20120719073136-a7a5t43y2nm51zji
2012-07-19 13:01:36 +05:30
Rajesh Prajapati (OpenERP) 1916eadb89 [IMP]vat to tax : changed the label Tax as its abbreviation
bzr revid: rpr@tinyerp.com-20120719055821-1d6ipvw6i8s0n7uk
2012-07-19 11:28:21 +05:30
Amit Patel (OpenERP) eef123d5b7 [MERGE]:merged with parent branch
bzr revid: apa@tinyerp.com-20120719054045-pb4zp74nlr05qaqt
2012-07-19 11:10:45 +05:30
Rajesh Prajapati (OpenERP) e068ed2663 [IMP]vat to tax : changed the label Vat as its abbreviation
bzr revid: rpr@tinyerp.com-20120719053803-r4p9dhh28h2bysmm
2012-07-19 11:08:03 +05:30
Harry (OpenERP) d5bb4896e7 [MERGE] merged with trunk
bzr revid: hmo@tinyerp.com-20120719052044-qg0skb7tkiut2ipc
2012-07-19 10:50:44 +05:30
Raphael Collet e2e15fe634 [FIX] crm, sale: fix xml missing end tag
bzr revid: rco@openerp.com-20120718142524-7mw10njirqy70tkd
2012-07-18 16:25:24 +02:00
Raphael Collet 5808220f2a [MERGE] trunk-first_10_clicks_sale-rco
bzr revid: rco@openerp.com-20120718141628-56sssoljh57alkhw
2012-07-18 16:16:28 +02:00
Fabien Pinckaers 9dd2bcfe0f merge
bzr revid: fp@tinyerp.com-20120718141501-o55ahr9p4v7ajncp
2012-07-18 16:15:01 +02:00
Raphael Collet 8ac5c9c0ac [IMP] crm, sale: put priorities in inherited views to control the order of buttons
bzr revid: rco@openerp.com-20120718141436-k19c7g3lz5gu2iqo
2012-07-18 16:14:36 +02:00
Raphael Collet 5510ee74b2 [IMP] sale: in customer form, move action 'Quotations and Sales' from contextual menu to button
bzr revid: rco@openerp.com-20120718141112-tdw4vb1c2am6rwl3
2012-07-18 16:11:12 +02:00
Fabien Pinckaers a824028878 [IMP] initial mail message sale
bzr revid: fp@tinyerp.com-20120718140613-3urmqhtng63lc23f
2012-07-18 16:06:13 +02:00
Antonin Bourguignon 391a35389c [IMP] remove deprecated attributes 'icon', 'web_icon' and 'web_icon_hover' from top menu items
bzr revid: abo@openerp.com-20120718131403-6pzpzhhqbxhtub9b
2012-07-18 15:14:03 +02:00
Harry (OpenERP) 83fb36bd6b [MERGE] local branch
bzr revid: hmo@tinyerp.com-20120718105843-af6gmcovoutbvhoz
bzr revid: hmo@tinyerp.com-20120718124332-yp9ycfnd5mp5d53l
2012-07-18 18:13:32 +05:30
Rajesh Prajapati (OpenERP) 74a58c0f15 [IMP]vat to tax : I have changed the label as tax inplace of vat
bzr revid: rpr@tinyerp.com-20120718121821-esupnmy423ukxniz
2012-07-18 17:48:21 +05:30
Ajay Chauhan (OpenERP) 91e97798db [IMP] sale: make only confirm as red button on quotations
bzr revid: cha@tinyerp.com-20120718110501-js1le7i30vxwlwpm
2012-07-18 16:35:01 +05:30
Antonin Bourguignon 78e98fbfd7 [MERGE] latest trunk
bzr revid: abo@openerp.com-20120718103736-8alnc11l9uqaskpl
2012-07-18 12:37:36 +02:00
Antonin Bourguignon c7f4b5ead1 [IMP] format all the top menu items' XML the same way, prefixed by the comment '<- Top menu item -->', making them easier to spot
also fix some identation

bzr revid: abo@openerp.com-20120718103429-98gl4oe0hkmmf35k
2012-07-18 12:34:29 +02:00
niv-openerp 0d1aa39f36 [IMP] cosmetic change in sale order view
bzr revid: nicolas.vanhoren@openerp.com-20120718101809-w0os8ywew5yw6ntq
2012-07-18 12:18:09 +02:00
Antonin Bourguignon 6a2f418bfd [FIX] some wrong ordering sequences in top menus
bzr revid: abo@openerp.com-20120718101112-0i0oc550pd86oepu
2012-07-18 12:11:12 +02:00
Jigar Amin - OpenERP f5a023fd00 [MERGE] lp:openobject-addons
bzr revid: jam@tinyerp.com-20120718083551-f6288gz1ibhqsgns
2012-07-18 14:05:51 +05:30
Twinkle Christian (OpenERP) 9113f5da36 [IMP]improving summary
bzr revid: tch@tinyerp.com-20120718074040-eghe7nrbhq39780y
2012-07-18 13:10:40 +05:30
Harry (OpenERP) 261ea531ca [MERGE] upstream
bzr revid: hmo@tinyerp.com-20120718072511-x9ob9arnuw9dl9pr
2012-07-18 12:55:11 +05:30