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

6958 Commits

Author SHA1 Message Date
Deepesh Garg
27ca9866e3 Merge branch 'develop' of https://github.com/frappe/erpnext into party_account_currency_check 2021-08-25 20:47:16 +05:30
Ganga Manoj
842ceb1301
fix: cannot reconcile bank transactions against internal transfer payment entries (#26932) 
* fix: Only set Clearance Date for Payment Entries of type Internal Transfer if both Transactions have been reconciled

* fix: Reset clearance_date for intra-company Payment Entries that have only been reconciled with one Bank Transaction

* fix: indentation and args

Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-25 20:32:26 +05:30
Rohan
87308465d8
fix: create zero-dollar invoices fro trial subscriptions (#26441) 2021-08-25 20:11:05 +05:30
Frappe PR Bot
81b4590479
fix: TDS calculation on net total (#27058) (#27140) 
(cherry picked from commit 4eb7c2a011f3abbe547c2a32978e7af6e1fd6d33)

Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
 2021-08-25 18:18:16 +05:30
Ankush Menat
8d116fb9ff
fix: remove VARCHARs from Sales Invoice (#27136) 
Sales Invoice doctype is starting to hit row length limit as many
integrations add custom fields on this doctype. This is just a small
change to remove VARCHAR(140) fields and reduce row size wherever
possible.
 2021-08-25 16:45:41 +05:30
Saqib
62114b226f
feat: unreconcile on cancellation of bank transaction (#27109) 2021-08-25 16:25:51 +05:30
Afshan
8366b6322e
fix: validate party and party type only if both available (#27002) 
* fix: validate party and party type only if both available

* fix: indentation
 2021-08-25 11:57:24 +05:30
Saqib
1dadea38a5
fix: remove unexpected comma (#27132) 2021-08-25 11:05:51 +05:30
Subin Tom
fbc5977248
fix: Updated timestamp for pos invoice json (#27110) 
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
 2021-08-24 22:34:02 +05:30
Anupam Kumar
1d6ef4b0d3
fix: replacing $.each -> forEach in SI (#26995) 
* fix: replacing $.each -> forEach in SI

* fix: removed console log

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-24 22:06:19 +05:30
Frappe PR Bot
512ddc589f
fix: timesheet amount issue (#25993) (#26889) 
* fix: timesheet amount issue

* fix: timesheet detail rate conversion

* fix: condition to check timesheet currency

* fix: removing console statement

(cherry picked from commit a6aa6cd7d6)

Co-authored-by: Anupam Kumar <anupamvns0099@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-08-24 22:00:32 +05:30
Saqib
f1313302c9
fix: pos invoice test (#27113) 2021-08-24 19:45:21 +05:30
Afshan
ad06fb2179
fix: calculation of gross profit percentage in Gross Profit Report (#27045) 2021-08-24 17:35:01 +05:30
Saqib
f47cbae5e0
feat: allow draft pos invoices even if no stock available (#27078) 2021-08-24 17:27:27 +05:30
Saqib
9198caa5e7
fix: incorrect gl entry on period closing involving finance books (#26921) 2021-08-24 17:26:23 +05:30
Subin Tom
d4d5a4221a
feat: coupon code discount in pos invoice (#27004) 2021-08-24 16:22:46 +05:30
Saqib
9e82c24b27
fix: pos closing entry cancellation test (#27099) 
* fix: pos closing entry cancellation test

* fix: invalid imports

* fix: sider issue
 2021-08-24 15:37:00 +05:30
Pruthvi Patel
332ac105b5
refactor: use read_only_depends_on instead of code (#27008) 2021-08-24 12:07:38 +05:30
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
Deepesh Garg
496bff5136
feat: Column for total amount due in Accounts Receivable/Payable Summary (#27069) 2021-08-22 18:10:51 +05:30
Deepesh Garg
60915e874d test: Update test cases for currency change validation 2021-08-21 23:05:48 +05:30
Deepesh Garg
57e326e7d0
fix: Consolidated balance sheet showing incorrect values (#26975) 2021-08-21 17:59:11 +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
Deepesh Garg
869e36c33a
Merge pull request #26737 from nemesis189/payment-reconc-party-validation-fix 
fix: Payment Reconciliation party validation issue
 2021-08-19 12:40:54 +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
Afshan
2416b3a1ee
Merge branch 'develop' into payment-reconc-party-validation-fix 2021-08-18 16:03:47 +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
Mohammed Redah
a2966db1e5
fix: change print_format_type from Server to Jinja (#26374) 2021-08-17 18:45:55 +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
Deepesh Garg
58c1739eac fix: Budget variance missing values 2021-08-16 18:04:57 +05:30
Deepesh Garg
8410e4854f fix: Budget variance missing values 2021-08-16 17:14:40 +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
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
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