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

29683 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marination
5ab823beab fix: Removed validation from non existent manufacturers table 2019-12-16 12:19:47 +05:30
Rohit Waghchaure
21fe97e723 fix: pricing rule not working for production discount 2019-12-16 11:15:53 +05:30
deepeshgarg007
c05bd1964f feat: Capture return amount against Employee advance via Journal Entry 2019-12-15 21:22:28 +05:30
deepeshgarg007
b223dd95e2 fix: Dashboard for employee advance doctype 2019-12-15 21:21:31 +05:30
deepeshgarg007
40b7ac4987 fix: Minor filter fix in expense claim type 2019-12-15 21:20:55 +05:30
Deepesh Garg
b0ab31f69b
Merge pull request #19927 from surajshetty3416/fix-profit-and-loss-statement 
fix: Profit and Lost (financial statement) report
 2019-12-15 20:22:31 +05:30
rohitwaghchaure
5ed8465788
Merge pull request #19945 from nextchamp-saqib/existing-asset-fix 
fix: remove mandatory purchase reference for existing asset
 2019-12-15 16:29:30 +05:30
Suraj Shetty
ba3c9b7651
Merge branch 'develop' into fix-profit-and-loss-statement 2019-12-14 23:36:11 +05:30
Deepesh Garg
550971f96c
Merge pull request #19950 from deepeshgarg007/patch-and-address-fix 
fix: Add missing import
 2019-12-14 23:03:13 +05:30
Suraj Shetty
586390db81
Merge branch 'develop' into fix-profit-and-loss-statement 2019-12-14 22:49:53 +05:30
deepeshgarg007
94ff8058ac fix: Add missing import 2019-12-14 21:25:30 +05:30
rohitwaghchaure
b2f65366cf
Merge pull request #19941 from deepeshgarg007/pricing_rule_fix 
fix: Price rule filtering fix
 2019-12-13 16:01:16 +05:30
thefalconx33
5da7e729a5 fix: remove mandatory purchase reference for existing asset 2019-12-13 15:44:39 +05:30
thefalconx33
bfc43d3b15 fix: gl entries doesn't filter based on debit precision 2019-12-13 15:41:19 +05:30
Mangesh-Khairnar
4bea44b9c9 fix: update already existing items 2019-12-13 15:05:43 +05:30
deepeshgarg007
8c9c6ec919 fix: Price rule filtering fix 2019-12-13 13:47:15 +05:30
marination
81990aee9f fix: Removed 'manufacturers' table from Item Master 2019-12-13 13:18:59 +05:30
Deepesh Garg
57e6bcaf43
Merge pull request #19733 from marination/zero-division-basic-amount 
fix: Division by zero error in Stock Entry
 2019-12-13 09:23:44 +05:30
marination
0e33f792d3 fix: Distribute charges based on quantity if Total Basic Amount is Zero. 2019-12-12 16:34:41 +05:30
Deepesh Garg
c9870c88b6
Merge pull request #19930 from deepeshgarg007/regional_address_fix 
fix: Get regional address details
 2019-12-12 16:25:31 +05:30
Deepesh Garg
859b464a57
Merge pull request #19904 from prssanna/file-upload-fix 
fix: Bank statement not getting attached in Bank Reconciliation
 2019-12-12 15:19:54 +05:30
Deepesh Garg
2190d34d13
Merge pull request #19922 from rohitwaghchaure/not_able_to_submit_the_landed_cost_voucher_develop 
fix: not able to submit the landed cost voucher
 2019-12-12 15:16:06 +05:30
deepeshgarg007
c58dc873d5 fix: Get regional address details fix 2019-12-12 14:55:57 +05:30
Suraj Shetty
f95267041d fix: Financial statement report 
- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
 2019-12-12 13:06:17 +05:30
Rohit Waghchaure
9b0d7b93dd fix: not able to submit the landed cost voucher 2019-12-12 12:10:25 +05:30
Deepesh Garg
60592e9d43
Merge pull request #19897 from hrwX/qms-int-issue 
fix: rename labels
 2019-12-12 08:45:51 +05:30
