Saqib
1db812ab9f
Merge branch 'develop' into common-party-acc
2021-08-24 17:27:43 +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
GangaManoj
46650cce0d
fix: Calculate total buying_amount and gross profit for each invoice
2021-08-23 21:17:32 +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
57e326e7d0
fix: Consolidated balance sheet showing incorrect values ( #26975 )
2021-08-21 17:59:11 +05:30
Saqib
5395f56c88
Merge branch 'develop' into common-party-acc
2021-08-20 20:42:50 +05:30
GangaManoj
d1453c0cd0
fix: Remove Item Code and Item Name columns
2021-08-20 18:26:17 +05:30
GangaManoj
75d4fc99fc
fix: Display Items in the format Item Code: Item Name
2021-08-20 18:25:36 +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
GangaManoj
b5fac83987
fix: Add items belonging to Product Bundles as children
2021-08-20 06:07:53 +05:30
GangaManoj
33f100d75d
fix: Set initial_depth to 3
2021-08-20 06:06:47 +05:30
GangaManoj
97a1d426a3
fix: Assign indent and parent_invoice
2021-08-20 03:54:19 +05:30
GangaManoj
779a1d68a5
fix: Make Invoice row bold
2021-08-20 02:38:34 +05:30
GangaManoj
5ffaff8e48
fix: Display items as descendants of invoices
2021-08-20 02:20:18 +05:30
GangaManoj
17a154017b
fix: Display data in tree form
2021-08-20 02:19:18 +05:30
GangaManoj
76921137ed
fix: Return data as dict if the report is grouped by Invoice
2021-08-20 02:16:49 +05:30
Saqib Ansari
8e79c48db8
fix: remove unwanted filter query
2021-08-19 18:10:02 +05:30
Saqib Ansari
71e7254184
test: creation of advance entry on invoice submission
2021-08-19 18:09:35 +05:30
Saqib Ansari
977b09b6ba
feat: auto create advance entry on invoice submission
2021-08-19 18:09:35 +05:30
Saqib Ansari
cad08bc428
feat: toggle to enable common party accounting
2021-08-19 18:09:35 +05:30
Saqib Ansari
dddc29fdc1
feat: initialize party link for customer & suppliers
2021-08-19 18:09:35 +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
GangaManoj
4a77bd2304
fix: Syntax error
2021-08-18 00:33:43 +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
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
Afshan
976ae13c1e
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-11 11:49:27 +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
noahjacob
a4cea1e56d
refactor: variable names
2021-08-10 11:41:29 +05:30
noahjacob
3a663ac77f
test: changed test item name
2021-08-10 11:41:29 +05:30
noahjacob
c95d96e7ae
refactor: changed variable names
2021-08-10 11:41:29 +05:30
noahjacob
a9ef56a107
test: added test case for creating and updating
2021-08-10 11:41:29 +05:30
noahjacob
415519af15
feat: added multi-select fields to create multiple pricing rules.
2021-08-10 11:41:29 +05:30
Deepesh Garg
797170e913
fix: Linting issues
2021-08-10 11:02:21 +05:30
Deepesh Garg
428ccebad9
test: Update test cases for discount accounting
2021-08-10 10:43:01 +05:30
Deepesh Garg
b73bb3e501
fix: Add discount account handling in Purchase Invoice
2021-08-10 10:42:47 +05:30
Deepesh Garg
9b561ea839
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into discount_accounting_v13
2021-08-10 10:38:14 +05:30
Deepesh Garg
cd980f5e6b
Merge pull request #26723 from GangaManoj/backport-po-payment-terms
...
feat: Fetch Payment Terms from linked Sales/Purchase Order
2021-08-10 10:34:39 +05:30
Afshan
f5b5be9644
Merge branch 'develop' into po-payment-terms
2021-08-10 09:32:08 +05:30
Afshan
a982a2a72e
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-10 09:30:48 +05:30
Francisco Roldan
0a90302170
fix: depends_on in price list field
2021-08-09 11:41:56 -03:00
Francisco Roldan
7e3dd9e8ee
fix: depends_on in price list field
2021-08-09 11:21:41 -03:00
Deepesh Garg
75a832715c
test: Update test cases for discount accounting
2021-08-09 19:03:14 +05:30
Deepesh Garg
cb539b7a6a
fix: Add discount account handling in Purchase Invoice
2021-08-09 19:01:41 +05:30
Deepesh Garg
bcf56e64ba
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-09 18:53:14 +05:30
GangaManoj
072f63b324
Revert "fix: Only fetch default Payment Terms Template if present"
...
This reverts commit fb80ca9e06
2021-08-09 18:53:14 +05:30
GangaManoj
e247e3a4b2
fix: Only fetch default Payment Terms Template if present
2021-08-09 18:53:14 +05:30
Deepesh Garg
90cca2cb55
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-09 18:06:33 +05:30
Frappe PR Bot
ea83e2b45f
fix: validate python expressions ( #26835 ) ( #26856 )
...
(cherry picked from commit 07337d5c78
2021-08-09 14:48:59 +05:30
Anupam Kumar
9c04c297b8
refactor: Accounts Settings form cleanup ( #26842 )
2021-08-09 14:01:02 +05:30
Ankush
07337d5c78
fix: validate python expressions ( #26835 )
2021-08-09 12:38:40 +05:30
Deepesh Garg
a59a761f99
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into backport-po-payment-terms
2021-08-06 23:55:01 +05:30
Deepesh Garg
0bba425fe3
fix: Ignore default payment term templates when coping payment terms from orders
2021-08-06 23:53:16 +05:30
Saqib
f1141e7756
fix: failing budget test due to project naming ( #26834 )
2021-08-06 17:37:17 +05:30
Saqib
668f442139
Merge branch 'develop' into po-payment-terms
2021-08-06 13:42:10 +05:30
Deepesh Garg
6871c07685
test: Failing budget test due to project naming
2021-08-06 10:53:38 +05:30
GangaManoj
232c728636
Revert "fix: Only fetch default Payment Terms Template if present"
...
This reverts commit fb80ca9e06
2021-08-05 23:04:58 +05:30
GangaManoj
fb80ca9e06
fix: Only fetch default Payment Terms Template if present
2021-08-05 22:04:11 +05:30
Frappe PR Bot
6e07ec2617
fix: Do not fetch fully return issued purchase receipts ( #26809 ) ( #26825 )
...
(cherry picked from commit 1d90f7684e
2021-08-05 20:13:28 +05:30
Deepesh Garg
1d90f7684e
fix: Do not fetch fully return issued purchase receipts ( #26809 )
2021-08-05 19:17:32 +05:30
GangaManoj
23c104555b
fix: Remove irrelevant code
2021-08-05 00:28:42 +05:30
Frappe PR Bot
bf8d0c256d
fix: typo in error message ( #26816 ) ( #26817 )
...
(cherry picked from commit 005291e6dd
2021-08-04 22:01:17 +05:30
François de Ryckel
005291e6dd
fix: typo in error message ( #26816 )
2021-08-04 21:59:18 +05:30
Saqib
5c9d4db0e9
Merge branch 'develop' into payment-reconc-party-validation-fix
2021-08-04 13:57:00 +05:30
Deepesh Garg
346bde875c
Merge branch 'develop' of https://github.com/frappe/erpnext into sa-vat-report
2021-08-03 14:44:20 +05:30
Deepesh Garg
db40d88fc2
Merge pull request #26780 from nemesis189/added-dispatch-address-to-sales-v13-new
...
feat: Added dispatch address fields in Sales Ord, Sales Inv, Delivery Note for Eway Bill
2021-08-02 21:11:50 +05:30
Subin Tom
6ba11a382a
test: Updated test case for Eway bill
2021-08-02 20:36:46 +05:30
Subin Tom
8800aaaee7
feat: Added fields for dispatch address in Sales Order, Sales Invoice, Delivery Note for Eway Bill
2021-08-02 20:36:37 +05:30
Deepesh Garg
c677d47a4a
fix: Test Cases
2021-08-02 12:40:44 +05:30
Deepesh Garg
c525b372c6
fix: Tests
2021-08-02 12:40:00 +05:30
Deepesh Garg
92f7a5a390
fix: GL For taxes if discount applied on Grand Total
2021-08-02 12:39:43 +05:30
Deepesh Garg
b7267f8f5f
fix: Syntax Error
2021-08-02 12:39:22 +05:30
Frappe PR Bot
a9474a9fbd
fix: POS Invoice consolidated Sales Invoice field set to no copy ( #26768 )
2021-08-02 12:25:27 +05:30
Subin Tom
e99cd2e9da
fix: POS Invoice consolidated Sales Invoice field set to no copy ( #26706 )
2021-08-02 11:39:20 +05:30
Anuja Pawar
4ec02ad91d
Merge branch 'develop' into sa-vat-report
2021-08-02 10:42:04 +05:30
Rohit Waghchaure
343143037c
fix: conflicts
2021-08-01 14:45:24 +05:30
Deepesh Garg
36f6e9b58e
Merge pull request #26654 from marination/pi-expense-account
...
fix: Set Expense account from warehouse only if warehouse exists (Inter company invoice)
2021-07-31 17:32:24 +05:30
Rohit Waghchaure
2a14f255cf
fix: COGS account in purchase receipt
2021-07-31 11:14:14 +05:30
Deepesh Garg
6eded547f5
fix: TDS calculation for first threshold breach for TDS category 194Q
2021-07-30 20:12:51 +05:30
Subin Tom
b8845b9ed9
Fix: Payment Entry party validation issue
2021-07-30 16:30:18 +05:30
Saqib
d4ae1febe3
fix: gl entries for exchange gain loss ( #26734 )
2021-07-30 11:21:49 +05:30
Saqib
2d6f2fea5b
fix: gl entries for exchange gain loss ( #26728 )
2021-07-30 10:55:53 +05:30
rohitwaghchaure
50b4b70589
Merge pull request #26727 from deepeshgarg007/pricing_rule_item_group_v13
...
fix: Parent condition in pricing rules
2021-07-29 20:06:47 +05:30
Deepesh Garg
9c7a9f3a13
fix: Parent condition in pricing rules
2021-07-29 20:02:49 +05:30
rohitwaghchaure
bd33bdf210
Merge pull request #26717 from deepeshgarg007/pricing_rule_item_group
...
fix: Parent condition in pricing rules
2021-07-29 19:51:53 +05:30
Ankush
57cd273f7c
fix: empty "against account" in Purchase Receipt GLE bp #26712 ( #26719 )
...
* fix: correct field for GLE against account in PR
* fix: remove incorrect field check from reposting
2021-07-29 19:49:36 +05:30
Ankush
c7df759324
fix: empty "against account" in Purchase Receipt GLE bp #26712 ( #26718 )
...
* fix: correct field for GLE against account in PR
* fix: remove incorrect field check from reposting
2021-07-29 19:49:12 +05:30
GangaManoj
b389c9e375
fix: Fetch Payment Terms from Sales/Purchase Orders
2021-07-29 19:25:29 +05:30
GangaManoj
1011c1b01a
fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't
2021-07-29 19:24:29 +05:30
Deepesh Garg
19a6d80927
fix: Parent condition in pricing rules
2021-07-29 18:47:16 +05:30
Saqib
bbb96899a5
Merge branch 'develop' into po-payment-terms
2021-07-29 17:23:09 +05:30
Deepesh Garg
e014d7a00e
Merge pull request #26710 from deepeshgarg007/tds_194q_calculations
...
fix: TDS calculation for first threshold breach for TDS category 194Q
2021-07-29 15:55:16 +05:30
Saqib
e39bbc85e1
fix: cannot cancel payment entry if linked with invoices ( #26703 )
2021-07-29 15:46:25 +05:30
Ankush Menat
5764b49767
fix: remove incorrect field check from reposting
2021-07-29 15:41:22 +05:30
Deepesh Garg
4c681592bf
fix: TDS calculation for first threshold breach for TDS category 194Q
2021-07-29 15:26:19 +05:30
Ankush
f8343890b9
feat: don't recompute taxes ( #26695 )
2021-07-29 11:09:34 +05:30
