Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,078 Commits 3 Branches 0 Tags 1 GiB
6e170e16e2
Commit Graph

30078 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
racitup
9a47c3dc8c fix: Plaid automatic_synchronization TypeError on filter & add info log message #20343 2020-02-18 17:49:20 +05:30
racitup
1548e20b78 fix: KeyError about bank_account_no due to non-existent field: #20343 2020-02-18 17:49:08 +05:30
racitup
7cda218af3 fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343 2020-02-18 17:48:54 +05:30
Khushal Trivedi
3a196b09ee Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-18 17:48:18 +05:30
Deepesh Garg
33ad0dafcb
Merge pull request #20604 from AnilPise/develop 
fix: Parent Department filter while creating a new department
 2020-02-18 17:44:51 +05:30
Deepesh Garg
0ce9e0cc1f
feat: Group by AR/AP report (#20573) 
* feat: Group by AR/AP report

* fix: Do not consider total row in charts

* fix: Subtotal row for last party
 2020-02-18 16:07:34 +05:30
Deepesh Garg
ecba5c40bb
Merge pull request #20657 from anuradha-8/develop 
fix: date of birth cannot be greater than today on student application form
 2020-02-18 14:10:47 +05:30
rohitwaghchaure
0abc181360
Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix 
fix: disabled mode of payments fetches in sales invoices
 2020-02-18 12:38:06 +05:30
rohitwaghchaure
15ca1181f8
Merge pull request #20654 from marination/precision-mr-item 
fix: Stock Quantity not calculated on client side in Material Request Items.
 2020-02-18 12:34:16 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation (#20083) 
* fix: Validation for target warehouse

* feat: Get items on valuation rate in delivery note on Internal transfers

* fix: Create Inter company purchase receipt from delivery note

* feat: Inter company stock transfer on valuation rate with taxation

* fix: Add from warehouse in purchase invoice

* fix: Use get_value instead of get_cached_value

* fix: Get incoming rate instead of valuation rate

* fix: GL entry for from warehouse in purchase receipt

* fix: GL Entries fixes in purchase invoice

* fix: Address and tax fetching fixes

* fix: Add test case for stock transfer via purchase receipt

* fix: Code cleanup, added validations and test cases

* fix: Validation for supplier warehouse

* fix: Test Cases

* fix: Change validation condition

* fix: Address fixes while creating Purchase Receipt from delivery note

* fix: Set taxes while creating Purchase Receipt from Delivery Note

* fix: Update set_missing_value function

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-02-18 12:28:41 +05:30
Anuradha Kalaskar
93e8fc1833 fix: date of birth cannot be greater than today on student application form 2020-02-18 11:32:35 +05:30
Khushal Trivedi
1153de1965 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-18 11:16:53 +05:30
marination
e143983819 fix: Stock Quantity not calculated on client side in Material Request Items. 2020-02-18 10:51:54 +05:30
abhijitkumbharIND
0047fcf7ad fix: HSN/SAC Error while creating a new item and not selecting the field. #20590 2020-02-17 18:12:58 +05:30
Marica
db00270895
feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order (#20371) 
* feat: Added popup to 'Get Items from Open Material Requests' in Purchase Order

* fix: Query with filters, UX enhancements and cleanup
 2020-02-17 15:58:08 +05:30
indictrans
68fa65edd1 fix: Throw message 2020-02-17 14:55:56 +05:30
indictrans
a840889dd7 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-17 14:46:40 +05:30
thefalconx33
23e728612f fix: disabled mode of payments fetches in sales invoices 2020-02-17 14:15:20 +05:30
Suraj Shetty
f5b74d2aee
Merge pull request #20637 from gavindsouza/package-json 
chore: fix typo in package.json
 2020-02-17 13:13:58 +05:30
Gavin D'souza
7a46aae57a fix: updated package.json 
* fixed devDependencies typo which possibly caused
    https://discuss.erpnext.com/t/bin-sh-1-snyk-not-found-when-bench-update/58035
    which was introduced in https://github.com/frappe/erpnext/pull/20563

    * Added missing fields for package meta data
 2020-02-17 12:20:25 +05:30
Deepesh Garg
a6701aa7bc
Merge pull request #20569 from Er-Naren719/feat-user-table-columns-updated 
feat: columns under user table updated
 2020-02-17 11:15:05 +05:30
Shivam Mishra
c14f49c079 fix: filters for quality_procedure tree 2020-02-17 11:12:28 +05:30
Deepesh Garg
5894c2d005
Merge pull request #20595 from anuradha-8/develop 
fix: to date cannot be less than from date validation on student leave application form
 2020-02-17 10:57:29 +05:30
Deepesh Garg
fd182b80ac
Merge pull request #20616 from Darpan245/develop 
fix: Mandatory field property failed to work based on the selection of…
 2020-02-17 10:35:56 +05:30
rohitwaghchaure
de4bd56212
Merge pull request #20631 from P-Froggy/patch-2 
Fix: Add missing bank accounts reference in supplier dashboard
 2020-02-17 09:57:57 +05:30
P-Froggy
b3712158ae
Bank accounts reference in supplier dashboard 
Adds a reference to linked bank accounts in supplier dashboard, which was previously missing.
 2020-02-16 19:10:53 +01:00
indictrans
ad5da823e1 fix:Future date of birth accepted at Sibling Detail section in Student form #20619 2020-02-16 22:59:41 +05:30
Deepesh Garg
bd582cfc39
Merge pull request #20629 from shrikant9867/develop 
fix:User allowed to set student DOB can not be greater than Joining Date #20628
 2020-02-16 18:46:30 +05:30
shrikant dixit
e329d417d6 fix: Added validation for student DOB can not be greater than Joining Date 2020-02-15 18:20:05 +05:30
indictrans
1118ee07a8 fix:Future date of birth accepted at Sibling Detail section in Student form #20619 2020-02-15 17:37:39 +05:30
jsukrut
c0fd30a7ec fix: Indentation 2020-02-15 17:33:52 +05:30
jsukrut
c3a23ddbe3 fix: restricted duplicate courses on Program Enrollment doctype (#20611) 2020-02-15 16:39:51 +05:30
jsukrut
3a6ca13b44 fix:Mandatory field property failed to work based on the selection of field 'Group Based on' on 'Student Group' Page #20605 2020-02-15 16:18:17 +05:30
anil pise
7c474130ea fix: Removed Missing semicolon and Mixed spaces and tabs and Trailing spaces not allowed. 2020-02-15 15:58:57 +05:30
Khushal Trivedi
37eb22e506 Merge branch 'develop' of https://github.com/khushalti/erpnext into develop 2020-02-15 15:47:17 +05:30
Khushal Trivedi
dc39b4ba13 fix: validation on max group strength student group form 2020-02-15 15:38:16 +05:30
anil pise
21b1a00f61 Fix:Child account which is not a group account is treating as Parent Account while creating New Department. #20599 2020-02-15 15:23:15 +05:30
pratik.m
c224cf761f fix: restricted duplicate topics on Course doctype (#20594) 2020-02-15 13:22:17 +05:30
Anuradha Kalaskar
21d662f96d fix: to date cannot be less than from date validation on student leave application 2020-02-15 13:17:57 +05:30
Khushal Trivedi
6ee4c09854 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2020-02-14 19:23:37 +05:30
Raffael Meyer
772394b95a fix header 2020-02-13 20:58:59 +01:00
Raffael Meyer
54717fa993 update cloumn names 2020-02-13 20:58:44 +01:00
Raffael Meyer
3bacdf1f4b quote format name 2020-02-13 20:40:15 +01:00
Raffael Meyer
96b66dfae6 update TRANSACTION_COLUMNS according to "DATEV Format v7.0" 2020-02-13 20:37:37 +01:00
Raffael Meyer
b555ed0cba update header accoding to "DATEV Format v7.0" 2020-02-13 20:05:27 +01:00
Raffael Meyer
8818850174 consutant number and client number are mandatory 2020-02-13 17:13:15 +01:00
Raffael Meyer
46cf20825b generated on is datetime, not date 2020-02-13 17:09:22 +01:00
Raffael Meyer
0070805bbb add format version (data type) 2020-02-13 17:06:06 +01:00
Raffael Meyer
7d2777870e bump version number 2020-02-13 17:05:37 +01:00
Raffael Meyer
4fb897728b EXTF must be in quotes 2020-02-13 17:02:01 +01:00