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

31341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
eb2ab3bf76
Merge branch 'develop' into develop 2019-09-05 14:59:16 +05:30
John Clarke
a7d448dcba fix: Error "TypeError: unorderable types: int() > str()" When Trying to Create Packing Slip (#18913) 
User report here https://discuss.erpnext.com/t/error-typeerror-unorderable-types-int-str-when-trying-to-create-packing-slip/52445

This has not been noted to github issues and is just a suggested fix, an expert may need to refactor more here?

User and traceback does not state whether Python 2 or 3 but perhaps 3 since that apparently does not 'guess' when types do not match?

See also https://stackoverflow.com/questions/14886881/unorderable-types-int-str
 2019-09-05 14:55:35 +05:30
Rohan
77da3b4347 fix: pull project from task (#18776) 2019-09-05 14:53:43 +05:30
Rohan
9d77e9f719 fix: error while trying to get directions (#18827) 2019-09-05 14:51:22 +05:30
Govind S Menokee
c901d6322c fix(18837): Student creation error (#18838) 
Academic user not able to create student
 2019-09-05 14:50:23 +05:30
rohitwaghchaure
7496548c39 fix: not able to create invoice against patient (#18858) 2019-09-05 14:48:51 +05:30
rohitwaghchaure
f1fab871b8 fix: mismatch between warehouse tree value and warehouse based stock balance report value (#18879) 2019-09-05 14:47:43 +05:30
rohitwaghchaure
5aaf15d145 fix: healthcare practitioner not showing in the dropdown (#18929) 2019-09-05 14:42:28 +05:30
Nabin Hait
16a7ec95dc fix: tax category is optional argument 2019-09-05 13:01:15 +05:30
Suraj Shetty
607a21e02a feat: Init Employee Leave Balance Summary report 2019-09-05 12:42:29 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit 2019-09-05 12:34:34 +05:30
Nabin Hait
f4fde51bba
Update customer.py 2019-09-05 12:33:29 +05:30
Nabin Hait
c78c86663d
Update customer_credit_balance.py 2019-09-05 12:24:37 +05:30
Nabin Hait
7834a0182b
Update move_credit_limit_to_customer_credit_limit.py 2019-09-05 12:22:48 +05:30
sahil28297
1e0b0da7ad fix(patch): add company in filters to get proper parent account (#18905) 2019-09-05 12:21:44 +05:30
Faris Ansari
a2db94761a fix: Honor Shopping Cart Price List (#18885) 2019-09-05 12:19:50 +05:30
rohitwaghchaure
805b8634da fix: incorrect stock value difference when stock move from negative to positive (#18887) 2019-09-05 12:18:33 +05:30
Rohan
1635967c4e fix: attribute error when trying to fetch items (#18900) 2019-09-05 12:16:49 +05:30
Nabin Hait
a5907e17d5
Update accounts_receivable.py 2019-09-04 11:04:27 +05:30
Suraj Shetty
0252c1478e
Merge pull request #18917 from surajshetty3416/fix-call-popup 
fix: Use medium instead of to number to get schedule
 2019-09-04 11:04:14 +05:30
Suraj Shetty
f5bece1afa
Merge branch 'develop' into fix-call-popup 2019-09-04 11:03:58 +05:30
Suraj Shetty
e46c56bfe8 fix: Use medium instead of to number to get schedule 2019-09-04 11:02:52 +05:30
Nabin Hait
561a2e966e
Update accounts_receivable.py 2019-09-04 11:02:48 +05:30
rohitwaghchaure
a9b0c55bcb
Merge pull request #18914 from rohitwaghchaure/pos_search_item_not_working 
fix: offline pos item search not working
 2019-09-04 06:02:34 +05:30
Rohit Waghchaure
93bad51659 fix: offline pos item search not working 2019-09-03 23:29:41 +05:30
Rucha Mahabal
1e2dc2c8f1 feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) (#18647) 
* feat: employee incentive and retention bonus added in additional salary

* fix: added salary component field, logic improved

* fix: codacy review
 2019-09-03 20:45:52 +05:30
Sahil Khan
2691991d9a Merge branch 'develop' into version-12 2019-09-03 16:33:06 +05:30
Sahil Khan
e8b1c82531 bumped to version 12.1.0 2019-09-03 16:53:06 +05:50
Saurabh
67e4186360
Merge pull request #18909 from sahil28297/changelog_v12_1_0 
fix(change_log): add v12_1_0 changelog
 2019-09-03 16:26:07 +05:30
Saurabh
3f8f8d36b7
Merge branch 'develop' into changelog_v12_1_0 2019-09-03 16:25:44 +05:30
Sahil Khan
a70e2bdbc9 fix(change_log): add v12_1_0 changelog 2019-09-03 16:20:01 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report (#18906) 2019-09-03 16:07:46 +05:30
Nabin Hait
e85c320501
Merge branch 'develop' into feat-customer-credit-limit 2019-09-03 14:20:17 +05:30
Mangesh-Khairnar
cb44f3a7c3 fix(purchase-invoice): add rounded total property setter for purchase invoice (#18841) 2019-09-03 14:18:15 +05:30
Deepesh Garg
c174e4d01a fix: Default message from Payment Gateway Account not fetching (#18848) 2019-09-03 14:17:41 +05:30
pranav nachnekar
d272fd42c9 changed Autoname 2019-09-03 14:16:56 +05:30
pranav nachnekar
c5b2a58669 Added submit fucntionality 2019-09-03 14:16:47 +05:30
Rohan
7fa3f3fe98 fix: include start and end date for contract status (#18866) 2019-09-03 14:16:12 +05:30
pranav nachnekar
a3d04cdbca A 2019-09-03 13:17:35 +05:30
pranav nachnekar
2791054327 Converted to an SPA 2019-09-03 12:04:52 +05:30
pranav nachnekar
eb4fa966b0 Added validation for timezones 2019-09-03 12:04:23 +05:30
pranav nachnekar
ad6151b690 Added guest permissions 2019-09-03 12:04:13 +05:30
pranav nachnekar
64095084e7 Removed end time in favor of appointment duration 2019-09-03 12:03:14 +05:30
Mangesh-Khairnar
4bcc221ee3 Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit 2019-09-02 23:18:56 +05:30
Mangesh-Khairnar
cf901da25d test: create customer credit limit on change 2019-09-02 23:18:36 +05:30
Suraj Shetty
496f8e966f
Merge pull request #18889 from deepeshgarg007/contacts-ref 
fix: Travis
 2019-09-02 18:32:28 +05:30
deepeshgarg007
4dd8895133 Merge branch 'contacts-ref' of https://github.com/deepeshgarg007/erpnext into contacts-ref 2019-09-02 17:42:27 +05:30
deepeshgarg007
8666ecc26f fix: Purchase receipt test 2019-09-02 17:41:12 +05:30
Suraj Shetty
152360d999
Merge branch 'develop' into contacts-ref 2019-09-02 16:24:57 +05:30
Mangesh-Khairnar
e7c7a0e648 fix: loan application (#18882) 
* fix: loan application

* Update loan_application.py
 2019-09-02 15:59:44 +05:30