Commit Graph

10795 Commits

Author SHA1 Message Date
Nabin Hait
a1bf43b1a6 Merged develop into v5 2015-03-17 10:50:47 +05:30
Nabin Hait
d3fd8965de test case fixed 2015-03-17 10:15:19 +05:30
Pratik Vyas
7b4b31fdf7 Merge branch 'develop' 2015-03-16 21:38:30 +05:30
Pratik Vyas
ec25117ab0 bumped to version 4.24.1 2015-03-16 22:08:30 +06:00
Nabin Hait
dfa013e73f Merge pull request #2962 from nabinhait/develop
manipulate_grand_total_for_inclusive_tax
2015-03-16 17:54:54 +05:30
Anand Doshi
5b73da99d6 [minor] fixed patch 2015-03-16 17:10:28 +05:30
Nabin Hait
f2791f8898 manipulate_grand_total_for_inclusive_tax 2015-03-16 17:01:09 +05:30
Nabin Hait
66773229a4 Merge pull request #2958 from anandpdoshi/anand-mar-13
manipulate grand total for inclusive tax
2015-03-16 15:58:23 +05:30
Anand Doshi
ead48094b6 manipulate diff only if diff <= 0.02 2015-03-13 18:59:01 +05:30
Anand Doshi
d6822ddd7c manipulate grand total for inclusive tax 2015-03-13 18:23:10 +05:30
Anand Doshi
9d9e31f4e8 moved get_list_context to module 2015-03-13 12:48:05 +05:30
Pratik Vyas
2e5be6f994 Merge pull request #2955 from neilLasrado/v5.0
patch rename
2015-03-13 11:46:14 +05:30
Neil Trini Lasrado
14543169b4 patch rename 2015-03-13 11:43:52 +05:30
Nabin Hait
7c9d003917 Test case cleanup and fixes 2015-03-13 08:14:46 +05:30
Nabin Hait
c8c1d1c693 Test case fixes 2015-03-13 08:14:45 +05:30
Nabin Hait
15e4833785 Merge pull request #2943 from neilLasrado/time-log
bug fix - show time log in production order operations
2015-03-12 17:53:16 +05:30
Nabin Hait
53ea6fa686 Merge pull request #2944 from neilLasrado/po
fixes in Production Order
2015-03-12 17:52:59 +05:30
Nabin Hait
382d21fa3c Merge pull request #2952 from neilLasrado/sales-person
validation added to check if multiple sales person have been given the s...
2015-03-12 17:52:40 +05:30
Neil Trini Lasrado
76d3a6c2ba bug fix - show time log in production order operations 2015-03-12 17:51:50 +05:30
Neil Trini Lasrado
6f272f2f53 fixes in Production Order 2015-03-12 17:51:06 +05:30
Neil Trini Lasrado
c6dfb02e4a mend 2015-03-12 16:15:36 +05:30
Neil Trini Lasrado
e7044fa0f6 validation added to check if multiple sales person have been given the same employee id 2015-03-12 16:15:03 +05:30
Nabin Hait
1ca0b74e03 Merge pull request #2945 from neilLasrado/workstation
warehouse removed from workstation master
2015-03-12 16:13:47 +05:30
Nabin Hait
9ac71c0b17 Merge pull request #2935 from neilLasrado/po-fix
Bug fixes in Production Order
2015-03-12 16:07:21 +05:30
Nabin Hait
4944fb33ce Merge pull request #2942 from sbktechnology/develop
Added Actual Batch Qty for item in DN & SI
2015-03-11 10:22:47 +05:30
Anand Doshi
838ba02d34 setup wizard image fix 2015-03-10 19:15:49 +05:30
Sambhaji Kolate
845f1c636e code cleanup 2015-03-10 15:19:29 +05:30
Neil Trini Lasrado
2c25a4396f warehouse removed from workstation master 2015-03-10 15:15:54 +05:30
Sambhaji Kolate
98dbccd1d6 added actual_batch_qty at warehouse in DN & SI #1873 2015-03-10 15:04:28 +05:30
Pratik Vyas
7346ff3d08 Merge branch 'develop' 2015-03-10 10:41:35 +05:30
Pratik Vyas
21761c204c bumped to version 4.24.0 2015-03-10 11:11:35 +06:00
Nabin Hait
87f3ba139e Merge pull request #2936 from nabinhait/develop
Repost reserved qty and sle for sales invoice without warehouse
2015-03-09 18:50:46 +05:30
Nabin Hait
11498cac94 Repost sle for si without warehouse 2015-03-09 18:28:35 +05:30
Nabin Hait
7a31f6aaca repost reserved qty if negative 2015-03-09 16:31:11 +05:30
Rushabh Mehta
f5f0d5a83a [breadcrumbs] refactor 2015-03-09 15:48:16 +05:30
Anand Doshi
ecd2e0f386 Setup Wizard: catch duplicate entry error 2015-03-09 15:42:52 +05:30
Neil Trini Lasrado
42556dfab9 fixes-in-production-order 2015-03-09 15:35:24 +05:30
Nabin Hait
7d5a2390dd Merge pull request #2934 from nabinhait/develop
Pricing Rule Issue
2015-03-09 15:31:37 +05:30
Nabin Hait
081c3ec476 c-form message issue 2015-03-09 15:11:34 +05:30
Nabin Hait
e2f054cc27 transaction date issue in pricing rule fixed 2015-03-09 14:54:37 +05:30
Pratik Vyas
6fbb25bf9d update translations 2015-03-08 21:29:59 +05:30
Anand Doshi
c0eb8c0de3 Fixed some Stock Entry test cases 2015-03-08 12:42:18 +05:30
Anand Doshi
1119fb4c00 Fixed Sales Invoice test cases 2015-03-06 20:50:51 +05:30
Anand Doshi
e514323be4 load all js and css like before in desk.html 2015-03-06 13:17:26 +05:30
Anand Doshi
ec5ec60764 Fixed Test Cases 2015-03-05 19:31:40 +05:30
Rushabh Mehta
06a6bcce17 [fixes] pos, chart of accounts 2015-03-05 16:38:43 +05:30
Rushabh Mehta
c4dce99f4b [fixes] pos #2830, #2795 2015-03-05 15:09:04 +05:30
Rushabh Mehta
b888359b45 Merge pull request #2886 from neilLasrado/bom_test_records
text records fixed in bom
2015-03-05 10:57:33 +05:30
Nabin Hait
b50833a1e8 Fields alignment 2015-03-04 16:14:02 +05:30
Nabin Hait
95ff2d4fed discount loss adjustment in base currency 2015-03-04 16:02:21 +05:30