Nabin Hait
|
54361e8651
|
fixed conflict while merging develop into v5
|
2014-12-31 13:24:36 +05:30 |
|
Pratik Vyas
|
b02788b915
|
Merge branch 'develop'
|
2014-12-31 12:41:14 +05:30 |
|
Pratik Vyas
|
b094ee45d7
|
bumped to version 4.15.4
|
2014-12-31 13:11:14 +06:00 |
|
Nabin Hait
|
de0c87757a
|
Merge pull request #2539 from nabinhait/fix1
item validation in bom
|
2014-12-31 12:37:38 +05:30 |
|
Nabin Hait
|
5604f987f2
|
item validation in bom
|
2014-12-31 12:37:11 +05:30 |
|
Nabin Hait
|
a4e547d71d
|
minor fix
|
2014-12-31 12:08:13 +05:30 |
|
Nabin Hait
|
9d14f0f36a
|
Merge pull request #2538 from nabinhait/fix1
set missing cost center using default
|
2014-12-30 18:35:14 +05:30 |
|
Nabin Hait
|
a74468b353
|
set missing cost center using default
|
2014-12-30 18:33:52 +05:30 |
|
Nabin Hait
|
35f81b24f1
|
Merge pull request #2537 from nabinhait/fix1
focus on barcode field after adding a row
|
2014-12-30 17:53:58 +05:30 |
|
Nabin Hait
|
40431cbf89
|
focus on barcode field after adding a row
|
2014-12-30 17:53:16 +05:30 |
|
Nabin Hait
|
5529f14aaf
|
Merge pull request #2536 from nabinhait/fix1
Fixes in Stock Analytics
|
2014-12-30 16:35:57 +05:30 |
|
Nabin Hait
|
54c31b498b
|
Fixes in Stock Analytics
|
2014-12-30 16:33:07 +05:30 |
|
Nabin Hait
|
899dba9022
|
Merge pull request #2535 from nabinhait/fix1
always calculate taxes and totals onchange of exchange rate
|
2014-12-30 15:41:22 +05:30 |
|
Nabin Hait
|
7d8fa8089a
|
always calculate taxes and totals onchange of exchange rate
|
2014-12-30 15:35:59 +05:30 |
|
Pratik Vyas
|
ac86c5b6d1
|
Merge branch 'develop'
|
2014-12-28 16:59:08 +05:30 |
|
Pratik Vyas
|
ecc3f312b9
|
bumped to version 4.15.3
|
2014-12-28 17:29:08 +06:00 |
|
Nabin Hait
|
dd38a266b8
|
Removed tname and fname from code
|
2014-12-26 13:15:21 +05:30 |
|
Nabin Hait
|
79f091e2fe
|
field renaming
|
2014-12-26 11:41:15 +05:30 |
|
Nabin Hait
|
b65b5f43a7
|
Merge pull request #2530 from nabinhait/fix1
exchange_rate no_copy fix
|
2014-12-26 11:00:03 +05:30 |
|
Nabin Hait
|
c3270d7504
|
exchange_rate no_copy fix
|
2014-12-26 10:58:58 +05:30 |
|
Nabin Hait
|
4b8185db19
|
renaming: entries
|
2014-12-25 18:19:39 +05:30 |
|
Nabin Hait
|
23d2a53017
|
Code replacement for journal voucher renaming
|
2014-12-25 17:14:18 +05:30 |
|
Nabin Hait
|
e7d153624f
|
Table Field Renaming: code replace, JV and budget distribution renamed
|
2014-12-25 16:01:55 +05:30 |
|
Nabin Hait
|
d8f4984d71
|
Table fieldnames renaming: updated json and patch
|
2014-12-24 17:04:48 +05:30 |
|
Nabin Hait
|
2eed5a35e3
|
fixed capacilty planning patch
|
2014-12-24 10:41:55 +05:30 |
|
Pratik Vyas
|
ea909ace01
|
Merge branch 'develop'
|
2014-12-23 19:11:08 +05:30 |
|
Pratik Vyas
|
f64d11da3c
|
bumped to version 4.15.2
|
2014-12-23 19:41:08 +06:00 |
|
Nabin Hait
|
0741ed3a82
|
Merge pull request #2472 from neilLasrado/expense-claim
New feature for issue #2419
|
2014-12-23 18:07:38 +05:30 |
|
Nabin Hait
|
57595cf73b
|
fixed merge conflict
|
2014-12-23 18:05:13 +05:30 |
|
Neil Trini Lasrado
|
31a92bd9d9
|
company wise letter head feature added
|
2014-12-23 17:52:41 +05:30 |
|
Nabin Hait
|
b0b7e7fdf8
|
Merge pull request #2497 from neilLasrado/batch-redesign
batch redesigned
|
2014-12-23 17:44:41 +05:30 |
|
Nabin Hait
|
95225be93d
|
Merge pull request #2509 from pdvyas/fix-patches
add reload_doc in a few patches
|
2014-12-23 17:43:52 +05:30 |
|
Nabin Hait
|
496dfc4bbf
|
Merge branch 'neil_capacity_planning' into v5.0
|
2014-12-23 17:40:46 +05:30 |
|
Nabin Hait
|
89c52eacc7
|
Actual operation cost in stock entry, fixed cost removed from bom and workstation
|
2014-12-23 17:39:00 +05:30 |
|
Nabin Hait
|
0de6256bcc
|
time log and workstations
|
2014-12-23 17:39:00 +05:30 |
|
Nabin Hait
|
0f4350dd61
|
capacity planning fixes and cleanup
|
2014-12-23 17:39:00 +05:30 |
|
Nabin Hait
|
1fa7171bfa
|
minor fixes
|
2014-12-23 17:38:59 +05:30 |
|
Neil Trini Lasrado
|
41781ce686
|
test case fix - holiday list
|
2014-12-23 17:38:59 +05:30 |
|
Neil Trini Lasrado
|
9712e7dad4
|
holiday logic removed
|
2014-12-23 17:38:59 +05:30 |
|
Neil Trini Lasrado
|
e84fa67f30
|
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
|
2014-12-23 17:38:59 +05:30 |
|
Neil Trini Lasrado
|
5ec7542519
|
Holiday List name changed and workstation filter added to time log
|
2014-12-23 17:38:59 +05:30 |
|
Neil Trini Lasrado
|
812cd8a8ce
|
Prod Order Form Modified
|
2014-12-23 17:38:59 +05:30 |
|
Neil Trini Lasrado
|
637d804abd
|
Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log
|
2014-12-23 17:38:59 +05:30 |
|
Nabin Hait
|
e5d169b8d2
|
Merge pull request #2521 from nabinhait/fix1
fixed negative batch wty message
|
2014-12-23 11:26:04 +05:30 |
|
Nabin Hait
|
da4e3fb366
|
fixed negative batch wty message
|
2014-12-23 10:58:01 +05:30 |
|
Nabin Hait
|
13ce150149
|
Merge pull request #2520 from nabinhait/fix1
minor fix no-copy
|
2014-12-22 15:07:28 +05:30 |
|
Nabin Hait
|
a04489a72b
|
minor fix no-copy
|
2014-12-22 14:58:36 +05:30 |
|
Pratik Vyas
|
35cd88b09b
|
Merge branch 'develop'
|
2014-12-22 11:17:45 +05:30 |
|
Pratik Vyas
|
ff56566506
|
bumped to version 4.15.1
|
2014-12-22 11:47:45 +06:00 |
|
Nabin Hait
|
01ad94bfad
|
Merge pull request #2519 from nabinhait/fix1
Dont reset pricing if ignore pricing rule
|
2014-12-22 11:16:02 +05:30 |
|