Commit Graph

21953 Commits

Author SHA1 Message Date
Deepesh Garg
63f1eded95 fix: Datatype fix for balance in account currency (#17314) 2019-04-20 20:41:17 +05:30
sahil28297
6e63de447a Merge pull request #17247 from frappe/revert-17227-v10_site_sync
Revert "feat(site_sync): return erpnext data"
2019-04-16 13:23:48 +05:30
sahil28297
d7ae52cd49 Revert "feat(site_sync): return erpnext data" 2019-04-16 13:23:16 +05:30
Nabin Hait
57646ec7de Merge pull request #17240 from hrwX/delivery_note_fix
fix(Delivery Note): Show get items even if note has been amended
2019-04-16 13:21:30 +05:30
Himanshu
d492db4ccb fix: let user delete the elements of items 2019-04-16 13:16:19 +05:30
Nabin Hait
16651241e8 Merge pull request #17227 from sahil28297/v10_site_sync
feat(site_sync): return erpnext data
2019-04-16 12:43:15 +05:30
Himanshu Warekar
e87e6d07ba fix: show get items even if note has been amended 2019-04-16 11:43:25 +05:30
Sahil Khan
a75973e9e5 feat(site_sync): return erpnext data 2019-04-14 18:45:31 +05:30
Nabin Hait
e012e2207a Merge pull request #17103 from hrwX/hsn_v10
fix(India): HSN Code
2019-04-05 15:52:01 +05:30
Himanshu Warekar
b7e0ae68ca fix: run gst patch 2019-04-04 11:17:15 +05:30
Himanshu Warekar
0e971f5088 Merge branch 'v10.x.x' of https://github.com/frappe/erpnext into hsn_v10 2019-04-04 11:16:44 +05:30
Nabin Hait
79936fa949 map supplier warehouse from PR to PI 2019-04-01 21:50:20 +05:30
Himanshu Warekar
203a712071 fix(India): HSN Code 2019-04-01 20:03:13 +05:30
Himanshu
c4bdefe666 fix(Leave Balance Report): return correct total number of leaves (#17009)
* fix: return correct total nuber of leaves

* Use ORM for query
2019-03-26 17:00:20 +05:30
Sagar Vora
898977bda8 Merge branch 'hotfix' v10.1.81 2019-01-29 17:10:19 +05:30
Sagar Vora
b32d9458b5 bumped to version 10.1.81 2019-01-29 17:30:19 +05:50
Nabin Hait
25cb13c0f8 Merge pull request #16508 from navdeepghai1/salary-slip-net-pay-fixes
fix(human resources): gross pay calculation issue
2019-01-29 12:08:11 +05:30
Nabin Hait
1c5d681f65 Merge pull request #16500 from scmmishra/v10-remove-docs
feat: [v10] Deprecate In App Help
2019-01-29 11:05:25 +05:30
Nabin Hait
8fae0b3017 Merge pull request #16242 from rohitwaghchaure/is_fixed_asset_checkbox_not_copied
[Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice
2019-01-29 11:03:44 +05:30
Nabin Hait
57928a5382 Merge pull request #16468 from sagarvora/fix-scorecard
fix(buying): make supplier scorecard usable
2019-01-29 11:00:18 +05:30
Nabin Hait
b44b200e7c Merge branch 'hotfix' into fix-scorecard 2019-01-29 11:00:07 +05:30
Aditya Hase
9acb885e60 fix(sqli): Avoid SQL Injection with sender param (#16509) 2019-01-29 10:52:37 +05:30
Navdeep Ghai
ec570026e1 Merge branch 'hotfix' into salary-slip-net-pay-fixes 2019-01-29 09:12:37 +04:00
Nabin Hait
385e3bb284 Merge pull request #16446 from Zlash65/jv-fix
fix(accounts): wrong filters sent to fetch reference name in Journal Entry
2019-01-29 10:41:15 +05:30
navdeepghai1
92bb84aa70 Changed static precision(2) value to system setting currency_precision value 2019-01-28 16:54:58 +04:00
Sagar Vora
a1a946fcd6 Merge branch 'hotfix' into fix-scorecard 2019-01-28 12:20:55 +05:30
navdeepghai1
aac404a155 Fixed net_pay calculation issue 2019-01-28 10:42:16 +04:00
scmmishra
1b63fa1920 [fix] Formatting issues 2019-01-25 20:45:04 +05:30
scmmishra
e1f5d22a02 [fix] Code formatting, removed trailing spaces 2019-01-25 20:45:04 +05:30
scmmishra
000e216354 [feat] Added docsUrl variable to configure help_links 2019-01-25 20:44:45 +05:30
scmmishra
0be2aa33ac [fix] Links now redirect to erpnext.com 2019-01-25 20:41:54 +05:30
scmmishra
c6c1628c8a [feat] Modified help config 2019-01-25 20:41:54 +05:30
Nabin Hait
50e552321b Merge pull request #16363 from scmmishra/leave-application-naming
fix: Naming series not reflecting in leave application
2019-01-25 10:34:01 +05:30
Sagar Vora
e9778d9556 fix: do not use built-in "input", reload_doc 2019-01-23 17:13:31 +05:30
Sagar Vora
f51661b225 fix: allow operators, make weighting_function mandatory 2019-01-23 16:42:28 +05:30
Sagar Vora
9aeabce3d3 fix: trailing whitespace, duplication & more 2019-01-23 16:01:19 +05:30
Sagar Vora
57d7c837aa fix: supplier scorecard test 2019-01-23 14:26:35 +05:30
Sagar Vora
fb256d68ff Merge branch 'fix-supplier-scorecard' of /home/snv/Work/master_bench/apps/erpnext into fix-scorecard 2019-01-23 14:13:40 +05:30
Sagar Vora
037d0f8ba6 fix(buying): make supplier scorecard usable 2019-01-23 14:11:25 +05:30
Frappe Bot
d801437f5f Merge branch 'hotfix' v10.1.80 2019-01-23 08:08:53 +00:00
Frappe Bot
342854f6f2 bumped to version 10.1.80 2019-01-23 08:08:53 +00:00
Nabin Hait
06607fda4e fix: removed print statement 2019-01-23 12:15:48 +05:30
Nabin Hait
141c543f97 Update journal_entry.js 2019-01-23 12:14:55 +05:30
Aditya Hase
819a16d0f5 fix(dead-code): Remove .py files (#16462) 2019-01-23 07:57:08 +05:30
FinByz Tech Pvt. Ltd
237a871f17 fix: NoneType object has no attribute "gstin" (#16458)
* fix: NoneType object has no attribute "gstin"

* fix: handle NoneType values
2019-01-22 20:49:06 +05:30
Sagar Vora
33bc3f3309 Merge branch 'hotfix' v10.1.79 2019-01-22 18:15:44 +05:30
Sagar Vora
2a9a867f05 bumped to version 10.1.79 2019-01-22 18:35:44 +05:50
Sagar Vora
ecf6467799 fix(travis): Redis must be working for caching, so reverting (#16455) 2019-01-22 17:41:56 +05:30
Sagar Vora
8c8e4fd130 Merge branch 'hotfix' v10.1.78 2019-01-22 15:33:48 +05:30
Sagar Vora
1e61dd024b bumped to version 10.1.78 2019-01-22 15:53:48 +05:50