Deepesh Garg
d10cefa37e
Merge pull request #19893 from marination/rounded_total 
fix: Disable Rounded Total always showing field default value
 2019-12-11 18:40:56 +05:30
Deepesh Garg
0e10340471
Merge pull request #19899 from rohitwaghchaure/not_able_to_cancel_landed_cost_voucher 
fix: not able to cancel the landed cost voucher
 2019-12-11 18:38:23 +05:30
thefalconx33
107989316c fix: additional notes from Quotations not saved in SO 2019-12-11 18:15:54 +05:30
thefalconx33
894c210027 fix: enable address without checkout feature 
* fix add address form country link field
 2019-12-11 17:43:04 +05:30
Mangesh-Khairnar
c6599fd1e2 fix: add publihed in hub track item 2019-12-11 17:29:04 +05:30
thefalconx33
5b622eace1 fix: handle scenario with no condition 2019-12-11 16:08:31 +05:30
0Pranav
d3605d2354 fix: issue in javascript timezones 2019-12-11 15:02:23 +05:30
prssanna
2ef26fbb07 fix: empty fname and fcontent of uploaded file 2019-12-11 14:21:04 +05:30
Rohit Waghchaure
37cf096102 fix: not able to cancel the landed cost voucher 2019-12-11 13:50:29 +05:30
Himanshu Warekar
45e4b73e08 fix: rename fields 2019-12-11 13:07:41 +05:30
rohitwaghchaure
797481f9d5
Merge pull request #19802 from rohitwaghchaure/job_card_calendar_new_enhancement 
fix: Manufacturing UX, added calendar view for job card
 2019-12-11 13:01:16 +05:30
marination
ca6dbad7cb fix: Disable Rounded Total always showing field default value 2019-12-11 12:10:05 +05:30
Raffael Meyer
9e32f587f5 fix: remove contact info, use international format (#19828) 
- for international letters, city and country should be upper case: https://www.deutschepost.de/content/dam/dpag/images/B_b/Briefe_ins_Ausland/downloads/dp-brief-international-handlingbroschuere-072019.pdf#page=15
- it is not customary, to use contact information such as phone number in the address
 2019-12-10 21:41:05 +05:30
Khushal Trivedi
5380a4c3db fix-education: date of birth validation on student form (#19875) 
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770

* fix: joining and relieving Date can be on same date as valid use case

* fix-education: date of birth validation
 2019-12-10 21:38:42 +05:30
Anurag Mishra
9046c13858 fix: added extra condition (#19884) 2019-12-10 21:37:27 +05:30
Pranav Nachnekar
6aa763221b fix: rename appointment booking route (#19886) 
* rename appoinment booking route

* fix: replace all references to book-appointment route
 2019-12-10 21:35:28 +05:30
rohitwaghchaure
c58495dcee fix: Item-wise Sales History report not working (#19889) 2019-12-10 21:34:03 +05:30
Saqib
664d0d89b5 fix: incorrect account mapping for child companies (#19887) 
* fix: incorrect account mapping for child companies on adding account to parent company

* Update account.py
 2019-12-10 21:32:17 +05:30
Mangesh-Khairnar
dd079d7e02
Merge pull request #19885 from Anurag810/leave_application_dashboard_fix 
fix: removed only custom dashboard
 2019-12-10 16:24:51 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469) 
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
 2019-12-10 15:55:05 +05:30
Anurag Mishra
9cc5c18f36 fix: removed only custom dashboard 2019-12-10 15:20:47 +05:30
Deepesh Garg
ce42f48bfb fix: Append expense account only if expense account exists (#19880) 2019-12-10 12:15:33 +05:30
Nabin Hait
6f68f2d020
feat: Cost center for each expenses in expense claim and allowed deferred expense (#19807) 
* refactor: Expense Claim Cost Center

* refactor: Expense Claim Cost Center

* refactor: Expense Claim Cost Center

* fix: copy cost center from other row

* patch: set cost center in children based on parent

* fix: test cases for expense claim
 2019-12-10 08:40:10 +05:30
marination
214acc9a42 fix: Changed check condition and added test 2019-12-09 21:38:19 +05:30