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

4980 Commits

Author SHA1 Message Date
Deepesh Garg
69973a65aa
Merge pull request #26900 from deepeshgarg007/payment_entry_validations_and_trigger_develop 
fix: Multiple fixes in payment entry
 2021-08-23 18:03:01 +05:30
Subin Tom
47b63a627d
fix: Eway bill test update to check ver 1.0.0421 (#27083) 2021-08-23 15:38:26 +05:30
Deepesh Garg
df185045a1
Merge branch 'develop' into payment_entry_validations_and_trigger_develop 2021-08-23 10:34:28 +05:30
Saqib
c335962827
refactor!: drop e-invoicing integration from erpnext (#26940) 2021-08-20 11:10:46 +05:30
Saqib
153fe1cdb4
refactor: scan barcode field scanning (#26990) 2021-08-20 11:09:51 +05:30
Noah Jacob
6541453c16 fix(ux): removed rate from grid view 2021-08-19 15:53:55 +05:30
Ankush Menat
4551d7d602
chore: mass trailing whitespace and EOF fixes 2021-08-19 13:43:28 +05:30
Afshan
ecd6584c50
fix: assigning values to rows in sales register reports (#26546) 
* fix: assigning values to rows in sales register reports

* fix: check for is_internal_customer for unrealized_profit_loss_account
 2021-08-19 12:18:27 +05:30
Subin Tom
ef792971f3
fix: Add ignore user perms to set_target_warehouse field in sales invoice (#26987) 
* reverting ot v12.7.1

* fix: Ignore user permissions for set_target_warehouse in SI

Co-authored-by: Subin Tom <subin-home@Subins-MacBook-Air.local>
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-18 18:20:04 +05:30
rohitwaghchaure
c068e8128c
Merge pull request #26993 from rohitwaghchaure/fixed-sales-invoice-not-loading 
fix: sales invoice not loading issue
 2021-08-18 10:32:54 +05:30
Rohit Waghchaure
e0862de863 fix: sales invoice not loading issue 2021-08-18 10:27:58 +05:30
Afshan
5fec44446e
fix: set account for change amount even if pos profile not found (#26986) 2021-08-17 20:06:19 +05:30
Deepesh Garg
93fc469ace
Merge pull request #26973 from deepeshgarg007/payment_entry_unallocated_fix 
fix: Incorrect unallocated amount calculation in payment entry
 2021-08-17 19:13:58 +05:30
Deepesh Garg
fd739749ba test: Add test case for payment entry 2021-08-17 16:38:25 +05:30
Frappe PR Bot
a14d218834
fix: typo (#26967) (#26984) 
(cherry picked from commit ace8cf965d2aab3faa18aa704e0e796f707cc666)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2021-08-17 16:14:37 +05:30
Deepesh Garg
b1bcb3bf13 fix: Incorrect unallocated amount calculation in payment entry 2021-08-17 11:28:46 +05:30
Rohit Waghchaure
eb1e3181a4 fix: conflicts while merging brnach version-13 to develop 2021-08-17 10:53:19 +05:30
GangaManoj
f9356ee642 fix: Sider issues 2021-08-13 17:40:51 +05:30
GangaManoj
f977c65e80 fix: Make enable_discount_accounting a class property 2021-08-13 17:17:58 +05:30
GangaManoj
5999760a65 fix: Syntax error 2021-08-13 17:13:38 +05:30
Deepesh Garg
5122948450 Merge branch 'develop' of https://github.com/frappe/erpnext into enable-discount-accounting 2021-08-13 16:00:20 +05:30
Afshan
587d2db6a9
fix: show proper currency symbol in taxes and charges table (#26827) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-13 10:59:06 +05:30
Afshan
1de4c01942
fix: Deferred Revenue Section should be collapsible only if its not enabled (#26928) 2021-08-12 23:06:34 +05:30
Ganga Manoj
54c31ed33c
feat: depreciate asset after sale (#26543) 2021-08-12 13:42:56 +05:30
Deepesh Garg
a7054560da
Merge branch 'develop' into po-payment-terms 2021-08-11 19:31:30 +05:30
Deepesh Garg
13fb71f642
Merge branch 'develop' into payment_entry_validations_and_trigger_develop 2021-08-11 18:20:42 +05:30
Deepesh Garg
a1f0cebda5 fix: Do not update settings for test 2021-08-11 11:50:39 +05:30
Deepesh Garg
02f44528f2 test: Add test case for payment entry unlink 2021-08-11 11:50:39 +05:30
Deepesh Garg
7141860c04 test: Update exchange rate in test cases 2021-08-11 11:50:39 +05:30
Deepesh Garg
b5162390e5 fix: Only do specific validations on reference unlink 2021-08-11 11:50:39 +05:30
Deepesh Garg
188bba8feb fix: Validation for receivingfrom customer against negative outstanding 2021-08-11 11:50:39 +05:30
Deepesh Garg
c5276f3fd3 fix: Multiple fixes in payment entry 2021-08-11 11:50:16 +05:30
Deepesh Garg
a57d13e1e9 fix: Multiple fixes in payment entry 2021-08-11 11:50:16 +05:30
Ankush
9152715f90
perf: various minor perf fixes for ledger postings (#26775) 
* perf: only validate if voucher is journal entry

* perf: optimize merge GLE

- Order fields such that comparison will fail faster
- Break out of loops if not matched

* perf: don't try to match SLE if count mismatch

* refactor: simplify initialize_previous_data

* perf: use cache for fetching valuation_method

These are set only once fields

* refactor: simplify get_future_stock_vouchers

* refactor: simplify get_voucherwise_gl_entries

* perf: fetch only required fields for GL comparison

`select *` fetches all fields, output of this function is only used for
comparing.

* perf: reorder conditions in PL cost center check

* perf: reduce query while validating new gle

* perf: use cache for validating warehouse props

These properties don't change often, no need to query everytime.

* perf: use cached stock settings to validate SLE

* docs: update misleading docstring

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-08-11 11:17:50 +05:30
Anupam Kumar
a6aa6cd7d6
fix: timesheet amount issue (#25993) 
* fix: timesheet amount issue

* fix: timesheet detail rate conversion

* fix: condition to check timesheet currency

* fix: removing console statement
 2021-08-10 20:32:15 +05:30
Frappe PR Bot
1a39d1a311
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#26881) 2021-08-10 19:38:39 +05:30
Anuja Pawar
66784a16cb
fix: Sales Return cancellation if linked with Payment Entry (#26883) 2021-08-10 19:38:16 +05:30
Marica
d657f39ab8
Merge pull request #25622 from noahjacob/promo_scheme_feat 
feat: added multi-select fields to create multiple pricing rules.
 2021-08-10 19:09:42 +05:30
Marica
af9863146d
fix: Grammar in Error message 2021-08-10 18:49:07 +05:30
Noah Jacob
49b7c7575e refactor: code cleanup 2021-08-10 18:35:46 +05:30
Noah Jacob
4ee6e32d74 test(fix): fixed test case 2021-08-10 18:34:18 +05:30
Anuja Pawar
0e337be065
fix: cost center & account validation in Sales/Purchase Taxes and Charges (#25929) 2021-08-10 17:26:35 +05:30
Anuja Pawar
1cba77cfbd
fix: Sales Return cancellation if linked with Payment Entry (#26551) 2021-08-10 17:25:12 +05:30
Frappe PR Bot
1ba04fdfe5
fix: pos profile not mandatory for Sales Invoice (#26876) 2021-08-10 15:47:36 +05:30
Afshan
af2f5277d5
fix: pos profile not mandatory for Sales Invoice (#26853) 2021-08-10 14:16:16 +05:30
Noah Jacob
10ce2f5d6e refactor: added naming series for pricing rule 2021-08-10 11:42:59 +05:30
noahjacob
dd86642037 refactor: removed py2 code 2021-08-10 11:41:29 +05:30
noahjacob
b214e624bb style: fixed formatting 2021-08-10 11:41:29 +05:30
noahjacob
74bcb987f3 style: fixed formatting 2021-08-10 11:41:29 +05:30
noahjacob
4fb1b6b80c fix: Sider 2021-08-10 11:41:29 +05:30