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

2656 Commits

Author SHA1 Message Date
Ankush Menat
ae55eab599
chore: remove deprecated and empty QUnit tests (#27179) 
* chore: remove deprecated and empty QUnit tests

* ci: fix UI test config

Testing library was added on Frappe, in order to reuse command testing
library has to be installed during setup process.
 2021-08-26 20:43:06 +05:30
marination
45edfd9d50 fix: Remove duplicate create_internal_customer util 
- Introduced via https://github.com/frappe/erpnext/pull/27086
 2021-08-26 15:53:52 +05:30
Marica
f4dc9ee2aa
fix: Don't create inward SLE against SI unless is internal customer enabled (#27086) 
* fix: Dont create inward SLE against SI unless is internal customer enabled

- Check if is internal customer enabled apart from target warehouse
- Test to check if inward SLE is made if target warehouse is accidentally set but customer is not internal

* test: Use internal customer for delivery of bundle items to target warehouse

- created `create_internal_customer` util
- reused it in delivery note and sales invoice tests
- use internal customer for target warehouse test in delivery note
 2021-08-26 13:12:51 +05:30
Anupam Kumar
c8f22e5524
fix: removing toggle_display for address and contact HTML (#27152) 2021-08-26 10:46:55 +05:30
Anupam Kumar
4d98be2126
feat: provision to create customer from opportunity (#27141) 
* feat: provision to create customer from opportunity

* fead: linking of address and contact

* revert: create_opportunity_address_contact

* enabming print hide and no copy
 2021-08-25 19:18:17 +05:30
rohitwaghchaure
129a0fc8b2
Merge branch 'develop' into fixed-donot-overrride-batch-no 2021-08-23 18:07:22 +05:30
Rohit Waghchaure
e1f070437a fix: selected batch no changed on updation of qty 2021-08-23 14:27:55 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning (#26990) 2021-08-20 11:09:51 +05:30
Afshan
c60d5523bc
fix: add child item groups into the filters (#26997) 
* fix: add child item groups into the filters

* fix: appending values to proper variable

* fix: refactor the loop
 2021-08-19 16:23:18 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Shariq Ansari
b32c2fa561
fix: updated erpnext wspace json files (#26380) 
* fix: updated erpnext wspace json files

* fix: updated wspace json files

* fix: updated wspace json files

* fix: removed padding code from  wspace json files

* fix: Updated restrict_to_domain in wspace json

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-08-13 12:19:16 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Ankush
c1c9c4b68e
Merge branch 'develop' into fix_dn_test 2021-08-11 11:40:15 +05:30
Saqib
b37c6992df
Merge branch 'develop' into po-payment-terms 2021-08-10 13:37:31 +05:30
Anurag Mishra
94beda65ca
fix: updating lead status while customer creation (#26606) 
* fix:  updating lead status while customer creation

* fix: changes requested
 2021-08-10 13:16:46 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms 2021-08-10 09:32:08 +05:30
Deepesh Garg
802c6b3738 test: Improve test case for not coping payment terms 2021-08-09 18:53:15 +05:30
GangaManoj
55cb82c74d fix: Compare Payment Schedules 2021-08-09 18:53:14 +05:30
GangaManoj
1200872c7e fix: Disable automcatically_fetch_payment_terms after running its associated tests 2021-08-09 18:53:13 +05:30
Anupam Kumar
2f06c3e40d
Merge branch 'develop' into lead-cleanup 2021-08-09 16:07:04 +05:30
Anupam Kumar
ef8539fd60
refactor: Selling Settings form cleanup (#26841) 2021-08-09 12:38:14 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms 2021-08-06 13:42:10 +05:30
Anupam
01a0585ba0 fix: removing organization_lead traceback 2021-08-06 12:21:02 +05:30
Subin Tom
035ce304fe
fix: POS payment modes displayed wrong total (#26708) 2021-08-04 13:57:55 +05:30
Subin Tom
3b7615750a
fix: POS Item Cart non-stop scroll issue (#26692) 2021-08-02 11:37:38 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms 2021-07-29 17:23:09 +05:30
Anupam
ee1089ca4f Merge branch 'develop' of https://github.com/frappe/erpnext into campaign-module 2021-07-27 16:49:24 +05:30
Anupam Kumar
34353df48c
fix: sales pipeline graph issue (#26626) 2021-07-27 09:47:44 +05:30
Ankush Menat
03a6c38f06
test: fix test due to rename change 2021-07-26 22:24:25 +05:30
GangaManoj
add2030553 fix: Sider issues 2021-07-23 03:58:27 +05:30
GangaManoj
aed39a23dc fix: Rename tests 2021-07-23 03:45:59 +05:30
GangaManoj
caa106b3bd fix: Add test to check if payment terms are fetched when creating a Sales Invoice 2021-07-22 22:58:45 +05:30
GangaManoj
4323f4bcac fix: Modify set_payment_schedule() to include fetch_payment_terms_from_order() 2021-07-22 05:57:42 +05:30
Deepesh Garg
3e109840f9
Merge pull request #26464 from nemesis189/added-dispatch-address-to-sales 
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
 2021-07-21 10:52:10 +05:30
GangaManoj
cde0cc0678 fix: Fetch Payment Terms from Sales/Purchase Orders 2021-07-17 22:53:21 +05:30
Afshan
c66277e06b
fix: improving ux for additional discount field (#26495) 2021-07-15 18:10:17 +05:30
Subin Tom
5265ba39f0 feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill 2021-07-13 14:58:17 +05:30
Saqib
7c5711ddf4
fix: pos item cart dom updates (#26459) 2021-07-13 14:09:06 +05:30
Marica
73c9a21987
Merge branch 'develop' into supplier_defaults_fix 2021-07-13 10:31:10 +05:30
Noah Jacob
0be6583083 refactor: suggested changes 2021-07-12 09:18:19 +05:30
Noah Jacob
34a5cb9106 fix: Sider 2021-07-12 08:48:04 +05:30
Afshan
f4d45d60f4
Revert "fix: updated onboarding steps for selling module" (#26414) 
This reverts commit 446171acc4.
 2021-07-09 20:45:43 +05:30
Anuja
446171acc4 fix: updated onboarding steps for selling module 2021-07-09 19:31:44 +05:30
Saqib
2098684bc0
fix(pos): taxes amount in pos item cart (#26410) 2021-07-09 18:09:26 +05:30
Subin Tom
95a15ed85d
fix: value fetching for custom field in POS (#26366) 2021-07-09 14:34:51 +05:30
Noah Jacob
8db974b1b9 test: updated test cases 2021-07-02 22:00:33 +05:30
Nabin Hait
fa006402b8 fix: merge conflict 2021-07-01 12:47:28 +05:30
Anupam
03f7609a8b fix: moving campaign from selling to CRM 2021-06-30 18:18:03 +05:30
Nabin Hait
a57976660a fix: merge conflict 2021-06-24 19:14:33 +05:30
Saqib
81d164134d
Merge pull request #26198 from nextchamp-saqib/pos-fixes-9-v13 
refactor(pos): use pos invoice item name as unique identifier
 2021-06-24 17:37:51 +05:30