Commit Graph
26843 Commits
Author SHA1 Message Date
Jay Vora (OpenERP) cacca76c57 [MERGE] Merged Anup's branch for the fix of invoice created for analyric lines(case 5267). This also covers the fix for the bug lp:728092. Pricelist calculation corrected
lp bug: https://launchpad.net/bugs/728092 fixed

bzr revid: jvo@tinyerp.com-20110421074529-7p3ts8v1w285jzmg
2011-04-21 13:15:29 +05:30
Jay Vora (OpenERP) 9475e57d2a [MERGE] Merged Chs' branch for the fix of Account : Web client sends values of M2M fields in tuple so converting to list.(Ref : 4346,5340)
bzr revid: jvo@tinyerp.com-20110420122823-92ti1pvc02dytixo
2011-04-20 17:58:23 +05:30
Launchpad Translations on behalf of openerp dbdaa8185c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110420055725-hcqozx8j6xaa10zx
2011-04-20 05:57:25 +00:00
Jay Vora (OpenERP) 3cfa04f2c2 [Merge] Merged main branch
bzr revid: jvo@tinyerp.com-20110419085238-cesfw8091uc6wnfl
2011-04-19 14:22:38 +05:30
Jay Vora (OpenERP) 95fcd2cb99 [Merge] Merged Anup's branch for the fix of bug lp:725908
bzr revid: jvo@tinyerp.com-20110419084200-c75ujuzk28ltqig4
2011-04-19 14:12:00 +05:30
Anup (OpenERP) 58a9ccd223 [FIX] product,hr_timesheet_invoice : Invoicing analytic lines(timesheet lines) were calculating wrong prices for product (Support SaaS Case : 5267)
bzr revid: ach@tinyerp.com-20110419073135-az6tvqgfbepkr94c
2011-04-19 13:01:35 +05:30
Launchpad Translations on behalf of openerp 35e60ce67e Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110419062126-0ye7hrss0z2nwq08
2011-04-19 06:21:26 +00:00
Anup (OpenERP) 739992f9c3 [FIX] stock : Optimized the code to Import Inventory
lp bug: https://launchpad.net/bugs/725908 fixed

bzr revid: ach@tinyerp.com-20110418073110-acrvwbus2q9kp09u
2011-04-18 13:01:10 +05:30
Launchpad Translations on behalf of openerp 45d4391258 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110418062630-eth2g6msxzxkqvjw
2011-04-18 06:26:30 +00:00
Jay Vora (OpenERP) 6295e90e61 [Merge] Merged the branch for the fix of lp:722538
bzr revid: jvo@tinyerp.com-20110418051322-np0gnhijidsgvmzd
2011-04-18 10:43:22 +05:30
Launchpad Translations on behalf of openerp fb32f55849 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110416065239-g3irbzfx16z2npex
bzr revid: launchpad_translations_on_behalf_of_openerp-20110417061331-ca79vijfetbbvsf4
2011-04-17 06:13:31 +00:00
Jay Vora (OpenERP) b9c691bbe8 [Merge] Merged Tejas' branch for the fix of lp:753133
bzr revid: jvo@tinyerp.com-20110415105845-j0xkgk0r2vsljqfb
2011-04-15 16:28:45 +05:30
Tejas (OpenERP) 2afc6025ad FIX : Unwanted address_ids removed
bzr revid: tta@openerp.com-20110415105141-eq2lt4akpgr3dwi3
2011-04-15 16:21:41 +05:30
Jay Vora (OpenERP) 26e9cac96e [MERGE] Merged Tejas' branch for the fix of case 5235
bzr revid: jvo@tinyerp.com-20110415091100-w2m7kubjcbgt0ujx
2011-04-15 14:41:00 +05:30
Launchpad Translations on behalf of openerp aa8b62f489 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110415070745-6rqdci3o0g8qbti0
2011-04-15 07:07:45 +00:00
Tejas (OpenERP) 3bccbb1c12 FIX : sale_margin, wrong invoice type was set , improved the code
bzr revid: tta@openerp.com-20110414111033-22q08b79c7fvmyvb
2011-04-14 16:40:33 +05:30
Jay Vora (OpenERP) 7a45ce9e6c [MERGE] Merged the branch for the fix of case 4527
bzr revid: jvo@tinyerp.com-20110413182646-3burollg44tu2etv
2011-04-13 23:56:46 +05:30
Jay Vora (OpenERP) bbab47537b [MERGE] Merged Anup's branch for the fix of case 4477
bzr revid: jvo@tinyerp.com-20110413181942-l1kzazmi9ozwac6y
2011-04-13 23:49:42 +05:30
Jay Vora (OpenERP) a167a69b08 [MERGE] Merged Anup's branch for the fix of case 4577
bzr revid: jvo@tinyerp.com-20110413181357-ch6lte7zrhmcjr9m
2011-04-13 23:43:57 +05:30
Rifakat bf93263cc3 [FIX] Product : Corrected the calculation of pricelist when the option is 'Partner section of the product form'
lp bug: https://launchpad.net/bugs/727162 fixed

