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
Suraj Shetty
72bea0dff4
test: Add test to check creation of pick list from multiple sales order
2019-08-31 18:34:25 +05:30
Suraj Shetty
736b5e07cc
fix: Maintain the order of Item List
2019-08-31 18:33:23 +05:30
Suraj Shetty
ca58fde552
test: Enable basic tests
2019-08-31 16:58:51 +05:30
Mangesh-Khairnar
bb3cec1556
test: fetch data from customer credit limit
2019-08-31 14:32:07 +05:30
Mangesh-Khairnar
42d0da8f5a
Revert "fix: process allocation expiry"
...
This reverts commit b654dc0e28
2019-08-31 14:28:10 +05:30
Mangesh-Khairnar
dbc69da409
fix: minor fixes
2019-08-31 14:28:02 +05:30
Mangesh-Khairnar
e3bb247868
fix: check column in credit limit
2019-08-31 13:16:14 +05:30
Mangesh-Khairnar
f856b3b559
fix: fetch customer group of the customer
2019-08-31 01:40:58 +05:30
Mangesh-Khairnar
89433b4bea
fix: get credit limit
2019-08-30 22:57:51 +05:30
Suraj Shetty
bcfec77e2c
style: Use single quotes
2019-08-30 19:44:37 +05:30
Suraj Shetty
744b92d233
fix: Commonify item not available alert
...
- Reorganise code
- UX fixes
2019-08-30 19:39:28 +05:30
Suraj Shetty
0eed0a9abe
test: Temporarily comment out tests
2019-08-30 19:12:16 +05:30
Mangesh-Khairnar
b3e5d11e1d
fix: multiple fixes
2019-08-30 18:18:48 +05:30
Suraj Shetty
0df38891a1
fix: Update pick list print format
2019-08-30 15:59:35 +05:30
Suraj Shetty
f75481fa23
Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list
2019-08-30 15:45:18 +05:30
Suraj Shetty
5e84ce55ae
fix: Add is_stock_item filter for item in locations table
2019-08-30 10:01:49 +05:30
Suraj Shetty
effe53d4ae
fix: Set default value for qty
2019-08-30 09:52:08 +05:30
Suraj Shetty
88885184dc
fix: Show separate button for pick list creation in work order
2019-08-30 09:30:18 +05:30
Suraj Shetty
9641edc562
fix: Set item locations before save
2019-08-29 22:23:13 +05:30
Suraj Shetty
9b42682575
fix: Check parent warehouse for batch as well
2019-08-29 21:14:26 +05:30
