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
Rohan
7fa3f3fe98
fix: include start and end date for contract status ( #18866 )
2019-09-03 14:16:12 +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
Nabin Hait
4d553b7a84
Merge branch 'develop' into contacts-ref
2019-09-02 15:58:06 +05:30
Himanshu
fffdb6f575
feat(Contacts): Multiple Emails in a Contact ( #18675 )
...
* feat: render multiple addresses
* feat: move to newer contacts structure
* fix: iterate over valid variable
* fix: use primary label instead of bold letters
* fix: call popup get contact name from number
* fix: make contact structure call popup compatible
* fix: query
* fix: add city, state and country
* fix: display address
* fix: get address in single line
* fix: review fixes
* fix: translation strings
* fix: fix query for contacts
* fix: remove references of mobile_no
2019-09-02 15:57:45 +05:30
Suraj Shetty
063144c514
fix: Check in_patch before adding 'All Item Group'
2019-09-02 15:53:28 +05:30
deepeshgarg007
402d82b4c5
fix: Remove delete_doc from tests
2019-09-02 14:37:18 +05:30
Himanshu Warekar
711d1acffd
fix: remove references of mobile_no
2019-09-02 13:31:10 +05:30
Himanshu Warekar
81472e4c08
Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref
2019-09-02 13:21:29 +05:30
Himanshu Warekar
b8f23c2657
fix: fix query for contacts
2019-09-02 13:20:27 +05:30
Suraj Shetty
f33dfc2121
Merge branch 'develop' into contacts-ref
2019-09-02 12:38:45 +05:30
Deepesh Garg
e26b55265f
Merge pull request #18840 from netchampfaris/missing-parent-item-group
...
fix: Set default Parent Item Group
2019-09-02 12:22:49 +05:30
Himanshu Warekar
26dfd5b314
fix: translation strings
2019-09-02 12:21:41 +05:30
Himanshu Warekar
e31c6964f3
Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref
2019-09-02 12:11:15 +05:30
Himanshu Warekar
fd85b1689d
fix: review fixes
2019-09-02 12:10:15 +05:30
Suraj Shetty
4a8710ef75
Merge pull request #18611 from surajshetty3416/fix-paid-amount
...
fix: Paid amount 0 while creating advanced payment entry
2019-09-02 08:38:34 +05:30
Suraj Shetty
58e6b67886
Merge pull request #18613 from surajshetty3416/fix-timesheet-creation
...
fix(timesheet): Hours automatically used to set 0
2019-09-02 08:38:12 +05:30
Suraj Shetty
f268562256
Merge branch 'develop' into contacts-ref
2019-09-02 06:32:11 +05:30
Mangesh-Khairnar
86720deeae
fix: bypass credit limit check
2019-09-01 10:15:23 +05:30
Suraj Shetty
ae587dbd83
Merge pull request #18524 from surajshetty3416/feature-pick-list
...
feat: Pick List
2019-08-31 19:44:45 +05:30