bzr revid: jvo@tinyerp.com-20110413175903-k4h01lsy3aki3ytd
2011-04-13 23:29:03 +05:30
Launchpad Translations on behalf of openerp 6018177045 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110413143524-owego0eo9vok9zo6
2011-04-13 14:35:24 +00:00
Tejas (OpenERP) ffd8f8a664 FIX : model defaults : address_id , right model now seted
bzr revid: tta@openerp.com-20110413105224-4p697u2xxss9c65y
2011-04-13 16:22:24 +05:30
Jay Vora (OpenERP) 4e398f318a [MERGE] Merged Rucha's branch for the fix of lp:747379
bzr revid: jvo@tinyerp.com-20110413074200-nqhbm0p9a7yzqxz3
2011-04-13 13:12:00 +05:30
Launchpad Translations on behalf of openerp 44a0b9f3e7 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110412060715-msjjx45cvs3v0178
2011-04-12 06:07:15 +00:00
Jay Vora (OpenERP) 4cb9ae905a [MERGE] Merged the branch for the fix of lp:710521
bzr revid: jvo@tinyerp.com-20110411182229-j4w3d46c7tfsr25g
2011-04-11 23:52:29 +05:30
Jay Vora (OpenERP) 2fe8efd428 [FIX] Stock : System should not create duplicate moves while processing with chained locations
lp bug: https://launchpad.net/bugs/722538 fixed

bzr revid: jvo@tinyerp.com-20110411102952-9lhk38kshrp8ha2p
2011-04-11 15:59:52 +05:30
Olivier Dony c8e48449b3 [FIX] orm.read_group: fix group_by for date[time]s, currently showing duplicate groups
bzr revid: odo@openerp.com-20110411100847-va4ok35jx3tohor6
2011-04-11 12:08:47 +02:00
Launchpad Translations on behalf of openerp 326fc1420b Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110411054240-glbtpl72fmw06spz
bzr revid: launchpad_translations_on_behalf_of_openerp-20110409061637-9s5h5adu95tabmbp
bzr revid: launchpad_translations_on_behalf_of_openerp-20110410060107-yhr6iuxpvirpqo8l
bzr revid: launchpad_translations_on_behalf_of_openerp-20110411054315-0ka0kjfhsys3iuf4
2011-04-11 05:43:15 +00:00
Jay Vora (OpenERP) 4a5f76f7e6 [FIX] Product : Correcter pricelist calculation if base price set to 0
lp bug: https://launchpad.net/bugs/710521 fixed

bzr revid: jvo@tinyerp.com-20110408140130-uc06lphwpp5xnd04
2011-04-08 19:31:30 +05:30
Rucha (Open ERP) f7ee4987fc [FIX]: stock: Fixed wrong qty in stock move(posted inventory) when confirming inventory for the products which have earlier moves with production lot and we use the same prodlot
lp bug: https://launchpad.net/bugs/747379 fixed

bzr revid: rpa@tinyerp.com-20110408133212-zh6k36mgfexh6j0i
2011-04-08 19:02:12 +05:30
Vo Minh Thu b5c64bb06f [MERGE] fix shebang and executable bit of some files.
bzr revid: vmt@openerp.com-20110408120111-4cgbnkx2b2gpy5o0
2011-04-08 14:01:11 +02:00
Vo Minh Thu 71a31da4b5 [MERGE] merged changes to set correct executable bit and shebangs.
bzr revid: vmt@openerp.com-20110408114721-sfqd0a337lmt8bld
2011-04-08 13:47:21 +02:00
P. Christeas 9e44cd5bfe all: Fix execute permission and shebang at files
Non-standalone python scripts shall not have a shebang. Others will need
to be executable.
(cherry picked from commit 6ec513d17cafcdd235b4805363d3cd6daa494f2f)

bzr revid: p_christ@hol.gr-20110408112324-nc781po7efhjye21
2011-04-08 14:23:24 +03:00
P. Christeas 3fcd4d6112 bin: non-scripts must be -x, scripts +x
This should solve the corresponding rpmlint errors. Python files with a
shebang must be executable. Non-standalone python shall not have a shebang.
(cherry picked from commit d44bd2dcc03a75864cae7c93020537ac573999fe)

