Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,874 Commits 3 Branches 0 Tags 1 GiB
33dd5bf717
Commit Graph

29874 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mangesh-Khairnar
c438a20b76
Merge pull request #20341 from Mangesh-Khairnar/fix-remaining-leave-balance-calculation 
fix: calculate remaining leave balance
 2020-01-20 21:50:47 +05:30
Anurag Mishra
85e5ba9698
Merge branch 'develop' into fix-remaining-leave-balance-calculation 2020-01-20 19:41:33 +05:30
Mangesh-Khairnar
2892a3b067 fix: nonetype issue in the total leaves calculation 2020-01-20 18:02:23 +05:30
rohitwaghchaure
6ae61a1693 fix: incorrect number of gl entries issue (#20352) 2020-01-20 17:53:19 +05:30
Marica
7653a8b9fa fix: 'get_additonal_costs' is not defined (#20344) 
* fix: 'get_additonal_costs' is not defined

* fix: Re-added get_items on Work order change.
 2020-01-20 15:46:36 +05:30
Nabin Hait
03b116dd01
fix: deprecated fetching item price based on min_qty (#20347) 2020-01-20 15:45:04 +05:30
Mangesh-Khairnar
2ac8473abf fix: calculate remaining leave balance 2020-01-17 22:46:26 +05:30
Nabin Hait
444156184c
fix: Plaid TypeError in add_bank_accounts (#20335) 2020-01-17 15:57:48 +05:30
Khushal Trivedi
71d462554f Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-01-17 12:26:25 +05:30
Jigar Tarpara
f5374c182e Bug Fix (#20330) 
* Bug Fix

auto_close_after_days field is in Selling Settings

* fix: close_opportunity_after_days field is in selling settings

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-01-17 11:54:25 +05:30
Parth Kharwar
0a581c096b chore: changed employee contact field name 2020-01-17 11:50:35 +05:30
Rohan
ef734ee850 fix: handle default value for batch size in BOM operation (#20328) 2020-01-17 11:45:54 +05:30
Vishal Dhayagude
2ae87876b6 fix: salary structure assignment filter employee based on company (#20318) 
* fix: pick company from employee salary structure

* fix: Salary structure assignment fetch company from enmployee

* Revert "fix: Salary structure assignment fetch company from enmployee"

This reverts commit ab2da691c79646d6d095f347ea3e273f466ee34f.

* fix: Salary structure assignment fetch company from enmployee

* fix: filter on company for salary structure assignment

* fix: minor changes

* fix: minor changes

* fix: added company to salary strucutre assignment
 2020-01-17 11:44:11 +05:30
Himanshu
e3afe8a73c fix: don't hide primary_address_and_contact_detail (#20322) 2020-01-16 13:39:29 +05:30
Saqib
bcb6130bbe fix: hide total amount field from journal entry PF (#20324) 2020-01-16 13:38:43 +05:30
Nabin Hait
e321fbb0d5
fix: Multiple fixes based on testing on pre-release branch (#20301) 
* fix: Multiple fixes based on testing on pre-release branch

* fix: reload hr settings
 2020-01-16 13:37:25 +05:30
rohitwaghchaure
3cbb4cbad9
Merge pull request #20315 from PawanMeh/fix_20314 
fix: Italian invoicing supplier name issues
 2020-01-16 11:43:14 +05:30
rohitwaghchaure
d821c58a5e fix: capacity planning validation (#20317) 2020-01-16 11:29:08 +05:30
Pawan Mehta
687cbc7c0c fix: #20314 2020-01-15 23:44:36 +05:30
Vishal Dhayagude
654d785776 fix: Delivery note not able to create sales return (#20264) 2020-01-15 19:28:58 +05:30
Marica
9f6c95549a fix: Applied query on PO Supplier popup field in Material Request. (#20231) 2020-01-15 19:24:28 +05:30
Marica
4e6b3ada0f fix: Missing argument in status updater (#20281) 2020-01-15 19:22:35 +05:30
Saqib
b0b179f1b7 fix: make jv depreciations only if calculate depr is checked (#20282) 2020-01-15 19:05:35 +05:30
Wolfram Schmidt
a346469e0c Update de.csv (#20292) 
Missing translation
 2020-01-15 19:04:39 +05:30
sahil28297
32d643ed3c fix(patch): reload tax category (#20308) 2020-01-15 18:57:54 +05:30
sahil28297
596a072d5f fix(patch): do not append taxes to template if account name is not set (#20312) 2020-01-15 18:56:36 +05:30
Saqib
617a24191f fix: get existing payment req amount only from unpaid req (#20289) 2020-01-15 16:36:13 +05:30
rohitwaghchaure
61ad6292d6 fix: incorrect number of GL Entries error in stock entry (#20299) 2020-01-15 16:35:31 +05:30
Suraj Shetty
3b0077c5e4
feat: Added Exempted doctype list in hooks (#20260) 
feat: Added Exempted doctype list in hooks
 2020-01-15 12:39:42 +05:30
Suraj Shetty
71ed1d42e2
Merge branch 'develop' into cancel_frappe_1 2020-01-15 11:22:44 +05:30
Suraj Shetty
080d136fd7
fix: Improper escaping (#20248) 
* fix:  Improper escaping

issue was introduced in https://github.com/frappe/erpnext/pull/20202

* fix: missing closing parentheses

* style: trim unwanted spaces

Co-authored-by: Pranav Nachnekar <prnvnachnekar@gmail.com>
 2020-01-14 12:55:03 +05:30
rohitwaghchaure
7894caf397
Merge pull request #20276 from rohitwaghchaure/fixed_report_stock_and_account_value_comparison 
fix: filter issue for the stock and account value comparison report
 2020-01-14 12:18:39 +05:30
Rohit Waghchaure
9650c25429 fix: filter issue for the stock and account value comparision report 2020-01-14 12:12:54 +05:30
Saqib
1218160c70 fix: payment entry can be created against on hold PI (#20270) 2020-01-14 12:07:24 +05:30
Deepesh Garg
7420fccbee
Merge pull request #20269 from rohitwaghchaure/fixed_delivery_date_not_able_to_change_after_submit 
fix: allow on submit for the delivery date field
 2020-01-14 10:00:10 +05:30
Khushal Trivedi
2848ce4b87 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-01-13 20:59:25 +05:30
Saqib
b8bcad5850 fix: gl not generated on manual asset creation (#20265) 2020-01-13 18:17:05 +05:30
Deepesh Garg
2d151a7b85 fix: Remove patch to set automatic tax fetching from item tax template (#20234) 2020-01-13 15:09:27 +05:30
Suraj Shetty
06ed72a859
Merge branch 'develop' into cancel_frappe_1 2020-01-13 15:08:23 +05:30
Deepesh Garg
70a58d333b
Merge pull request #20245 from nextchamp-saqib/asset-cancel-fix 
fix: auto cancel if movement exists
 2020-01-13 14:44:45 +05:30
Deepesh Garg
16b8673554
Merge pull request #20257 from nextchamp-saqib/revery-jv-fix 
fix: remove default customer as party type
 2020-01-13 13:48:55 +05:30
vishal
dcef798be7 fix: minor changes 2020-01-13 12:59:52 +05:30
vishal
1dd289450f fix: docstring for auto cancel 2020-01-13 12:59:18 +05:30
vishal
eef05758b6 feat: Added docinfo for auto cancel exempt doctypes 2020-01-13 12:59:18 +05:30
vishal
70148a6748 feat: docstring added for auto cancel exempt doctypes 2020-01-13 12:59:12 +05:30
thefalconx33
f04d054faa fix: remove default customer as party type 2020-01-13 12:43:49 +05:30
Rohit Waghchaure
ecdfc1a15c fix: allow on submit for the delivery date field 2020-01-13 12:43:26 +05:30
thefalconx33
1e7a127dfa fix: auto cancel if movement exists 2020-01-11 14:19:02 +05:30
Deepesh Garg
23d4a0ec48
Merge pull request #20237 from deepeshgarg007/hsn_template 
fix: Item tax template fetching from HSN Code
 2020-01-10 21:45:48 +05:30
deepeshgarg007
00746306a3 fix: Item tax template fetching from HSN Code 2020-01-10 15:01:50 +05:30