Nabin Hait
2e203e53c6
Update fix_reserved_qty_for_sub_contract.py
2018-03-28 10:38:55 +05:30
Shreya Shah
c0201877dd
fixed column fieldnames for translations ( #13406 )
2018-03-27 18:45:42 +05:30
Nabin Hait
9db28ef90d
Minor fix in patch
2018-03-27 16:00:57 +05:30
Zarrar
7f4cd3f5ea
Update Docs for Work Order ( #13403 )
...
* update docs
* rename files, update pngs
* update pngs for timesheet, leftover changes
2018-03-27 14:59:49 +05:30
Nabin Hait
b9c82b9790
Fixed merge conflict
2018-03-27 14:25:27 +05:30
Nabin Hait
745292ce98
Merge branch 'hotfix'
2018-03-27 14:22:28 +05:30
Nabin Hait
00279f27f3
bumped to version 10.1.15
2018-03-27 14:52:27 +06:00
Nabin Hait
f620dae8ca
Null issue fixed in gstr reports
2018-03-27 14:15:36 +05:30
Nabin Hait
9d7fe1f7cd
Indicator fix for stock entry item table
2018-03-27 13:30:11 +05:30
Prateeksha Singh
ffaed1ce2e
Merge pull request #13404 from pratu16x7/variants
...
Enumerate numeric values in variant dialog
2018-03-27 12:18:13 +05:30
Prateeksha Singh
be368fe94b
Enumerate numeric values in variant dialog
2018-03-27 12:17:15 +05:30
Shreya Shah
ba4f32be5c
set default warehouse instead of product bundle's warehouse for packed_items in delivery note ( #13398 )
2018-03-27 11:32:10 +05:30
rohitwaghchaure
85f63a3866
[Fix] Showing to bill even if per deliverd in sales order is 99.9996 ( #13392 )
2018-03-27 11:31:44 +05:30
Shreya Shah
149f7ee875
[Fix] General Ledger Report ( #13374 )
...
* error fix if party_type = student or shareholder
* clear party filter when party_type changes to avoid error throw
* dict with values of party_name in utils.js
* fetch party_name from erpnext.utils.get_party_name
* Update general_ledger.py
2018-03-27 11:29:25 +05:30
rohitwaghchaure
c9a1eb1081
[Fix] Not able to delete row in modal table ( #13377 )
2018-03-27 11:26:43 +05:30
rohitwaghchaure
2e560cb25d
[Fix] Same serial no returned two times ( #13378 )
2018-03-27 11:24:50 +05:30
Nabin Hait
651b612909
Fixed logic for reserved qty for subcontract and production and written a patch ( #13396 )
...
* Fixed logic for reserved qty for subcontract and production and written a patch
* repost reserved qty for filtered bins
2018-03-27 11:24:20 +05:30
Manas Solanki
398eac3f4c
message in the program enrollment tool ( #13393 )
2018-03-27 11:21:47 +05:30
Frappe PR Bot
7db805a031
[Translation] Updated Translations ( #13394 )
2018-03-27 11:21:08 +05:30
Shreya Shah
f3025f1596
operation time in grid view ( #13400 )
2018-03-27 10:34:05 +05:30
Prateeksha Singh
e45f957ad9
Merge pull request #13363 from shreyashah115/timer
...
Timer in Timesheets!
2018-03-27 10:28:50 +05:30
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30
Nabin Hait
0712013960
Merge branch 'hotfix'
2018-03-23 16:05:06 +05:30
Nabin Hait
3fdda7a9b7
bumped to version 10.1.14
2018-03-23 16:35:06 +06:00
Shreya Shah
9bcadf8126
Tax Id in some reports and print formats ( #13373 )
...
* tax-id in sales and purchase registers
* tax-id in general ledger print_format
* tax-id in accounts payable
* tax-id in accounts receivable
2018-03-23 15:04:37 +05:30
rohitwaghchaure
492de67d7b
Added consumed material cost in project ( #13365 )
2018-03-23 15:02:04 +05:30
Nabin Hait
80a9f523d5
Minor fix AR/AP summary report
2018-03-23 13:02:27 +05:30
Shreya
8bb0f05451
added task field
2018-03-23 11:46:45 +05:30
Shreya
7619cd2e14
updated docs for timesheet
2018-03-23 11:41:56 +05:30
Shreya
822ba21f38
codacy fix
2018-03-23 11:41:56 +05:30
Shreya
559011404a
removed timesheet.html, appended it as a helper function
2018-03-23 11:41:56 +05:30
Shreya
5bf24be704
minor fixes
2018-03-23 11:41:56 +05:30
Shreya
8f06266838
all fields editable
2018-03-23 11:41:55 +05:30
Shreya
5714260af4
replaced status with completed checkbox
2018-03-23 11:41:55 +05:30
Shreya
09937f3753
modified timer start button
2018-03-23 11:41:55 +05:30
Shreya
faff9d3bb2
thanks to faris for the css
2018-03-23 11:41:55 +05:30
Shreya
68ec22a90c
moved timer.js to public/js
2018-03-23 11:41:55 +05:30
Shreya
05e516efc4
Start the timer on the basis of time diff between now_time and timestamp
2018-03-23 11:41:55 +05:30
Shreya
7cc288a6db
New activity dialog removed, read only fields editable if no rows found, add a new row on timer start
2018-03-23 11:41:55 +05:30
Shreya
36040ce5f9
new field actual_end_time to record completed time
2018-03-23 11:41:55 +05:30
Shreya
dcce87d4a8
CSS modifications
2018-03-23 11:41:55 +05:30
Shreya
cd140da3ec
new dialog to create activity
2018-03-23 11:41:55 +05:30
Shreya
643528a3b8
added status field
2018-03-23 11:41:55 +05:30
Shreya
8f4e93f104
removed stop button and added a complete button
2018-03-23 11:41:55 +05:30
Shreya
eeaba29e5b
read only fields project and hours
2018-03-23 11:41:55 +05:30
Shreya
6a1bf70627
alert sound when timer exceeds the given hours
2018-03-23 11:41:55 +05:30
Shreya
1cfd28d50d
timer in timesheet
2018-03-23 11:41:55 +05:30
Faris Ansari
35397a1033
Salary Register ( #13367 )
...
- convert date range to from_date and to_date
2018-03-22 15:26:45 +05:30
Nabin Hait
e3f0412570
Pass doc while autonaming item
2018-03-22 12:13:21 +05:30
rohitwaghchaure
6a2d073fe1
Merge pull request #13353 from PawanMeh/fixes_13352
...
Add total qty to offline POS
2018-03-22 11:36:32 +05:30