bzr revid: p_christ@hol.gr-20110408102058-mt1xaka350dwm32x
2011-04-08 13:20:58 +03:00
Launchpad Translations on behalf of openerp a0507fe0db Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110408061309-vdc4fos4jns3upnx
2011-04-08 06:13:09 +00:00
Launchpad Translations on behalf of openerp 2b369e9ae2 Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407055442-dotyi6bfnw93g9da
bzr revid: launchpad_translations_on_behalf_of_openerp-20110408061243-1m5svyo5s9ect6av
2011-04-08 06:12:43 +00:00
Jay Vora (OpenERP) c60c6e8e02 [MERGE] Merged Tejas' branch for the fix of invoice analysis query (Ref : Cases 4963,5061)
bzr revid: jvo@tinyerp.com-20110407123434-83g73rhtcn84979z
2011-04-07 18:04:34 +05:30
Jay Vora (OpenERP) 3b75f9a266 [MERGE] Merged Tejas' branch for the fix of invoice analysis query (Ref : Cases 4963,5061
bzr revid: jvo@tinyerp.com-20110407122955-oa38ldo2abtfxbr4
2011-04-07 17:59:55 +05:30
Tejas (OpenERP) 787f38b5c5 FIX : Account Invoice Report, append active and limit 1 with subquery
bzr revid: tta@openerp.com-20110407115220-f1qp273vl3gpa6ke
2011-04-07 17:22:20 +05:30
Launchpad Translations on behalf of openerp ce937912ce Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110406060228-pyb9f2qgl1betbp2
bzr revid: launchpad_translations_on_behalf_of_openerp-20110407055457-2bu9my2e5ltros01
2011-04-07 05:54:57 +00:00
Olivier Dony 3ea48a453d [FIX]: evaluate one2many domains instead of using them as string.
lp bug: https://launchpad.net/bugs/715654 fixed

bzr revid: vmt@openerp.com-20110406150525-hnmq4wsfbmfwgxpl
2011-04-06 17:05:25 +02:00
Anup (OpenERP) 41b4258975 [FIX] stock : Fill Inventory Wizard should import production lot too. (Courtsey KSA(OpenERP))
lp bug: https://launchpad.net/bugs/725908 fixed

bzr revid: ach@tinyerp.com-20110406114529-7icmcd44va27tlwm
2011-04-06 17:15:29 +05:30
Vo Minh Thu 86bc2a6451 [MERGE] merge bug fix
- original commit message:
  [FIX] ir_ui_view.py: get_sc only returns shortcuts for existing menu items.

lp bug: https://launchpad.net/bugs/727730 fixed

bzr revid: vmt@openerp.com-20110406103157-9esivptxihgx0l64
2011-04-06 12:31:57 +02:00
Vo Minh Thu b1ffebe9a2 [FIX] ir_ui_view.py: get_sc only returns shortcuts for existing menu items.
lp bug: https://launchpad.net/bugs/727730 fixed

bzr revid: vmt@openerp.com-20110406100507-8t9bs4k31hz4n4ru
2011-04-06 12:05:07 +02:00
Vo Minh Thu 7f7e7714b4 [FIX] setup.py: added python25-compat directory to the MANIFEST.
bzr revid: vmt@openerp.com-20110406075757-6ihe21vyadpvguks
2011-04-06 09:57:57 +02:00
Vo Minh Thu b4146f0624 [FIX] debian: corrected version in changelog.
lp bug: https://launchpad.net/bugs/751062 fixed

bzr revid: al@openerp.com-20110406073416-tvi7ah0i9g1ue6qe
2011-04-06 09:34:16 +02:00
Launchpad Translations on behalf of openerp 9edd27860c Launchpad automatic translations update.
bzr revid: launchpad_translations_on_behalf_of_openerp-20110405060613-znuiqfpohhkrrz6m
bzr revid: launchpad_translations_on_behalf_of_openerp-20110406060153-tore9cn05qw7ill1
2011-04-06 06:01:53 +00:00
Vo Minh Thu 8d409fc136 [FIX] report_webkit: forgot to remove the import of commands.
bzr revid: vmt@openerp.com-20110405105100-rzzheoaahr44jn8k
2011-04-05 12:51:00 +02:00
Vo Minh Thu 145c549ed2 [MERGE] merged branch 6.0-bug-704870-vmt
lp bug: https://launchpad.net/bugs/704870 fixed

bzr revid: vmt@openerp.com-20110405104459-4j48v3vbaa6w1d1a
2011-04-05 12:44:59 +02:00
Vo Minh Thu e5ad1f96a5 [MERGE] merged 6.0 branch.
bzr revid: vmt@openerp.com-20110405104238-otow54mxyek4vp1m
2011-04-05 12:42:38 +02:00