Saqib
bb493a0602
Merge pull request #26159 from GangaManoj/asset-credit-note
2021-07-14 12:02:02 +05:30
GangaManoj
6357ffe4a1
fix: Create asset data
2021-07-13 22:31:01 +05:30
GangaManoj
2f4c607fc8
fix: Add tests for discount accounting
2021-07-13 17:41:29 +05:30
Deepesh Garg
779d2afa60
fix: Update account heads in GST test cases
2021-07-13 16:50:04 +05:30
Deepesh Garg
bb679cc036
fix: Add validate bank account method back
2021-07-13 16:49:21 +05:30
Deepesh Garg
a72589cb7e
fix: Add accounts and templates for reverse charge
2021-07-13 16:48:06 +05:30
Deepesh Garg
1001f29784
fix: Gracefully handle duplicate bank account name to make setup faster
2021-07-13 16:47:38 +05:30
Deepesh Garg
c00d851a88
fix: Unallocated amount for inclusive charges
2021-07-13 16:42:21 +05:30
Deepesh Garg
740d5c6c53
fix: Deduct included taxes from unallocated amount
2021-07-13 16:42:10 +05:30
Deepesh Garg
01c89eaad9
fix: Remove unintentional changes
2021-07-13 16:42:10 +05:30
Deepesh Garg
2f350bf450
fix: Remove unintentional changes
2021-07-13 16:42:10 +05:30
Deepesh Garg
9513d61a50
fix: Hide amount after tax fields
2021-07-13 16:42:10 +05:30
Deepesh Garg
51ae46f0de
fix: Unallocated amount in Payment Entry after taxes
2021-07-13 16:42:10 +05:30
Deepesh Garg
4478c547bf
fix: Unallocated amount for inclusive charges
2021-07-13 16:35:58 +05:30
Deepesh Garg
754f432d97
fix: Deduct included taxes from unallocated amount
2021-07-13 16:35:47 +05:30
Deepesh Garg
7c634f66ca
fix: Remove unintentional changes
2021-07-13 16:35:47 +05:30
Deepesh Garg
5179f85e63
fix: Remove unintentional changes
2021-07-13 16:35:47 +05:30
Deepesh Garg
5cc4a201cb
fix: Hide amount after tax fields
2021-07-13 16:35:47 +05:30
Deepesh Garg
f661d82c00
fix: Unallocated amount in Payment Entry after taxes
2021-07-13 16:35:47 +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
Deepesh Garg
4a2e4748ac
fix: Unallocated amount for inclusive charges
2021-07-13 11:22:55 +05:30
GangaManoj
8f7b0a1753
fix: Create common function for discount accounting
2021-07-13 03:01:02 +05:30
GangaManoj
65e2b9fee6
fix: Filter options for Discount Account
2021-07-13 02:14:18 +05:30
GangaManoj
81375aec1f
fix: Copy Discount Account from first row
2021-07-13 02:09:40 +05:30
GangaManoj
4b8918e8a7
fix: Display Discount Account only if Enable Discount Accounting is checked
2021-07-13 02:07:46 +05:30
GangaManoj
555852c5ef
fix: Add Discount Account field
2021-07-13 02:06:03 +05:30
GangaManoj
4fcdc5d129
fix: Copy discount account from first row to all Items
2021-07-13 01:45:20 +05:30
GangaManoj
b22dba1146
fix: Filter Discount Account list
2021-07-13 01:45:20 +05:30
GangaManoj
0d5ad3b1bb
fix: Add description for Enable Discount Accounting checkbox
2021-07-13 01:45:20 +05:30
Deepesh Garg
30f771b26c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payment_entry_taxes_v12
2021-07-12 23:34:13 +05:30
Deepesh Garg
855e9030f2
fix: Deduct included taxes from unallocated amount
2021-07-12 22:11:57 +05:30
Saqib
7fb64d1645
fix: exchange gain loss not set for advances linked with invoices ( #26436 )
2021-07-12 18:33:16 +05:30
Saqib
a20999cfbc
fix: exchange gain loss not set for advances linked with invoices ( #25369 )
2021-07-12 14:33:23 +05:30
Afshan
7e05bea6a9
fix: dunning calculation of grand total when rate of interest is 0% ( #26286 )
2021-07-12 11:11:58 +05:30
Afshan
10473b1195
fix: dunning calculation of grand total when rate of interest is 0% ( #26285 )
2021-07-12 11:11:29 +05:30
Afshan
bf03671a33
fix(report): iterate on accounts only when accounts exist ( #26391 )
2021-07-12 11:10:28 +05:30
Afshan
4b4ac7c051
fix(report): iterate on accounts only when accounts exist ( #26390 )
2021-07-12 11:10:00 +05:30
Afshan
f60c3f0655
fix: error popup for COA errors ( #26358 )
2021-07-12 11:07:30 +05:30
Afshan
6467632f60
fix: error popup for COA errors ( #26357 )
2021-07-12 11:07:06 +05:30
Deepesh Garg
eae7c1891f
fix: Remove unintentional changes
2021-07-09 20:08:29 +05:30
Deepesh Garg
c13ac4ab11
fix: Remove unintentional changes
2021-07-09 20:00:55 +05:30
GangaManoj
ef42e80065
fix: Sider issues
2021-07-09 19:25:54 +05:30
Deepesh Garg
171ee51507
fix: Hide amount after tax fields
2021-07-09 18:52:39 +05:30
Deepesh Garg
38fa3a3f89
fix: Unallocated amount in Payment Entry after taxes
2021-07-09 18:04:24 +05:30
Saqib
13d7043451
fix: column 'outstanding_amount' cannot be null ( #26404 )
2021-07-09 15:33:14 +05:30
Saqib
47ccfd6c9d
fix: column 'outstanding_amount' cannot be null ( #26371 )
2021-07-09 14:36:13 +05:30
Subin Tom
d53991857c
fix: Fixed Budget Variance Graph color from all black to default ( #26368 )
2021-07-09 14:33:00 +05:30
Saqib
f6f924b340
Merge branch 'develop' into asset-credit-note
2021-07-09 10:38:50 +05:30
Saqib
8f3c7ab402
fix: escape quotes while fetching customer emails ( #26329 ) ( #26376 )
2021-07-09 10:35:55 +05:30
GangaManoj
bf245e5e39
fix: Clear Payment Schedule if PI has default Payment Schedule, but linked PO doensn't
2021-07-09 01:44:34 +05:30
GangaManoj
5a62467a3e
feat: Fetch Payment Terms from linked Purchase Order
2021-07-09 00:53:42 +05:30
Rucha Mahabal
3888488b36
fix: precision for expected values in payment entry test
2021-07-08 23:21:48 +05:30
Rucha Mahabal
88929b055c
fix: precision for expected values in payment entry test
2021-07-08 19:27:53 +05:30
Saqib
eaef371585
fix: escape quotes while fetching customer emails ( #26329 )
2021-07-08 10:52:41 +05:30
GangaManoj
cfff3b8726
fix: Test GL Entries made when an Asset is returned
2021-07-07 21:04:20 +05:30
GangaManoj
3a7f25b218
fix: Make functions more readable
2021-07-07 15:59:52 +05:30
Saqib
9910968398
Merge branch 'develop' into enable-discount-accounting
2021-07-07 12:56:11 +05:30
GangaManoj
ca87745be1
fix: Rename get_gl_entries_on_asset_movement to get_gl_entries_on_asset_disposal_and_regain
2021-07-06 23:43:08 +05:30
Nabin Hait
11d56903e7
Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup
...
feat(India): Bootstrapped GST Setup
2021-07-06 21:44:30 +05:30
Deepesh Garg
bd40669dab
Merge pull request #26289 from nemesis189/fixed-budget-variance-report-color
...
fix: Fixed Budget Variance Graph color from all black to default
2021-07-06 20:36:00 +05:30
GangaManoj
3ea4f993b7
feat: Toggle display for discount accounting fields according to enable_discount_accounting
2021-07-06 20:22:13 +05:30
Deepesh Garg
3636efd7e6
Merge pull request #26355 from deepeshgarg007/flaky_test
...
test: Purchase Invoice advance test case
2021-07-06 18:22:26 +05:30
Deepesh Garg
7f794cc0ea
fix: Purchase Invoice advance test case
2021-07-06 17:58:44 +05:30
Deepesh Garg
a62f94379b
Merge pull request #26324 from deepeshgarg007/bank_statement_import_fix_develop
...
fix: Bank statement import
2021-07-06 17:25:21 +05:30
GangaManoj
b08bb1f1a2
feat: Filter list for Discount Account field in Items table
2021-07-06 16:28:19 +05:30
Deepesh Garg
2f3f87dc66
Merge branch 'develop' into multi-company-deferred-revenue_develop
2021-07-06 16:14:25 +05:30
Deepesh Garg
26dc02aa38
Merge branch 'develop' into bank_statement_import_fix_develop
2021-07-06 16:14:13 +05:30
Deepesh Garg
381c05eb87
Merge pull request #26322 from deepeshgarg007/party_dashboard_develop
...
fix: Do not consider cancelled entries in party dashboard
2021-07-06 16:13:49 +05:30
Deepesh Garg
8985231a96
fix: Rewrite tests
2021-07-06 15:34:47 +05:30
Afshan
c8eca8a448
fix: remove cancelled entries in consolidated financial statements ( #26331 )
2021-07-06 14:37:57 +05:30
Afshan
53e3435770
fix: remove cancelled entries in consolidated financial statements ( #26330 )
2021-07-06 14:37:21 +05:30
GangaManoj
cf7579e29f
feat: Create GL Entries for discount accounting
2021-07-06 00:36:06 +05:30
Deepesh Garg
8c1b764a90
fix: Debug tests
2021-07-05 21:49:10 +05:30
GangaManoj
6e0d83d925
feat(Sales Invoice): Add 'Discount Account' field in Items table
2021-07-05 15:09:05 +05:30
GangaManoj
be15e16b84
feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox
2021-07-05 14:58:32 +05:30
Deepesh Garg
ddf87594a1
Merge pull request #26287 from deepeshgarg007/bank_statement_import_fix
...
fix: Bank statement import
2021-07-04 20:34:10 +05:30
Deepesh Garg
9d295ca939
fix: Bank statement import
2021-07-04 20:33:36 +05:30
Deepesh Garg
ea5b7d38bb
Merge pull request #26277 from deepeshgarg007/multi-company-deferred-revenue
...
fix: Auto process deferred accounting for multi-company setup
2021-07-04 20:32:22 +05:30
Deepesh Garg
5069095984
fix: Auto process deferred accounting for multi-company setup
2021-07-04 20:31:37 +05:30
Deepesh Garg
cd036e115b
Merge pull request #26231 from deepeshgarg007/party_dashboard
...
fix: Do not consider cancelled entries in party dashboard
2021-07-04 20:30:34 +05:30
Deepesh Garg
802e63a9d7
fix: Do not consider cancelled entries in party dashboard
2021-07-04 20:29:41 +05:30
Deepesh Garg
63096014a7
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-07-02 20:30:18 +05:30
GangaManoj
f8ee8058e7
fix(Sales Invoice): Reset disposal_date on returning the Asset
2021-07-02 15:45:52 +05:30
GangaManoj
4cf3d9ac20
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
2021-07-02 15:25:04 +05:30
Deepesh Garg
d4146a91d6
Merge pull request #25323 from m1ngaa/patch-1
...
Delete accounts (an empty file)
2021-07-01 23:38:56 +05:30
Subin Tom
d2c86bb9d7
fix: Fixed Budget Variance Graph color from all black to default
2021-07-01 19:59:08 +05:30
Deepesh Garg
ba2c3c776f
fix: Bank statement import
2021-07-01 18:56:51 +05:30
Anuja Pawar
d8bc514226
fix: to fetch the correct field in Tax Rule ( #25927 )
2021-07-01 14:06:01 +05:30
Nabin Hait
fa006402b8
fix: merge conflict
2021-07-01 12:47:28 +05:30
Deepesh Garg
68c697b354
fix: Auto process deferred accounting for multi-company setup
2021-07-01 09:31:31 +05:30
Deepesh Garg
cf7af62b05
fix: Code cleanup
2021-06-30 14:14:32 +05:30
GangaManoj
d748e7f49c
fix: Create common function for fetching conversion rate details of linked docs
2021-06-28 22:39:43 +05:30
GangaManoj
506d5ac3d5
fix: Make exchange rate handling more efficient
2021-06-28 22:39:43 +05:30
GangaManoj
8f52db788a
fix(Purchase Invoice): Improve test for exchange rate difference handling
2021-06-28 22:39:41 +05:30
GangaManoj
3f5e7bf6d7
fix(Purchase Invoice): Fetch Purchase Receipt details using a function
2021-06-28 22:38:59 +05:30
GangaManoj
206313d69b
fix(Purchase Invoice): Add test for exchange rate difference handling
2021-06-28 22:02:20 +05:30
GangaManoj
6233eaa3bb
fix(Purchase Invoice): Fix condition
2021-06-28 22:00:49 +05:30
GangaManoj
785a71dcd2
fix(Purchase Invoice): Resolve difference caused by change in exchange rate
2021-06-28 22:00:49 +05:30
Saqib
4277e4c94b
fix: unreachable test case ( #26234 )
2021-06-28 19:10:46 +05:30
Deepesh Garg
7d7d797ffc
fix: Do not consider cancelled entries in party dashboard
2021-06-28 11:24:32 +05:30
Deepesh Garg
ebc46c1e09
fix: Update account heads in GST test cases
2021-06-28 10:52:38 +05:30
Deepesh Garg
cf445eb7b4
fix: Add validate bank account method back
2021-06-26 23:59:47 +05:30
Subin Tom
43f85a2877
fix: changed profitability analysis report width ( #26165 )
2021-06-25 11:38:11 +05:30
Deepesh Garg
dce2676f7a
Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax
2021-06-24 21:08:57 +05:30
Deepesh Garg
c151c67d97
fix: Flaky test
2021-06-24 21:08:19 +05:30
Deepesh Garg
970d2af7ad
Merge pull request #26211 from deepeshgarg007/include_dimension_filter
...
fix: Account filter not working with accounting dimension filter
2021-06-24 19:55:12 +05:30
Deepesh Garg
1564d39bf4
Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13
...
fix: Taxes on Internal Transfer payment entry
2021-06-24 19:51:48 +05:30
Deepesh Garg
e3ca177828
fix: Remove debug flag
2021-06-24 19:51:23 +05:30
Deepesh Garg
bdba29bab5
fix: Account filter not working with accounting dimension filter
2021-06-24 19:48:11 +05:30
Saqib
3b5978cdb8
Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix
...
fix: purchase receipt gl entries with same item code
2021-06-24 19:29:08 +05:30
Deepesh Garg
9382b1f154
fix: Flaky test
2021-06-24 19:03:22 +05:30
Anuja Pawar
a50196bcd9
fix: dunning permission error in payment entry ( #26204 )
2021-06-24 18:25:16 +05:30
Saqib Ansari
1ca8f6a51d
fix: purchase receipt gl entries with same item code
2021-06-24 17:41:44 +05:30
Saqib
c10fea8a59
Merge branch 'develop' into pr-item-gl-fix
2021-06-24 17:39:36 +05:30
Deepesh Garg
e693cceb58
Merge pull request #26132 from noahjacob/shipping_address_fix
...
fix: fetch preferred shipping address
2021-06-24 17:31:21 +05:30
Noah Jacob
dbdf2515cd
fix: fetches correct preferred shipping address
2021-06-24 17:06:18 +05:30
Nabin Hait
5b462ad11a
fix: merge conflict
2021-06-24 15:36:51 +05:30
Nabin Hait
c1954ec72a
Merge pull request #26195 from deepeshgarg007/deferred_revenue_error
...
fix: Error while booking deferred revenue
2021-06-24 15:35:02 +05:30
Deepesh Garg
f79a72dbf3
fix: Error while booking deferred revenue
2021-06-24 14:49:09 +05:30
Deepesh Garg
ca2e914715
fix: Error while booking deferred revenue
2021-06-24 14:14:46 +05:30
Deepesh Garg
ab7a16a952
Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop
...
fix: Billing address not fetched in Purchase Invoice
2021-06-24 12:13:17 +05:30
Deepesh Garg
9d8e8f8bdf
fix: Do not show received amount after tax for internal tarnsfers
2021-06-24 12:02:39 +05:30
Deepesh Garg
bd9317956b
fix: Taxes on Internal Transfer payment entry
2021-06-24 12:02:32 +05:30
Ganga Manoj
604f0b8f01
fix: message on successful creation of opening invoices ( #25998 )
2021-06-24 11:04:27 +05:30
Deepesh Garg
03b629c851
Merge pull request #26100 from deepeshgarg007/pi_billing_address
...
fix: Billing address not fetched in Purchase Invoice
2021-06-24 10:29:01 +05:30
Deepesh Garg
7bef18f3d8
fix: Remove unintentional changes
2021-06-24 10:28:25 +05:30
Deepesh Garg
c8a6b31f06
Merge branch 'develop' of https://github.com/frappe/erpnext into pi_billing_address_develop
2021-06-24 10:27:16 +05:30
Deepesh Garg
da7f45130b
fix: Billing address not fetched in Purchase Invoice
2021-06-24 10:25:24 +05:30
Noah Jacob
b4b6288596
fix: fetches correct preferred shipping address
2021-06-23 17:05:44 +05:30
GangaManoj
88348e2da7
fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset
2021-06-23 11:57:53 +05:30
Deepesh Garg
e8817f97d6
Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width
...
fix: Changed profitability analysis report width
2021-06-23 11:36:43 +05:30
Deepesh Garg
673470705b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-06-23 11:33:15 +05:30
GangaManoj
32d7b1f6ad
fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets
2021-06-23 11:24:05 +05:30
Saqib
46ae97dfd3
Merge branch 'develop' into pr-item-gl-fix
2021-06-23 11:02:48 +05:30
Saqib
5a824cad81
fix: cannot cancel payment entry if linked with invoices ( #26075 )
2021-06-23 11:02:05 +05:30
GangaManoj
8127208774
fix(Sales Invoice): Reset Asset status on issuing Credit Note
2021-06-22 23:12:56 +05:30
GangaManoj
721ff9438a
Merge branch 'develop' into asset-credit-note
2021-06-22 22:45:11 +05:30
Deepesh Garg
7b0d86ead5
fix: Do not show received amount after tax for internal tarnsfers
2021-06-22 20:38:35 +05:30
Deepesh Garg
2af8c171c1
fix: Taxes on Internal Transfer payment entry
2021-06-22 19:48:08 +05:30
Subin Tom
a446d61e10
fix: Changed profitability analysis report width
2021-06-22 16:51:15 +05:30
GangaManoj
d0d5fedd48
fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset
2021-06-22 00:22:08 +05:30
GangaManoj
5b07e58412
fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice
2021-06-21 23:51:09 +05:30
GangaManoj
600333875a
fix(Sales Invoice): Let item.asset be copied on duplicating the doc
2021-06-21 23:41:35 +05:30
Afshan
127d637b3d
fix: check for duplicate payment terms in Payment Term Template ( #25999 )
2021-06-21 11:24:45 +05:30
Saqib Ansari
d329e27346
Merge branch 'develop' of https://github.com/frappe/erpnext into pr-item-gl-fix
2021-06-21 11:18:45 +05:30
Saqib
fb89008a13
fix(pos): unsupported operand type -=: for 'float' and 'NoneType' ( #26097 )
2021-06-21 10:49:09 +05:30
Saqib
7ff19ebec8
fix(pos): unsupported operand type -= for 'float' and 'NoneType' ( #26096 )
2021-06-21 10:48:50 +05:30
Saqib Ansari
99531a35e0
fix(pos): unsupported operand type -= for 'float' and 'NoneType'
2021-06-21 10:47:23 +05:30
Rohit Waghchaure
110e152fa3
fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice
2021-06-20 15:28:23 +05:30
Rohit Waghchaure
7b7ceaadd9
feat: subcontract code refactor and enhancement
2021-06-20 15:27:01 +05:30
Rohit Waghchaure
5cc3f14506
fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice
2021-06-19 23:16:23 +05:30
Rohit Waghchaure
a94b89727c
feat: subcontract code refactor and enhancement
2021-06-19 23:16:22 +05:30
Anuja Pawar
b066fe9519
fix: insufficient permission for dunning error ( #26092 )
2021-06-18 11:29:07 +05:30
Saqib
cceabff6e1
Merge branch 'develop' into pr-item-gl-fix
2021-06-18 11:24:54 +05:30
Deepesh Garg
a58b571ccb
fix: Billing address not fetched in Purchase Invoice
2021-06-18 10:45:35 +05:30
Deepesh Garg
d3ccb024f8
Merge pull request #26078 from nemesis189/fixed-label-rate-for-purchase-invoice-item-v13
...
fix: removed extra space from label rate
2021-06-17 17:19:17 +05:30
Saqib Ansari
61675f1a43
fix: purchase receipt gl entries with same item code
2021-06-17 13:05:43 +05:30
Deepesh Garg
913e92c29f
Merge pull request #26044 from GangaManoj/account-multiselect-gl
...
feat(General Ledger): Implement multi-account selection
2021-06-16 22:33:50 +05:30
Subin Tom
6f9de8c86f
fix: removed extra space from label rate
2021-06-16 20:01:29 +05:30
Subin Tom
c03a947e98
fix: removed extra space from label rate
2021-06-16 19:47:55 +05:30
GangaManoj
41b7c1aec0
fix(General Ledger): Improve account filter
2021-06-16 14:40:14 +05:30
Afshan
3b1b4684ba
fix: check for duplicate payment terms in Payment Term Template ( #26003 )
2021-06-16 14:30:45 +05:30
Saqib
60ce00531d
fix: label for enabling ledger posting of change amount ( #26070 )
2021-06-16 14:25:55 +05:30
GangaManoj
86f689e54a
fix(General Ledger): Get account_currency accurately
2021-06-16 14:23:02 +05:30
Deepesh Garg
d70c6996f2
Merge pull request #25951 from nextchamp-saqib/invoice-opening-pnl-validation
...
fix: opening invoices can alter profit and loss of a closed year
2021-06-16 10:52:40 +05:30
GangaManoj
53a9ac4466
fix(General Ledger): Condense account_conditions
2021-06-16 04:10:29 +05:30
GangaManoj
79dc0f0afc
fix: Remove console.log()
2021-06-16 03:37:11 +05:30
Deepesh Garg
fb9cb78980
Merge pull request #26045 from GangaManoj/filter-cc-project
...
fix(General Ledger): Filter Cost Center and Project drop-down lists by Company
2021-06-15 21:18:49 +05:30
Nabin Hait
0950481253
fix: merge conflict
2021-06-15 20:18:06 +05:30
Deepesh Garg
95bc141531
Merge pull request #26056 from deepeshgarg007/gst_taxtable_value_with_discount_v13
...
fix(India): Taxable value for invoices with additional discount
2021-06-15 12:05:16 +05:30
Deepesh Garg
433815daba
fix: Update einvoice json test
2021-06-14 20:43:51 +05:30
Deepesh Garg
5149101045
Merge pull request #26037 from deepeshgarg007/payment_entry_auto_tax_fixes
...
fix: Auto tax calculations in Payment Entry
2021-06-14 20:39:41 +05:30
Deepesh Garg
ac52daa14f
fix: Import throw
2021-06-14 20:09:23 +05:30
Deepesh Garg
5ef9a62917
fix: Add separate function to validate payment entry taxes
2021-06-14 20:09:17 +05:30
Deepesh Garg
302855e160
fix: Auto tax calculations in Payment Entry
2021-06-14 20:09:10 +05:30
Deepesh Garg
cf1fc40b06
Merge pull request #25906 from deepeshgarg007/gst_taxtable_value_with_discount
...
fix(India): Taxable value for invoices with additional discount
2021-06-14 17:11:08 +05:30
GangaManoj
75b30efb05
fix(General Ledger): Filter Project drop-down list by Company
2021-06-14 16:42:27 +05:30
GangaManoj
27ec51f021
fix(General Ledger): Filter Cost Center drop-down list by Company
2021-06-14 16:41:56 +05:30
Deepesh Garg
9eac4d0af6
fix: Import throw
2021-06-14 14:44:19 +05:30
Deepesh Garg
8718013c96
fix: Add separate function to validate payment entry taxes
2021-06-14 14:34:44 +05:30
GangaManoj
0511ffcf30
fix(General Ledger): Implement multi-account selection
2021-06-14 13:22:44 +05:30
Deepesh Garg
856484aeb0
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount
2021-06-14 11:29:41 +05:30
Deepesh Garg
580346360f
fix: Auto tax calculations in Payment Entry
2021-06-14 11:16:39 +05:30
Rucha Mahabal
17550fb4bf
feat: add Inactive status to Employee
2021-06-12 13:36:47 +05:30
Rucha Mahabal
efd7d584b2
feat: add Inactive status to Employee
2021-06-12 13:34:20 +05:30
Rucha Mahabal
a38147a8ba
feat: add Inactive status to Employee
2021-06-12 13:33:21 +05:30
Ankush Menat
9891780f5a
perf(minor): remove unnecessary comprehensions (port #25645 )
2021-06-11 18:40:22 +05:30
Ankush Menat
a9c84f749a
perf(minor): remove unnecessary comprehensions ( #25645 )
2021-06-11 16:00:48 +05:30
Nabin Hait
d17217c4e2
Merge pull request #25831 from deepeshgarg007/tds_advance_payment_v13
...
feat: Tax deduction against advance payments
2021-06-10 20:25:30 +05:30
Deepesh Garg
48f2839079
fix: Sort account balances by account name
2021-06-10 19:00:50 +05:30
Deepesh Garg
3b34fc4cce
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-10 18:57:31 +05:30
Deepesh Garg
5434dd048b
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into dynamic_gst_rates
2021-06-10 18:56:39 +05:30
Deepesh Garg
a5c3427293
fix: Sort account balances by account name
2021-06-10 18:09:49 +05:30
Deepesh Garg
882913ca4e
Merge pull request #26000 from GangaManoj/gst-settings-card
...
fix: Only display GST card in Accounting Workspace if it's in India
2021-06-10 12:46:15 +05:30
Deepesh Garg
d063f9a5d1
fix: GL Entry ordering
2021-06-10 12:26:21 +05:30
GangaManoj
076bd5eaab
fix: Only display GST card in Accounting Workspace if it's in India
2021-06-10 12:08:44 +05:30
Deepesh Garg
701cba7f03
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gst_taxtable_value_with_discount
2021-06-10 12:04:38 +05:30
Deepesh Garg
edecd5b0c6
fix: Update einvoice json test
2021-06-10 12:04:30 +05:30
Deepesh Garg
0b5fe1b5eb
fix: Failing test case
2021-06-10 10:34:49 +05:30
Deepesh Garg
911818a9e2
fix: Add multiple fixes
2021-06-09 22:55:10 +05:30
Saqib
42557c4ad3
feat: cost-center wise period closing entry ( #25766 )
2021-06-09 19:48:31 +05:30
Saqib
26f0609390
feat: enable/disable gl entry posting for change given in pos ( #25822 )
2021-06-09 19:47:28 +05:30
Deepesh Garg
9e648183db
fix: Test case
2021-06-09 18:26:16 +05:30
Deepesh Garg
7dabb6be30
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 18:10:55 +05:30
Deepesh Garg
b57ebba3fd
fix: Validate negative allocated amount in Payment Entry ( #25799 )
2021-06-09 17:56:41 +05:30
Deepesh Garg
4c1dad8207
fix: Debug tests
2021-06-09 14:18:23 +05:30
Deepesh Garg
8090965162
fix: Debug test
2021-06-09 13:45:42 +05:30
Deepesh Garg
758db793be
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-09 13:39:07 +05:30
Anupam Kumar
21b8e2f0d8
fix: hiding Rounding Adjustment field ( #25380 )
...
* fix: hiding Rounding Adjustment field
* fix: updating purchase_invoice.json
2021-06-09 12:57:21 +05:30
Deepesh Garg
e4fcc5562f
refactor: Advance taxes and charges calculation
2021-06-08 16:35:47 +05:30
Anuja Pawar
d4398fd84a
fix: update cost center from pos ( #25971 )
2021-06-07 16:20:21 +05:30
Deepesh Garg
6f2dacc60c
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into tds_advance_payment_v13
2021-06-06 19:31:50 +05:30
Deepesh Garg
18be767f75
fix: Remove invalid test
2021-06-06 13:25:34 +05:30
Saqib
d689068d82
Merge pull request #25928 from nextchamp-saqib/pos-fixes-8
...
fix(pos): multiple pos issues
2021-06-06 11:25:29 +05:30
Deepesh Garg
e8a78bd43d
fix: Add test cases
2021-06-05 13:16:39 +05:30
Saqib
c6e016e545
fix: wrong round off gl entry posted in case of purchase invoice ( #25775 )
2021-06-04 10:08:22 +05:30
Saqib Ansari
48036b4bab
fix: invoices can alter profit and loss of a closed year
2021-06-04 09:54:34 +05:30
Saqib Ansari
81b9a5ee47
fix(pos): cannot cancel consolidated sales invoice
2021-06-03 12:59:09 +05:30
Deepesh Garg
ca34eec2d6
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-06-02 13:26:27 +05:30
Fisher Yu
865663857c
fix: chart of accounts importer always error ( #25882 )
...
* fix: chart of accounts importer always error
chart of accounts importer always error Parent Account Missing
* Update chart_of_accounts_importer.py
2021-06-01 12:15:58 +05:30
Deepesh Garg
2f5885627d
fix: Labeling and other fixes
2021-06-01 11:07:18 +05:30
Ganga Manoj
908b0090e9
fix: Create POS Invoice for Product Bundles ( #25847 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-05-31 19:49:03 +05:30
Nabin Hait
a3d1b6973a
fix: merge conflict
2021-05-31 11:21:33 +05:30
Saqib
89f621baa4
fix(pos): closing entry shows incorrect expected amount ( #25868 )
2021-05-31 09:56:49 +05:30
Deepesh Garg
48b1a82fa1
fix: Add accounts and templates for reverse charge
2021-05-29 23:54:51 +05:30
Rucha Mahabal
05d5fb24f7
fix(test): tax detail report ( #25884 )
2021-05-29 23:18:36 +05:30
Deepesh Garg
ea4f8102e8
Merge pull request #25869 from nextchamp-saqib/plaid-link-reset
...
fix(plaid): cannot reset plaid link for a bank account
2021-05-29 20:05:25 +05:30
Deepesh Garg
fb9cb0fd23
Merge pull request #25866 from deepeshgarg007/itc_reversa_address
...
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 18:46:09 +05:30
Saqib Ansari
05386ff12f
chore: remove unwanted method
2021-05-28 12:58:18 +05:30
Deepesh Garg
b084f1d320
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 12:14:56 +05:30
Deepesh Garg
20be7fb93d
fix(India): Show only company addresses for ITC reversal entry
2021-05-28 11:57:38 +05:30
Saqib Ansari
bbce2e91a3
fix: reset plaid link button
2021-05-28 11:56:47 +05:30
Saqib Ansari
d24eccd623
fix(plaid): cannot reset plaid link for a bank account
2021-05-28 11:36:24 +05:30
Suraj Shetty
96542c3d04
style: Fix sider issues
2021-05-28 09:10:34 +05:30
Suraj Shetty
a891d6eed2
fix: allow_zero_valuation_rate for rejected qty
2021-05-28 09:10:33 +05:30
Suraj Shetty
19c5fd72d6
refactor: Rename assertEquals to assertEqual to avoid deprecation warnings
2021-05-28 09:10:33 +05:30
Suraj Shetty
ab8816e11d
test: Fix test dependency
2021-05-28 09:09:36 +05:30
Suraj Shetty
232cd28d67
test: Fix dependencies
2021-05-28 09:07:57 +05:30
Suraj Shetty
7b74985a54
test: Fix test_dependencies
2021-05-28 09:07:57 +05:30
Deepesh Garg
a150645b57
fix: Remove GL Entry from print
2021-05-27 20:10:50 +05:30
Deepesh Garg
2e83cb77ca
fix: Split GL Entry
2021-05-27 20:09:45 +05:30
Deepesh Garg
4311fdc3a1
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-05-27 17:49:23 +05:30
Deepesh Garg
740c68d075
fix: Debug Test
2021-05-27 17:43:53 +05:30
Anuja P
753e5894de
fix: ageing error in PSOA
2021-05-27 17:33:22 +05:30
Anuja P
bb0a40b995
fix: ageing error in PSOA
2021-05-27 17:15:47 +05:30
Deepesh Garg
ea18230274
fix: Update GL Entry ordering
2021-05-27 16:40:37 +05:30
Deepesh Garg
be3671fe7b
fix: Create new supplier for test case
2021-05-27 13:27:17 +05:30
Marica
477a90e2ac
Merge pull request #25833 from ankush/translation_fixes
...
fix(ux): fix unstranslated text in msgprint/throw
2021-05-26 14:12:36 +05:30
Deepesh Garg
5e27c7dae2
fix: Add non group filter for account
2021-05-25 22:34:58 +05:30
Deepesh Garg
8fddd0f0c1
fix: Update TDS rate for test
2021-05-25 22:03:50 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw
2021-05-25 20:59:20 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts ( #25714 )
2021-05-25 20:39:17 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions ( #25654 )
2021-05-25 19:16:02 +05:30
Deepesh Garg
55a3fb57dd
fix: Linting Issues
2021-05-25 17:40:06 +05:30
Deepesh Garg
6f84cee6fe
fix: Uncommentt test
2021-05-25 17:39:06 +05:30
Deepesh Garg
b07f7d1b70
fix: Linting and other fixes
2021-05-25 17:39:04 +05:30
Deepesh Garg
c9da1fc568
chore: Test case for adance TDS allocation
2021-05-25 17:37:17 +05:30
Deepesh Garg
a23aaf43f4
fix: Allocate advance taxes only for payment entry
2021-05-25 17:36:06 +05:30
Deepesh Garg
e2f83ffaa4
fix: Linting fixes and other checks
2021-05-25 17:35:41 +05:30
Deepesh Garg
77dcee9d67
fix: Test Cases
2021-05-25 17:35:15 +05:30
Deepesh Garg
fd380d34f9
fix: Linting errors
2021-05-25 17:35:05 +05:30
Deepesh Garg
a87e3fcb7c
fix: TDS report cleanup
2021-05-25 17:34:45 +05:30
Deepesh Garg
79b422c0a9
fix: Advance TDS in TDS payable monthly report
2021-05-25 17:33:59 +05:30
Deepesh Garg
d18dde7757
fix: Add tds in PO and code cleanup
2021-05-25 17:32:28 +05:30
Deepesh Garg
c26de28613
fix: TDS against Purhase Orders
2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af
feat: Tax deduction against advance payments
2021-05-25 17:20:52 +05:30
Deepesh Garg
c9aa726818
feat: Tax deduction against advance payments
2021-05-25 17:17:40 +05:30
Deepesh Garg
09d9bd19ac
Merge pull request #25816 from deepeshgarg007/jv_diff_ignore_v13
...
fix: Ignore rounding diff while importing JV using data import
2021-05-25 10:59:50 +05:30
rohitwaghchaure
bc7c5bfbe2
Merge pull request #25817 from rohitwaghchaure/fix-removed-serial-no-validate-for-sales-invoice
...
fix: removed serial no validation for sales invoice
2021-05-25 10:40:46 +05:30
Rohit Waghchaure
b4f0347c02
fix: removed serial no validation for sales invoice
2021-05-24 23:39:25 +05:30
Deepesh Garg
7c0383a9a6
Merge pull request #25815 from deepeshgarg007/cash_flow_mapper_v13
...
fix: Cashflow mapper not showing data
2021-05-24 20:40:07 +05:30
Deepesh Garg
25112244ed
fix: Ignore rounding diff while importig JV using data import
2021-05-24 20:01:21 +05:30
Deepesh Garg
c348215f61
fix: Cashlfow mapper not showing data
2021-05-24 19:57:53 +05:30
Deepesh Garg
63e4ab4f2d
Merge pull request #25777 from Anuja-pawar/fix-process-SOA-format
...
fix: Process Statement of Accounts formatting
2021-05-24 19:55:21 +05:30
Saqib
b6d061fa8c
fix(pos): handle db lock timeout error while pos closing ( #25813 )
2021-05-24 18:22:03 +05:30
Nabin Hait
9b912b6adc
Merge branch 'version-13' into develop
2021-05-24 16:45:27 +05:30
Saqib
6368c976c7
fix: expected amount in pos closing payments table ( #25737 )
2021-05-24 16:44:38 +05:30
Suraj Shetty
540c82712a
Merge pull request #25803 from surajshetty3416/fix-extend-cscript
2021-05-23 13:39:09 +05:30
Rucha Mahabal
59961f70ee
refactor: timesheet
2021-05-22 10:21:04 +05:30
Suraj Shetty
3e6cc5037b
fix: Remove unnecessary code
2021-05-21 17:37:19 +05:30
Suraj Shetty
81d49e9c71
fix: Use extend_cscript function to properly extend class methods to cscript
2021-05-21 17:03:09 +05:30
Saqib
0b5e340b6e
fix(pos): return case for item with available qty equal to one ( #25760 )
2021-05-21 16:32:56 +05:30
Anuja P
605ea044f3
fix: update process SOA format
2021-05-21 11:24:33 +05:30
Rucha Mahabal
722cfdb7e5
Merge pull request #25701 from anupamvs/timesheet-refactor
...
refactor: timesheet
2021-05-20 23:43:19 +05:30
Rucha Mahabal
a7d0dbb085
fix: calculate total billing amount on fetching timesheets
...
- show timesheet billing amounts in doc currency
2021-05-20 23:02:11 +05:30
Deepesh Garg
42e0692a81
Merge pull request #25704 from CaseSolvedUK/workspace-onlyfor-v13
...
fix: filter for Indian workspace card
2021-05-20 17:10:29 +05:30
Deepesh Garg
9de1a45185
Merge pull request #25699 from Anuja-pawar/fix_process_statement_report
...
fix: Process Statement of Accounts formatting
2021-05-19 19:21:43 +05:30
Saqib Ansari
f79ef5d8cf
fix: missing cost center message on creating gl entries
2021-05-19 13:04:44 +05:30
Deepesh Garg
d15d0d8568
Merge pull request #25254 from CaseSolvedUK/taxdetail-v13
...
feat: Tax Detail Report
2021-05-18 22:45:29 +05:30
Saqib
8d7d4b0ba7
fix: expected amount in pos closing payments table ( #25737 )
2021-05-18 18:39:35 +05:30
Marica
5da34bddd6
Merge pull request #25731 from ankush/escaping_company_name
...
fix: escape company name
2021-05-18 16:35:19 +05:30
Suraj Shetty
a83d2aacd9
Merge branch 'develop' into esbuild
2021-05-18 14:48:28 +05:30
Ankush Menat
b6783b158f
chore: translation fixes
2021-05-17 17:06:41 +05:30
Ankush Menat
f3b3d81e0b
fix: escape company name in deferred_revenue
2021-05-17 17:06:41 +05:30
Nabin Hait
8b2fef11b1
fix: merge conflict
2021-05-17 11:37:14 +05:30
Deepesh Garg
87baa646e7
Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports
...
feat: Dimension-wise Accounts Balance Report
2021-05-16 18:04:01 +05:30
Anupam
35137ba9e0
removing currency filter and added rate conversion while fetching timesheets in SI
2021-05-16 14:17:56 +05:30
Anupam
fd4743cc31
refactor: timesheet
2021-05-15 20:01:17 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes ( #25249 )
...
* fix: RCM tax calculation
* feat(India): ITC Reversal via Journal Entry
* fix: Reverse Charge booking logic and validation
* fix: Addd patch for availed ITC fields
* fix: Hooks method to update availed ITC field
* fix: Cleanup and fixes in GSTR3B report
* fix: Update params in GSTR-1 report
* fix: Debit note using Sales Invoice
* fix: Setup and patch
* fix: GSTR 3B report cleanup and updates
* fix: Add method to get invoices liable to reverse charge
* fix: Add taxable value in Purchase Invoice Item
* fix: Inward supplies liable to reverse charge
* fix: Linting issues
* fix: GSTR3B report test
2021-05-14 12:17:41 +05:30
casesolved-co-uk
6ab46e288f
fix: workspace formatting due to manual edit and filter tweaks
2021-05-13 12:56:02 +00:00
casesolved-co-uk
d5256b60d4
fix: lint
2021-05-13 12:53:11 +00:00
casesolved-co-uk
6998786055
fix: use correct fiscal year function in testing
2021-05-13 12:53:11 +00:00
casesolved-co-uk
cf5b57bfac
fix: only load data for tests that need it
2021-05-13 12:53:11 +00:00
casesolved-co-uk
68a31d3d0d
fix: fiscal year error
2021-05-13 12:53:11 +00:00
casesolved-co-uk
75ebfbdaf3
fix: fiscal year test case issue
2021-05-13 12:53:11 +00:00
casesolved-co-uk
89fcdf3226
fix: exclude rounding GL Entries from invoice tax lines
2021-05-13 12:53:11 +00:00
casesolved-co-uk
06e31e5d7d
fix: Test data for empty db
2021-05-13 12:53:11 +00:00
casesolved-co-uk
391dc45964
chore: fix sider
2021-05-13 12:53:11 +00:00
casesolved-co-uk
7555f5f613
fix: add to workspace and fix lint
2021-05-13 12:53:11 +00:00
casesolved-co-uk
77ffa6b1f6
feat: add test case for report output
2021-05-13 12:53:11 +00:00
casesolved-co-uk
2cb0da8780
fix: rewrite to allow referring to existing sections and reduce to single amount column
2021-05-13 12:53:10 +00:00
casesolved-co-uk
1c37390899
fix: Change & simplify query to cater for zero rate tax entries
2021-05-13 12:53:10 +00:00
casesolved-co-uk
442a0de094
fix: finalise query, fix bugs, put Add Columns back
2021-05-13 12:53:10 +00:00
casesolved-co-uk
ece00287ea
Refactor for Journal Entries (payroll)
2021-05-13 12:53:10 +00:00
casesolved-co-uk
3027cc7da6
fix: minor bug and tidy
2021-05-13 12:53:10 +00:00
casesolved-co-uk
5d9217ab29
fix: minor bugs and improvements
2021-05-13 12:53:10 +00:00
casesolved-co-uk
8e413651c2
fix: major refactor to monkey-patch into the QueryReport class
2021-05-13 12:53:10 +00:00
casesolved-co-uk
dba4b3cd13
feat: add run mode, add tests, various fixes
2021-05-13 12:53:10 +00:00
Richard Case
ef8ab135c9
develop: progress tax detail report
2021-05-13 12:53:10 +00:00
casesolved-co-uk
a5d47f70b8
Fleshed out report setup functionality
2021-05-13 12:53:10 +00:00
casesolved-co-uk
3503598735
Initial commit of Tax Detail report and report builder
2021-05-13 12:53:10 +00:00
casesolved-co-uk
aca8c34c4d
fix: filter for Indian workspace card
2021-05-13 12:11:41 +00:00
Mohammad Hasnain Mohsin Rajan
e85770fe3f
fix: bank statement import via google sheet ( #25676 )
...
* fix: google sheet bank statement import
* fix: quotes
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
* chore: add translation
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
* chore: grammar
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
* fix: remove comment
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-05-13 17:33:18 +05:30
Mohammad Hasnain Mohsin Rajan
7c6de1a8ac
fix: bank statement import via google sheet ( #25677 )
...
* fix: change links in workspace
* fix: google sheet bank statement import
* chore: quotes
* fix: capitalization
* fix: typo
* chore: add translation
2021-05-13 17:28:49 +05:30
Anuja Pawar
b28889c6f7
Merge branch 'develop' into fix_process_statement_report
2021-05-13 16:23:06 +05:30
Deepesh Garg
8e748f8451
fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet
2021-05-13 15:21:51 +05:30
Anuja P
e90a2a346b
fix: update new changes
2021-05-13 15:15:47 +05:30
Deepesh Garg
95e05fbdac
fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet
2021-05-13 14:59:28 +05:30
Anuja P
554c91d638
fix: solved conflicts
2021-05-13 14:48:38 +05:30
Anuja P
ab1ae418cc
fix: Process SOA enhancement
2021-05-13 14:26:27 +05:30
Suraj Shetty
75909f061c
Merge branch 'develop' into parallel-distributed-testing
2021-05-12 18:14:49 +05:30
rohitwaghchaure
4fbabb4132
Merge pull request #25679 from rohitwaghchaure/fixed-new-fields-not-added
...
fix: updated modified time in purchase invoice to pull new fields
2021-05-12 16:40:23 +05:30
rohitwaghchaure
4ec0656f64
Merge pull request #25678 from rohitwaghchaure/fixed-new-fields-not-added-pre
...
fix: updated modified time in purchase invoice to pull new fields
2021-05-12 16:39:35 +05:30
Rohit Waghchaure
aaca8335f0
fix: updated modified time to pull new fields
2021-05-12 16:36:25 +05:30
Rohit Waghchaure
9f017a351b
fix: updated modified time to pull new fields
2021-05-12 16:35:19 +05:30
Mohammad Hasnain Mohsin Rajan
e7a2fdd81a
fix: change links in workspace ( #25674 )
2021-05-12 13:02:32 +05:30
Mohammad Hasnain Mohsin Rajan
dd1822ef58
fix: change links in workspace ( #25673 )
2021-05-12 13:01:53 +05:30
Mohammad Hasnain Mohsin Rajan
af8436d0dc
fix: change links in workspace ( #25670 )
2021-05-12 13:01:03 +05:30
Deepesh Garg
d2520680bc
fix: Error on applying TDS without party ( #25632 )
...
* fix: Error on applying TDS without party
* fix: Add placeholder value
2021-05-10 21:17:06 +05:30
Suraj Shetty
b3fadebb41
style: Fix sider issues
2021-05-10 20:49:07 +05:30
Suraj Shetty
a132de42ca
fix: allow_zero_valuation_rate for rejected qty
2021-05-10 17:25:21 +05:30
Suraj Shetty
ec6b652cd4
refactor: Rename assertEquals to assertEqual to avoid deprecation warnings
2021-05-10 09:18:25 +05:30
Suraj Shetty
2ac27d774d
test: Fix test dependency
2021-05-09 14:38:28 +05:30
Suraj Shetty
80aa8a3149
Merge branch 'develop' of github.com:frappe/erpnext into parallel-distributed-testing
2021-05-08 11:28:27 +05:30
Alan
c6dc9eaf2e
feat!: add pick batch button ( #25413 )
...
* feat!: add pick batch button
BREAKING CHANGE: replaces setup_serial_no with setup_serial_or_batch_no.
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* refactor: use setup_serial_or_batch_no instead of setup_serial_no
* style: add sider review changes
* refactor: make consice, extract function
* refactor: camel to snake casing
2021-05-07 20:30:04 +05:30
Ankush Menat
90e671905a
chore: replace assertEquals with alias assertEqual ( #25613 )
...
* chore: replace assertEquals with alias assertEqual
assertEquals has been deprecated.
ref: https://docs.python.org/3/library/unittest.html#deprecated-aliases
* chore: sider fixes
2021-05-07 20:28:51 +05:30
Faris Ansari
69eb6d476e
Merge remote-tracking branch 'upstream/develop' into esbuild
2021-05-07 15:21:33 +05:30
Faris Ansari
464d838447
fix: Update bundle paths
2021-05-07 14:53:42 +05:30
Saqib
27cf19a19f
feat(pos): show POS reserved stock in stock projected qty report ( #25593 )
...
* feat(pos): consider POS reserved stock in stock projected qty report
* chore: remove unwanted string formats
2021-05-07 13:37:42 +05:30
HENRY Florian
3ecd7ac4c7
fix: Add french chart accounts with account number ( #25009 )
...
* fix: Add french chart accounts with account number
* fix actual franch plan
2021-05-07 13:33:12 +05:30
Umair Sayed
7f79d463f6
fix: Stock and Accounts Settings form refactor ( #25534 )
...
* stock and accounts settings page
* fix: Stock and accounts settings page cleanup
Co-authored-by: Umair Sayed <umairsayed@Umairs-MacBook-Air.local>
2021-05-07 12:28:57 +05:30
Shariq Ansari
735fbdc350
fix: Updating Standard Notification's channel field ( #25564 )
2021-05-07 12:26:32 +05:30
Deepesh Garg
00e00e4e90
fix: Report summary showing inflated values when values are accumulated in Group Company ( #25577 )
...
* fix: Report summary showing inflated values when values are accumullated in Group Company
* fix: Remove extra space
* fix: Translate strings
* fix: Remove unintended changes
2021-05-07 12:16:44 +05:30
Alan
0e0de6baa1
fix: prevent spurious defaults for items when making prec from dnote ( #25559 )
...
* fix: prevent spurious defaults for items when making prec from dnote
* refactor: make concise, use dict comp
2021-05-07 11:40:02 +05:30
Nabin Hait
7481f54e0c
Merge branch 'version-13' into develop
2021-05-06 19:18:18 +05:30
Nabin Hait
0e41295c0e
perf: Performance enhancement on setup wizard ( #25606 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:14:06 +05:30
Nabin Hait
134eaa5786
perf: Performance enhancement on setup wizard ( #25605 )
...
* perf: Performance enhancement on setup wizard
* fix: create departments without updating nsm
2021-05-06 19:13:54 +05:30
Suraj Shetty
bdf8c528f1
test: Fix dependencies
2021-05-06 18:37:14 +05:30
Suraj Shetty
c5430afe2d
test: Fix test_dependencies
2021-05-06 17:44:26 +05:30
Saqib
92cefd5655
feat(pos): ability to retry on pos closing failure ( #25604 )
...
* feat(pos): ability to retry on pos closing failure
* fix: sider issues
* fix: sider issues
* fix: mark all queued closing entry as failed
* feat: add headline message
2021-05-06 17:03:16 +05:30
Saqib
900a8fb21a
feat(pos): ability to retry on pos closing failure ( #25595 )
...
* feat(pos): ability to retry on pos closing failure
* fix: sider issues
* fix: sider issues
* fix: mark all queued closing entry as failed
* feat: add headline message
2021-05-06 17:02:47 +05:30
Deepesh Garg
9dd0a26e92
Merge pull request #25598 from deepeshgarg007/payment_reco_invoice_fix
...
fix: Invoices not getting fetched during payment reconciliation
2021-05-06 15:49:19 +05:30
Deepesh Garg
85b675a554
fix: Invoices not fetch during payment reconciliation
2021-05-05 20:57:31 +05:30
18alantom
136eb30081
fix: use get_serial_nos for splitting
2021-05-05 12:26:29 +05:30
Hendy Irawan
05f9df6c10
fix(accounts): Get balance for Profit and Loss accounts, only including valid transactions (not cancelled)
...
Fixed #25572 Period Closing Voucher incorrect journal entry amount for
Income/Expenses Accounts containing canceled transactions.
2021-05-04 13:32:16 +00:00
Rushabh Mehta
5fc4f1e37d
Merge pull request #25238 from alyf-de/datev_fixes
...
feat: Improve DATEV export
2021-05-04 15:38:57 +05:30
Saqib
384f4b5b7e
fix: can't open general ledger from consolidated financial report ( #25542 )
2021-05-04 12:33:49 +05:30
Saqib
076020643d
fix: empty payment term column in accounts receivable report ( #25556 )
2021-05-04 12:26:49 +05:30
barredterra
24e2cc9107
Merge branch 'develop' into datev_fixes
2021-05-03 18:19:28 +02:00
Deepesh Garg
0ae702aab9
Merge branch 'develop' of https://github.com/frappe/erpnext into bootstraped_gst_setup
2021-05-02 22:37:04 +05:30
Deepesh Garg
f6610c96dd
fix: Gracefully handle duplicate bank account name to make setup faster
2021-05-02 12:23:11 +05:30
Nabin Hait
0c7448fc41
fix: Fixed merge conflict
2021-05-01 14:54:22 +05:30
Nabin Hait
a2fcca85a5
fix: Fixed merge conflict
2021-05-01 14:53:13 +05:30
Afshan
1fd1e2bb60
fix: fieldname when updating docfield property ( #25517 )
2021-04-30 18:41:26 +05:30
Raffael Meyer
07a081d8ac
Merge branch 'develop' into datev_fixes
2021-04-30 12:25:40 +02:00
Deepesh Garg
88d40e8dc4
fix: Remove extra space
2021-04-30 15:33:33 +05:30
Deepesh Garg
1deef5229e
fix: Linting and translation issues
2021-04-30 15:20:55 +05:30
Deepesh Garg
bd5ee7d725
fix: Use party account currency
2021-04-30 15:20:45 +05:30
Deepesh Garg
9cbca06f4e
fix: Updated filters for process statement of accounts
2021-04-30 15:20:31 +05:30
Deepesh Garg
303f6d2d36
Merge branch 'version-13-pre-release' of https://github.com/frappe/erpnext into psoa_fixes_v13_pre_release
2021-04-30 15:17:07 +05:30
Deepesh Garg
178938b2f0
fix: Ageing errors in PSOA
2021-04-30 15:14:24 +05:30
Deepesh Garg
c4231c72a6
Merge pull request #25524 from aerele/develop
...
fix: List invoices in Payment Reconciliation Payment
2021-04-30 14:15:33 +05:30
Anuja P
435e93bda9
fix: allocated amount change wrt paid amount change
2021-04-30 13:52:48 +05:30
Deepesh Garg
8aa57953ee
Merge pull request #25490 from deepeshgarg007/psoa_fixes_v2
...
fix: Ageing errors in PSOA
2021-04-30 13:07:00 +05:30
Deepesh Garg
26920b439a
Merge pull request #25394 from meike289/feature/check-field-subscription-invoice
...
feat: new check field in subscriptions for (not) submitting invoices
2021-04-30 12:32:45 +05:30
Deepesh Garg
0dc411951e
Merge pull request #25438 from nextchamp-saqib/round-off-diff-allowance
...
fix: ignore fraction difference while making round off gl entry
2021-04-30 11:11:21 +05:30
Vignesh S
7783a56c08
fix: List invoices in Payment Reconciliation Payment
...
Invoices are not listed in the Payment Reconciliation Payment table due to a typo in the code
2021-04-29 22:39:42 +05:30
Saqib Ansari
6dd1c5cf92
refactor: remove extra fields
2021-04-29 18:12:36 +05:30
Saqib Ansari
a91eebf6aa
feat: base payment amount in payment schedule
2021-04-29 18:12:23 +05:30
Saqib Ansari
e70d9c925c
fix: payment amount showing in foreign currency
2021-04-29 18:12:17 +05:30
Anuja Pawar
07fb98b91d
Merge branch 'develop' into fix_PE_allocated_amt
2021-04-29 17:17:21 +05:30
Anuja P
dd1e7624bf
fix: changing paid amount should change allocated amount
2021-04-29 17:00:59 +05:30
Raffael Meyer
d75b4c37a3
Merge branch 'develop' into feature/check-field-subscription-invoice
2021-04-28 12:38:49 +02:00
Raffael Meyer
a949480acf
fix: add translation to make semgrep pass
2021-04-28 12:38:23 +02:00
Saqib Ansari
44b07e4ef5
refactor: remove extra fields
2021-04-28 15:11:57 +05:30
Saqib Ansari
3f7ec95af8
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix
2021-04-28 14:45:27 +05:30
Saqib Ansari
aa4f750d8c
fix: test
2021-04-28 14:42:49 +05:30
Saqib Ansari
3f53b87379
Merge branch 'develop' of https://github.com/frappe/erpnext into round-off-diff-allowance
2021-04-28 14:34:51 +05:30
Saqib
7b3dd3585b
fix: unexpected keyword argument 'merge_logs' ( #25489 )
...
* fix: unexpected keyword arguement 'merge_logs'
* fix: reference error
* fix: test
2021-04-27 20:01:08 +05:30
Saqib
ad4365eb0e
fix: unexpected keyword argument 'merge_logs' ( #25489 )
...
* fix: unexpected keyword arguement 'merge_logs'
* fix: reference error
* fix: test
2021-04-27 20:00:21 +05:30
Deepesh Garg
8a1e5e189c
fix: Ageing errors in PSOA
2021-04-27 16:57:34 +05:30
Raffael Meyer
b2be91e731
Merge branch 'develop' into datev_fixes
2021-04-27 12:21:14 +02:00
rohitwaghchaure
b9078a0c86
Merge pull request #25126 from rohitwaghchaure/purchase-invoice-to-purchase-receipt-develop
...
feat: purchase receipt creation from purchase invoice
2021-04-27 09:56:28 +05:30
Deepesh Garg
ebc6c51abe
Merge pull request #25384 from deepeshgarg007/psoa_fixes
...
fix: Updated filters for process statement of accounts
2021-04-26 22:58:42 +05:30
Afshan
df06e49e0c
feat: enable custom field search on POS ( #25421 )
...
* feat: multi lingual item search in POS
* fix: limit the options for selection and broken down funtion for geting condition
2021-04-26 22:48:13 +05:30
Deepesh Garg
4c8d15b487
fix: Incorrect GL Entry validation ( #25474 )
...
* fix: Incorrect GL Entry validation
* fix: Add validation for party accounts
* fix: Scrub labels
* fix: Translation
2021-04-26 15:24:34 +05:30
Deepesh Garg
0b9aa58b81
Merge branch 'develop' of https://github.com/frappe/erpnext into psoa_fixes
2021-04-26 14:51:20 +05:30
Deepesh Garg
968ec110f3
fix: Linting and translation issues
2021-04-26 14:51:00 +05:30
Anuja Pawar
fee9a56d4e
Merge branch 'develop' into fix_allocated_amt_in_PE
2021-04-26 11:36:10 +05:30
Anuja P
f74d8d2e16
fix: suggested changes
2021-04-26 11:31:51 +05:30
Walstan Baptista
4a805b5622
chore: frappe.whitelist for doc methods ( #25465 )
2021-04-24 14:23:08 +05:30
Anuja P
dc599e0164
fix: to update Allocated amount after Paid Amount is changed
2021-04-23 19:24:53 +05:30
Saqib Ansari
d552fe6778
feat: base payment amount in payment schedule
2021-04-23 14:46:52 +05:30
Saqib Ansari
242242c43f
Merge branch 'develop' of https://github.com/frappe/erpnext into payment-term-amount-display-currency-fix
2021-04-23 13:54:13 +05:30
meike289
8787ebf83d
Apply suggestions from code review
...
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2021-04-23 08:06:29 +02:00
Faris Ansari
1fe891b287
refactor: Replace Class.extend with native class
2021-04-23 08:04:00 +05:30
Saqib
3d4acf9e5c
fix: permission error after submitting exchange rate revaluation ( #25432 )
2021-04-22 16:16:03 +05:30
Saqib
19b73968d7
fix(pos): validations & minor ui issues ( #25351 )
...
* fix: pos print format
* fix: stock validation on pos invoice creation
2021-04-22 13:38:20 +05:30
Saqib Ansari
b0e160ff78
fix: ignore fraction difference while making round off gl entry
2021-04-22 13:23:50 +05:30
Mohammad Hasnain Mohsin Rajan
7f932cfb30
fix: display reconcile tool when closing balance 0 ( #25417 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-04-22 04:53:09 +05:30
Deepesh Garg
e5e20c50a9
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop
2021-04-21 19:09:41 +05:30
Afshan
6d3305c446
fix: added total column
2021-04-21 15:34:58 +05:30
Afshan
48b2fc9b12
Merge branch 'develop' into dimension-wise-accounts-balance-reports
2021-04-21 15:21:02 +05:30
Raffael Meyer
48cd4de0d2
Merge branch 'develop' into feature/check-field-subscription-invoice
2021-04-20 16:15:01 +02:00
Marica
0278646fd8
fix: Cashier query in POS Opening/Closing Entry ( #25399 )
2021-04-20 12:53:33 +05:30
Marica
125c3d64a9
fix: Cashier query in POS Opening/Closing Entry ( #25398 )
2021-04-20 12:53:22 +05:30
Afshan
de69a1186c
Merge branch 'develop' into dimension-wise-accounts-balance-reports
2021-04-20 11:43:28 +05:30
Marica
b91fcbd70e
fix: Ignore Customer Group Perm on AlL Products page ( #25396 )
2021-04-19 22:21:07 +05:30
Marica
846200d069
fix: Ignore Customer Group Perm on AlL Products page ( #25397 )
2021-04-19 22:20:01 +05:30
Raffael Meyer
4a1159408a
Merge branch 'develop' into feature/check-field-subscription-invoice
2021-04-19 16:40:35 +02:00
Meike Nedwidek
ebbcc90d89
✨ add check field for subscription invoices if they should be submitted automatically
2021-04-19 15:28:37 +02:00
Deepesh Garg
135b852cf0
fix: Use party account currency
2021-04-19 17:27:26 +05:30
Afshan
0e949adea5
Merge branch 'develop' into dimension-wise-accounts-balance-reports
2021-04-19 14:04:49 +05:30
Nabin Hait
840c921229
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop
2021-04-19 13:30:19 +05:30
Deepesh Garg
cb718fce88
feat: Role to allow over billing, delivery, receipt ( #24854 )
...
* feat: Role to allow over billing, delivery, receipt
* fix: Typo
2021-04-19 13:25:15 +05:30
Deepesh Garg
bb746fcbe4
fix: Updated filters for process statement of accounts
2021-04-19 12:19:31 +05:30
Saqib
e782531529
fix: Apply single transaction threshold on net_total instead of supplier credit amount ( #25243 )
...
* fix: Apply single transaction threshold on net_total instead of supplier credit amount
* fix: Apply single transaction threshold on net_total instead of supplier credit amount
* fix: test
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-19 10:15:51 +05:30
Ankush Menat
ad6a2657ae
chore: minor translation fixes
2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries
2021-04-17 16:56:08 +05:30
Saqib
75e13f7bb6
fix(e-invoicing): add company validation for e-invoicing ( #25348 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-04-17 15:38:47 +05:30
Saqib
18c7815a1b
fix: presentation currency in statement of accounts ( #25367 )
2021-04-17 15:37:40 +05:30
rohitwaghchaure
1254af502b
Merge pull request #25362 from anupamvs/disable_rounded_total
...
feat: added Disable Rounded Total in sales transactions
2021-04-17 13:30:24 +05:30
Ankush Menat
d6be154ac2
fix: implicit string concatenation ( #25371 )
...
* fix: implicit string concatenations
* chore: rerun healthcare patch for company fields
2021-04-16 22:08:44 +05:30
Saqib
36247faf1a
fix(e-invoicing): add company validation for e-invoicing ( #25349 )
...
* fix(e-invoicing): add company validation for e-invoicing
* fix: test
2021-04-16 18:45:19 +05:30
Raffael Meyer
6daae681bd
Merge branch 'develop' into datev_fixes
2021-04-16 12:37:14 +02:00
Anupam
9d9c256e70
feat: added Disable Rounded Total in sales transactions
2021-04-16 00:11:40 +05:30
Afshan
2da6ab7f2a
Merge branch 'develop' into dimension-wise-accounts-balance-reports
2021-04-15 18:07:04 +05:30
Saqib
593071bd53
fix: currency symbol in bank transaction list view ( #25336 )
2021-04-15 14:12:11 +05:30
Nabin Hait
1bc65ddbe4
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop
2021-04-14 11:23:34 +05:30
m1ngaa
f68205468c
Delete accounts (an empty file)
...
This file has no purpose, and must've been included as a tiny mistake..?
2021-04-14 05:50:31 +08:00
Afshan
82ebc47ba1
Merge branch 'develop' into dimension-wise-accounts-balance-reports
2021-04-13 19:38:04 +05:30
Saqib
dbb76a7d00
fix(e-invoicing): validations & tax calculation fixes ( #25314 )
...
* fix: GST on freight charge in e-invoicing
* feat(india): bulk e-invoice generation (#24969 )
* fix: cannot fetch e invoice settings
* fix: patch condition (#25301 )
* fix: patch condition
* fix: except einvoice loading error seperately
* fix: json.loads error
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2021-04-13 18:49:03 +05:30
Nabin Hait
10c61376e3
fix: Backport missing commits to develop branch ( #25305 )
2021-04-13 15:46:01 +05:30
Suraj Shetty
36083ff36c
Merge pull request #25310 from rmehta/grid-field-fix
2021-04-13 12:40:27 +05:30
Suraj Shetty
82d0a1a13e
style: Add missing semicolons
...
- & make formatting consistent
2021-04-13 12:35:42 +05:30
Rushabh Mehta
3c58fd4d5e
fix(minor): fix dynamically changing grid properties
2021-04-13 12:05:10 +05:30
Rushabh Mehta
65f25c27b3
fix(minor): fix dynamically changing grid properties
2021-04-13 11:58:16 +05:30
Abdullah Abouzekry
20140425c8
fix: sales order not saving due type mismatch in promo scheme ( #24748 ) ( #25222 )
2021-04-13 11:36:39 +05:30
Saqib
9320316462
feat(india): bulk e-invoice generation ( #24969 )
2021-04-12 17:55:46 +05:30
Saqib Ansari
faca478317
fix: payment amount showing in foreign currency
2021-04-12 15:40:27 +05:30
Saqib
49336b8065
fix: consolidated sales invoice posting date ( #25119 )
2021-04-12 12:17:50 +05:30
prssanna
42f4a00c88
fix: declare data before assigining
2021-04-12 12:01:20 +05:30
Deepesh Garg
5f3d7f547c
fix: Item wise tax rate for consolidated POS invoice ( #25029 )
...
* fix: Item wise tax rate for consolidated POS invoice
* fix: Do not alter item wise taxes for consolidated invoices
* fix: Add test case
* fix: Update
* fix: Set opening stock for test item
* fix: Add valuation rate for opening stock
2021-04-12 10:56:47 +05:30
Rohit Waghchaure
a5d062453e
feat: added test case
2021-04-10 10:49:31 +05:30
Rohit Waghchaure
cb6494876f
feat: purchase receipt creation from purchase invoice
2021-04-10 10:49:30 +05:30
Rohit Waghchaure
b9aa775f3b
fix: pricing_rule test cases
2021-04-10 10:45:28 +05:30
Deepesh Garg
df9388aa8e
Merge pull request #25086 from deepeshgarg007/advance_amount_precision
...
fix: Precision issues while allocating advance amount
2021-04-09 21:39:02 +05:30
Afshan
c42318ec24
chores: clean up
2021-04-09 17:44:30 +05:30
Afshan
31b5dfe9ee
feat: Dimension-wise Accounts Balance Report
2021-04-09 16:52:14 +05:30
Saqib
4191e7999d
chore: add error title
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-04-08 21:04:56 +05:30
barredterra
09c7598a67
fix: make account field non-mandatory
2021-04-07 20:03:33 +02:00
Saqib Ansari
5541aeaa82
fix: keyerror while validating coa file
2021-04-07 12:34:20 +05:30
Nabin Hait
aa809ceffe
fix: Patch fixes for v13 upgrade ( #25220 )
2021-04-07 10:57:46 +05:30
Sagar Vora
c9cdf74dc5
test: remove print() ( #25205 )
2021-04-05 16:38:10 +05:30
Sagar Vora
8aacd341c7
test: disable shopping cart before running Tax Rule tests ( #25183 )
2021-04-03 23:01:16 +05:30
Sagar Vora
f6b1fa0a1c
test: clear tax rules before making POS Invoices ( #25171 )
2021-04-03 16:06:41 +05:30
Rucha Mahabal
0773d6772d
fix(POS): local variable 'customer_currency' referenced before assignment ( #25137 )
2021-04-01 17:47:19 +05:30
Sagar Vora
98d250995d
fix(India): create property setters for shorter naming series ( #25134 )
2021-04-01 16:52:28 +05:30
Walstan Baptista
58625674f4
test: correct naming series to avoid ValidationError ( #25132 )
2021-04-01 15:55:37 +05:30
Sagar Vora
4c31fbb687
fix(India): create property setters for shorter naming series (as per GST Rules) ( #25128 )
2021-04-01 15:32:37 +05:30
Rucha Mahabal
6717773c28
fix: Travis ( #25078 )
...
* fix(test): set default accounts in mode of payment
* fix(test): import_doc params in shopify settings test
* fix: syntax error in salary slip test
* fix(test): use Temporary Opening account for Stock Reco opening entry
* fix(test): skip GST doc naming validations for tests
* fix(test): Salary Structure Assignment date edge case
* fix(test): GST doc naming validations
* fix: sider
* revert: skip GST doc naming validations for tests
2021-04-01 15:30:34 +05:30
Nabin Hait
11eb30d082
fix: merge conflict
2021-04-01 15:03:11 +05:30
Anupam Kumar
526497bc43
Merge pull request #25104 from anupamvs/purchase-side-margin-beta
...
feat: price margin in buying
2021-03-31 18:38:58 +05:30
Sagar Vora
4e07695a08
test: use insert instead of save ( #25045 )
...
* test: use insert instead of save
* test: use do_not_save
2021-03-31 18:33:27 +05:30
Anupam
ad520e08ba
feat: price margin in buying
2021-03-31 18:31:12 +05:30
Prssanna Desai
c5ae9ee0e1
fix: do not set standard link in Sales Invoice as custom ( #25097 )
2021-03-31 16:16:12 +05:30
Prssanna Desai
45eccfafc1
fix: do not set standard link in Sales Invoice as custom ( #25096 )
2021-03-31 16:16:00 +05:30
Saqib
fb4051bddd
feat: discount configuration on early payments ( #25089 )
...
* feat: discount configuration on early payments
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* fix: remove duplicate patch call
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-03-31 15:52:51 +05:30
Rohan
99a8cb7143
fix: commit individual SLE rename for large datasets ( #25084 )
2021-03-31 15:22:00 +05:30
Saqib
f239dbdd03
feat: tax collected at source using tax withholding category ( #25090 )
...
* refactor: tax withholding category against customer
* feat: pan and tax withholding category fields for customer
* fix: test
* feat: charging tcs on sales invoice
* fix: tcs chargable amount
* fix: tcs amount calculation
* fix: sider
2021-03-31 15:15:29 +05:30
Saqib
0586b7db79
feat: discount configuration on early payments ( #24586 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-03-31 15:03:53 +05:30
Saqib
df1ef6f8e5
fix: make round off GLE always non-opening ( #25087 )
2021-03-31 14:23:09 +05:30
Deepesh Garg
5d73d8281b
fix: Remove unintentionally added field
2021-03-31 14:10:56 +05:30
Deepesh Garg
f54d596ae1
fix: Precision issues while allocating advance amoount
2021-03-31 14:06:02 +05:30
Walstan Baptista
d6360755b9
chore: frappe.whitelist for doc methods ( #25068 )
...
* chore: frappe.whitelist for doc methods
* fix: incorrect spelling
* fix: sider issue
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2021-03-31 12:30:32 +05:30
Anupam Kumar
9be11afbde
feat: price margin in buying ( #25058 )
2021-03-30 12:09:46 +05:30
rohitwaghchaure
b38ea0cc8b
fix: patch ( #25014 )
...
* fix: patch
* fix: pricing_rule test cases
2021-03-28 15:51:32 +05:30
Sagar Vora
5c907fa7f0
test: make Stock Entry to avoid NegativeStockError ( #25044 )
2021-03-27 20:30:26 +05:30
walstanb
ab673d9e4b
fix: minor changes
2021-03-27 12:54:49 +05:30
walstanb
225c64a1ad
test: sets is_purchase_item while item creation
2021-03-27 12:54:49 +05:30
walstanb
9826ac4602
test: reset session user if test errors
2021-03-27 12:54:49 +05:30
walstanb
98dcf8a1fd
fix: type casting for None type value
2021-03-27 12:54:49 +05:30
rohitwaghchaure
d5759bab11
Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule
...
feat: recursive pricing rule
2021-03-26 19:10:10 +05:30
Rohit Waghchaure
0486276789
fix: don't club same free item
2021-03-26 19:05:45 +05:30
Rohit Waghchaure
fce552b811
fix: nonetype object has no attribute options
2021-03-26 19:05:45 +05:30
Rohit Waghchaure
cd8422a840
feat: recursive product discount
2021-03-26 19:05:43 +05:30
Saqib
dd39a6b47c
fix(pos): mode of payments disappear on loading draft pos invoice ( #24917 )
2021-03-24 17:56:24 +05:30
Deepesh Garg
d26ed25c3e
fix: Period list for exponential smoothing forecasting report ( #24983 )
2021-03-23 21:11:06 +05:30
Deepesh Garg
82983369fa
fix: Period list for exponential smoothing forecasting report ( #24982 )
2021-03-23 21:11:01 +05:30
Deepesh Garg
ad9b65fcf2
fix: TDS check getting checked after reload ( #24972 )
2021-03-23 10:45:20 +05:30
Deepesh Garg
d1f15b2a88
fix: TDS check getting checked after reload ( #24973 )
2021-03-23 10:45:06 +05:30
Anuja Pawar
c7c921495b
fix: payment reference on adding cost center in PE and Issue Summary Report error fixes ( #24951 )
2021-03-22 11:21:15 +05:30
Sagar Vora
6ac11a04b0
test: added warehouse for TCS Item as it is a Stock Item ( #24942 )
2021-03-18 18:07:21 +05:30
Sagar Vora
8ee1146f72
test: add stock to avoid NegativeStockError ( #24941 )
2021-03-18 17:45:25 +05:30
Afshan
a04091aaf7
fix: exclude current doc while validation. ( #24914 )
2021-03-18 16:40:43 +05:30
Sagar Vora
b134b89fb0
test: fix NegativeStockError ( #24936 )
2021-03-18 16:36:40 +05:30
Anuja Pawar
9bf1083d9e
fix: payment references from disappearing on selecting cost center ( #24831 )
...
Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>
2021-03-18 11:22:24 +05:30
Sagar Vora
f4a6c7823a
test: create new item instead of using _Test Item to prevent error ( #24915 )
2021-03-17 19:57:53 +05:30
Rohit Waghchaure
77add49c6a
fix: don't club same free item
2021-03-17 18:49:54 +05:30
Rohit Waghchaure
a9b1347600
fix: nonetype object has no attribute options
2021-03-17 14:30:34 +05:30
Rohit Waghchaure
ff70e61d7a
feat: recursive product discount
2021-03-17 14:30:34 +05:30
marination
dd7d71ca2e
fix: POS Opening Entry with empty balance detail rows
2021-03-16 12:05:37 +05:30
Marica
4ceea333a7
fix: POS Opening Entry with empty balance detail rows ( #24876 )
2021-03-15 12:49:14 +05:30
Anupam Kumar
ed42afc5e8
feat: price margin in buying ( #24685 )
2021-03-15 11:11:28 +05:30
Ganga Manoj
ca03997ab5
fix(Bank Reconciliation): Filter Bank Account drop-down list
2021-03-13 22:21:07 +05:30
Nabin Hait
fe3529b194
fix: merge conflict
2021-03-11 16:45:41 +05:30
Nabin Hait
6e3668dc30
fix: merge conflict
2021-03-11 16:14:27 +05:30
Ankush Menat
2b61491adb
fix: use account_name only in consolidated report ( #24840 )
...
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.
Related issue: ISS-20-21-10217
2021-03-11 16:05:58 +05:30
Rucha Mahabal
0b29f87fa2
feat(Non Profit): 80G Certificates and Donations ( #24848 )
...
* feat(Non Profit): 80G Certificates and Donations
* fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849 )
2021-03-11 16:02:23 +05:30
Rucha Mahabal
be2c1fca7b
feat(Non Profit): 80G Certificates and Donations ( #24657 )
...
* feat: 80G Certificates
* feat: add non-profit custom fields for India
* feat: 80G Certificate print format for memberships
* feat: Donation doctype and API endpoint to capture donations via razorpay
* chore: Rename Membership Settings to Non Profit Settings
* chore: clean up Non Profit Settings
- Rename fields, better labels
- patch for renaming
* feat: Webhook secret generation for Razorpay donations in Non-Profit Settings
* feat: Payment Entry for donations
- added Donor as Party Type
- setting for automating payment entries for donations created via web form
* fix: linter and sider issues
* fix: translation syntax
* feat: PAN Details custom field for Indian donors
* feat: 80G certificates for Donations with Print Format
* fix: sider
* feat: validations for donor and donation
- create donor for website user from donations
- validate donor email
* feat: extract member name from subscription notes
* test: Donation
* test: Tax Exemption 80G Certificate
* chore: styling fixes
* fix: tests
* fix: sider
* feat: extract PAN number from additional subscription notes
* feat: Add creation user field in Non Profit Settings
fix: Payment Entry not generating for memberships and donations
* feat: update desk page
* fix: tests
2021-03-11 13:19:44 +05:30
Anupam Kumar
6f0fabc54e
fix: gle issue in internal transfer(Purchase) ( #24830 )
2021-03-10 18:36:46 +05:30
Ankush Menat
59fdee4dfa
Merge branch 'develop' into consolidated_report_acc_name_fix
2021-03-10 16:35:59 +05:30
Ankush Menat
000fa824d3
fix: use account_name only in consolidated report
...
Don't use account_number and only rely on account_name for preparing
consolidated financial statement.
Related issue: ISS-20-21-10217
2021-03-10 15:23:48 +05:30
Raffael Meyer
20cc2bb0d8
fix: autoname for Item Tax Template
...
* fix: autoname for Item Tax Template
Use title + company abbreviation instead of just title.
* fix: test records of Item Tax Template
* fix: rename item tax templates in test records
* Revert "fix: test records of Item Tax Template"
This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1.
* fix: rename hardcoded item tax templates in tests
* fix: rename hardcoded Item Tax Templates in tests
(2)
* fix: delete Item Tax Template with company
2021-03-10 10:24:43 +05:30
Afshan
0623a34210
fix: added supplier warehouse field back again ( #24827 )
2021-03-10 09:46:38 +05:30
Afshan
27bcb2a064
fix: renamed "supplier_warehouse" to "set_from_warehouse" ( #24816 )
...
* fix: reverting and adding new field for supplier warehouse
2021-03-09 22:25:48 +05:30
Afshan
e314b8b209
fix: general ledger report ( #24770 )
2021-03-09 20:31:57 +05:30
Raffael Meyer
79b5be1830
fix: Group German VAT Accounts ( #24804 )
...
* fix: group account for tax assets and liabilities (germany)
* fix: spacing
2021-03-09 20:26:43 +05:30
Deepesh Garg
06a6ee37cb
fix: Ignore mandatory fields in opening invoice via Opening Invoice Creation tool ( #24821 )
2021-03-09 20:23:26 +05:30
Deepesh Garg
47c6d2e00f
Merge pull request #24814 from AfshanKhan/fix-tds-computation-summary
...
fix: sending proper arguments for TDS Computation Summary report
2021-03-09 20:01:30 +05:30
Ankush Menat
afc766bbf1
Merge branch 'develop' into dont_update_pe_title
2021-03-08 15:44:15 +05:30
Ankush Menat
5571b988dd
fix: make title field read only
2021-03-08 15:43:03 +05:30
Ankush Menat
cc46866cd9
fix: do not update PE title during data import
...
Related issue: ISS-20-21-10132
2021-03-08 15:42:39 +05:30
Afshan
1002e36c53
fix: removed unused import
2021-03-08 14:39:19 +05:30
Afshan
fa932e2a3e
fix: sending proper arguments for report
2021-03-08 14:36:40 +05:30
Deepesh Garg
45870317f2
Merge pull request #24797 from UrvashiKishnani/patch-1
...
fix: total row in AR/AP summary report
2021-03-06 21:28:04 +05:30
Saqib
92b0691c68
fix: einvoice button visiblity condition ( #24800 )
2021-03-06 19:00:08 +05:30
Deepesh Garg
36a0085905
Merge pull request #24799 from danielchalmers/patch-8
...
fix: typo in Charts of Account doctype
2021-03-06 13:11:26 +05:30
Daniel Chalmers
9b4a258c89
Chart Of Accounts -> Chart of Accounts
2021-03-04 00:15:46 -06:00
UrvashiKishnani
27ea23223d
fix: total row in AR/AP summary report
2021-03-04 09:21:25 +04:00
barredterra
53d261702a
fix: make quick entry for Tax Category work
2021-03-03 11:52:48 +01:00
Deepesh Garg
7a5b6021b9
Merge pull request #24772 from anupamvs/si-timesheet
...
feat: provision to pull timesheet in sales invoice
2021-03-02 18:05:42 +05:30
Anupam
47ce85484b
feat: provistion to pull timesheet in sales invoice
2021-03-02 11:31:26 +05:30
UrvashiKishnani
810a36105c
fix: GL Entries for AP/AR Summary without SQL join
...
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is not in cancelled state.
2021-03-02 08:20:03 +04:00
UrvashiKishnani
10e4b9d4e8
fix: GL Entries for AP/AR Summary
...
SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is in submitted state.
2021-03-01 12:50:07 +04:00
Deepesh Garg
6fdd859a10
Merge pull request #24700 from deepeshgarg007/rounding_issue_fix
...
fix: Issue on posting inter-warehouse transfer invoice
2021-02-27 17:30:01 +05:30
Saqib
3dfa017f1d
refactor: (coa importer) create coa tree with account no & account name ( #23601 )
2021-02-26 16:50:22 +05:30
Deepesh Garg
b85fb0c3a4
Merge branch 'develop' into rounding_issue_fix
2021-02-25 20:17:35 +05:30
Afshan
1be997beb4
fix: reference variable in pricing rule ( #24711 )
2021-02-25 19:01:32 +05:30
Deepesh Garg
2d0b277ce0
Merge pull request #24054 from gwhitney/other_app_acc_dims
...
feat(Accounting Dimension): accounting dimension doctypes for other apps
2021-02-25 18:48:42 +05:30
Deepesh Garg
7a837170ea
Merge branch 'develop' of https://github.com/frappe/erpnext into other_app_acc_dims
2021-02-25 15:41:03 +05:30
Deepesh Garg
834a8b740d
Merge branch 'develop' into subscription_fix_new
2021-02-25 11:24:27 +05:30
Ankush Menat
325a461c34
Merge branch 'develop' into opening_round_gl
2021-02-25 07:53:48 +05:30
rohitwaghchaure
d0baa90b50
Merge pull request #24715 from rohitwaghchaure/fixed-patch-item-reposting-develop
...
fix: patch failing because of incorrect gl entries
2021-02-24 17:18:43 +05:30
Ankush Menat
23c30e43f0
fix: make round off GLE always non-opening
...
Opening GL entries can not be for profit and loss accounts. Round off
accounts are by default P&L account. Hence when making opening entry,
make round off entries as non-opening.
Related issue: ISS-20-21-09677
2021-02-24 11:03:24 +05:30
Rohit Waghchaure
39b5ad8e69
fix: patch failing because of incorrect gl entries
2021-02-23 18:35:36 +05:30
Rohit Waghchaure
bc8c9de26d
fix: patch failing because of incorrect gl entries
2021-02-23 18:26:48 +05:30
Nabin Hait
d46b23699c
fix: optimize reposting of gle and sle ( #24702 )
...
* fix(india): escape for special characters in JSON (#24695 )
JSON does not accept special whitespace characters like tab, carriage
return, line feed
Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf
Related issue: ISS-20-21-09811
* fix: Accounting Dimension creation background job timeout
* fix(regional): vehicle no is mandatory for ewaybill generation (#24679 )
* fix: vehicle no required for e-invoice
* fix: ewaybill generation dialog condition
* fix: excluding unidentified accounts from gstr-1
* fix: optimize reposting of sle and gle (#24694 )
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
* fix: Replaced spaces with tabs
* fix: merge conflict
* fix: test cases
Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
Co-authored-by: pateljannat <pateljannat2308@gmail.com>
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-23 16:38:52 +05:30
Saqib Ansari
85c91ca2db
Merge branch 'develop' into tcs_calculation
2021-02-23 15:56:29 +05:30
Nabin Hait
19f8fa59d3
fix: optimize reposting of sle and gle ( #24694 )
...
* fix: optimize update_gl_entries_after method
* fix: Optimized reposting patch
* fix: accounting dimensions
* added reload_doc in patch
* Update item_reposting_for_incorrect_sl_and_gl.py
Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>
2021-02-22 22:27:22 +05:30
Mohammad Hasnain Mohsin Rajan
07f40596bc
feat(Bank Reconciliation): Redesign ( #24273 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-02-22 22:19:47 +05:30
Deepesh Garg
c839177f8e
fix: Issue on posting inter-warehouse transfer invoice
2021-02-22 21:04:51 +05:30
Afshan
fdafb55fba
fix: error message when making reverse journal entry ( #24665 )
2021-02-22 19:25:57 +05:30
rohitwaghchaure
311bb6452f
Merge pull request #24691 from deepeshgarg007/accounting_dimension_timeout
...
fix: Accounting Dimension creation background job timeout
2021-02-22 15:29:41 +05:30
Deepesh Garg
aa46def745
fix: Accounting Dimension creation background job timeout
2021-02-21 21:54:23 +05:30
Anupam Kumar
b1997da488
feat: capture Rate of stock UOM in purchase ( #24315 )
...
* feat: capture Rate of stock UOM in purchase
* fix: review changes
* added server side code
* added stock uom rate in sales transactions
* fix: review changes
* fix: resolving conflicts
* adding patch
* fix: removing patch
2021-02-18 21:32:05 +05:30
Nabin Hait
deddcc513d
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-18 21:28:16 +05:30
rohitwaghchaure
7797e9d3ac
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-18 21:27:01 +05:30
rohitwaghchaure
76f616565e
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-18 21:25:40 +05:30
Deepesh Garg
d60a40ae82
fix: Add accounts user role permission for accounting dimension filter
2021-02-18 21:23:20 +05:30
Saqib
90ff48baa3
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-02-18 21:00:34 +05:30
Saqib
4fb547179d
fix: customer_currency referenced before assignment ( #24607 )
2021-02-18 20:53:49 +05:30
Saqib
a439d19917
feat(pos): mpesa related fixes & additions ( #24306 )
...
* fix: switching of mode of payments
* feat: transaction limit for mpesa integration
* feat: resend payment request if one fails
* feat: make new request only for failed ones
* fix: invalid amount for mpesa request
* fix: payment successful message not shown
* fix: url and business shortcode for live env
* fix: duplicate items validation for pos invoices
* fix: pos closing entry queued status
* fix: peroid end date for amended pos closing
2021-02-18 20:53:26 +05:30
Rucha Mahabal
e7bf87cc84
fix: POS return for Serialized Items ( #24292 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2021-02-18 16:04:35 +05:30
rohitwaghchaure
03a1484aed
Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop
...
fix: Consolidated Financial Statement report not works if child compa…
2021-02-17 16:35:43 +05:30
Nabin Hait
9b178bcd10
fix: stock and account balance syncing ( #24644 )
...
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: stock and account balance syncing
* fix: minor fix
2021-02-16 14:57:00 +05:30
rohitwaghchaure
d60ff83b6f
fix: added patch to fix incorrect stock qty and account value ( #24628 )
2021-02-16 09:12:27 +05:30
Deepesh Garg
e2324c77fe
fix: Test Cases
2021-02-15 20:01:32 +05:30
rohitwaghchaure
164ffac4ef
fix: Consolidated Financial Statement report not works if child company account not present in parent company ( #24580 )
...
Fixed conflicts
2021-02-12 17:33:07 +05:30
Anupam Kumar
7e1dcf911d
feat: capture Rate of stock UOM in purchase ( #24315 )
...
* feat: capture Rate of stock UOM in purchase
* fix: review changes
* added server side code
* added stock uom rate in sales transactions
* fix: review changes
* fix: resolving conflicts
* adding patch
* fix: removing patch
2021-02-11 20:19:30 +05:30
Jannat Patel
0a7939277c
fix: dynamic links for reports ( #24462 )
...
* fix: dynamic links for reports
* fix: revert changes for payment period report
* fix: link doctypes
2021-02-11 20:11:06 +05:30
Saqib
0681a480c2
feat(pos): mpesa related fixes & additions ( #24306 )
...
* fix: switching of mode of payments
* feat: transaction limit for mpesa integration
* feat: resend payment request if one fails
* feat: make new request only for failed ones
* fix: invalid amount for mpesa request
* fix: payment successful message not shown
* fix: url and business shortcode for live env
* fix: duplicate items validation for pos invoices
* fix: pos closing entry queued status
* fix: peroid end date for amended pos closing
2021-02-11 14:06:15 +05:30
Saqib
e37a5c2646
fix: customer_currency referenced before assignment ( #24607 )
2021-02-11 13:10:52 +05:30
Saqib
e07eb86498
Merge branch 'develop' into tcs_calculation
2021-02-11 12:13:47 +05:30
Saqib
15f4672ffa
fix: pos closing valdation ( #24605 )
2021-02-11 12:11:44 +05:30
Nabin Hait
9d3f242f39
Update subscription.js
2021-02-11 11:17:33 +05:30
Nabin Hait
79ba299abc
Merge branch 'develop' into subscription_fix_new
2021-02-11 11:03:45 +05:30
Deepesh Garg
516b3ae1bc
fix: get company attribute
2021-02-09 16:47:55 +05:30
Deepesh Garg
45cec6928b
fix: get company attribute
2021-02-09 16:44:12 +05:30
Deepesh Garg
5006a2065e
fix: Comment
2021-02-09 16:38:11 +05:30
Deepesh Garg
e56daeb347
fix: Multiple fixes in subscription
2021-02-09 16:13:45 +05:30
Deepesh Garg
236c9ae453
Merge pull request #24578 from marination/acc-dimension-update-fix
...
fix: Avoid changing Ref. Doctype in Accounting Dimension after creation
2021-02-09 06:51:58 +05:30
Saqib
8991d4ed0b
fix: fetching of standalone cr/dr notes for reconciliation ( #24575 )
2021-02-08 20:19:11 +05:30
marination
5a7ddba9a3
fix: Avoid changing Ref. Doctype in Accounting Dimension after creation
2021-02-08 17:06:23 +05:30
Anuja Pawar
ffb36aac8f
fix: fixing item_code not found error in the report ( #24483 )
2021-02-05 23:35:47 +05:30
Saqib
0f2dc0eb73
Merge branch 'develop' into tcs_calculation
2021-02-04 18:38:26 +05:30
Deepesh Garg
dce73d1881
fix: Add accounts user role permission for accounting dimension filter
2021-02-03 12:06:36 +05:30
Saurabh
df589594cd
Merge branch 'version-13-beta-pre-release' into version-13-beta
2021-02-02 20:58:26 +05:30
Suraj Shetty
54a253616a
Merge pull request #24508 from frappe/rebrand-ui
2021-02-02 09:07:35 +05:30
Rohit Waghchaure
d4d639c7ed
fix: test cases for pricing rule
2021-02-01 23:01:18 +05:30
Rohit Waghchaure
5c28416daa
fix: test cases for pricing rule
2021-02-01 22:58:22 +05:30
Saurabh
9dcb286c31
fix: consider select perm while setting party details ( #24518 )
2021-02-01 20:36:15 +05:30
rohitwaghchaure
bf7317d4e2
fix: multiple pricing rule issue ( #24509 )
2021-02-01 20:22:14 +05:30
rohitwaghchaure
68edf749ec
fix: multiple pricing rule issue ( #24515 )
2021-02-01 20:22:02 +05:30
Saurabh
081f506992
fix: consider select perm while setting party details ( #24514 )
2021-02-01 20:18:44 +05:30
prssanna
a3585e40f7
style: fix formatting
2021-02-01 19:50:27 +05:30
Saqib Ansari
cee3670167
chore: clean up sales invoice form
2021-02-01 15:45:26 +05:30
Saqib
fb75f0935f
Merge branch 'develop' into tcs_calculation
2021-01-29 14:26:48 +05:30
Saqib Ansari
3b2327ba8d
fix: sider
2021-01-29 12:08:35 +05:30
Suraj Shetty
0a8939e1c1
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-29 08:56:22 +05:30
Saqib
675a8330a4
refactor: POS Invoice merging and cancellation ( #24351 )
...
* feat: pos invoice merging with background jobs
* fix: invoice threshold for queueing job
* refactor: cancellation flow of point of sale
* feat: tests for cancellation of pos closing
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2021-01-28 18:42:43 +05:30
Saqib
62dfff5dde
Merge branch 'develop' into tcs_calculation
2021-01-28 18:08:13 +05:30
Saqib Ansari
4d9b6066a2
fix: tcs amount calculation
2021-01-28 18:07:08 +05:30
Saqib
ac9e6ff704
fix(pos): multiple pos fixes and additions ( #24227 )
...
* fix: make custom fields in pos invoice similar to sales invoice
* feat: allow/disallow rate & discount change
* fix: any pos profile can be selected while creating pos opening
* fix: cannot add item to cart
* fix: validate phone payment only if payment request exists
* fix: replace pos payment method patch
* chore: rearrange item & customer group filter
* fix: allow/disallow invoice level discount
* fix: updating qty of item with uom having space char
* fix: move configuration checbox to config section
* fix: invalid item rate trigger
* fix: cannot remove item from draft invoices
* fix: customer currency not set in pos invoice
* fix: duplicate item error message
* fix: sales uom not fetched in pos invoice
* fix: cannot add taxes to pos invoice for uae region
* fix: cannot merge pos invoice into credit note
* fix: tax calculation while merging pos invoices
* feat: delete draft orders from order list
* fix: merging of pos invoice with pricing rules
2021-01-28 17:58:55 +05:30
Nabin Hait
a6213ccd61
Merge branch 'develop' into version-13-beta-pre-release
2021-01-28 17:36:08 +05:30
Marica
7aa16bafff
Merge branch 'develop' into lcv_multicurrency
2021-01-28 13:29:36 +05:30
Deepesh Garg
b4be292217
fix: Item valuation for internal stock transfers ( #24200 )
...
* fix: Item valuation for internal stocktransfers
* fix: Consider conversion factor for invoices
* fix: Add missing set warehouse fields
* fix: Add validations and other fixes
* fix: Fixes in flow
* fix: Internal sales item link in Purchase Invoice
* fix: Debugging
* fix: Debug travis
* fix: Remove commented code
* fix: Rate forcing in sales order
* fix: Unreallized profit in Sales Register
* fix: Item wise gst sales register fix
* fix: From warehouse in Purchase Order
* fix: Target field in Sales Invoice
* fix: remove self
* fix: GST Purchasse register and other fixes
* fix: Add shipping_address to no field map
* fix: Ref doc map
* fix: Test Cases
* fix: address mapping between sales and purchase document
* fix: Import Error
* fix: Tax updation for internal invoices
* fix: Purchase Order and Invoice linking
* fix: Internal Party validation fix
* fix: validation
* fix(india): GST Taxes for intra state transfer
* fix(india): GST Taxes for intra state transfer
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 13:09:56 +05:30
Saqib
8e55677f10
feat: deleting account & stock entries on deletion of transaction ( #24298 )
...
* feat: control for deleting account & stock entries on deletion of a transaction
* chore: change label & fieldname
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2021-01-28 12:26:45 +05:30
Afshan
e5529ad461
fix: validate tax template for tax category ( #24402 )
...
* fix: validate tax template for tax category
* Update sales_taxes_and_charges_template.py
2021-01-28 12:22:39 +05:30
Marica
cc22814df5
Merge branch 'develop' into lcv_multicurrency
2021-01-28 12:15:09 +05:30
Saqib Ansari
ae9a9a2167
fix: tcs chargable amount
2021-01-27 19:36:29 +05:30
Saqib Ansari
ff12f91486
feat: charging tcs on sales invoice
2021-01-27 19:17:38 +05:30
Saqib Ansari
6db14d02d2
fix: test
2021-01-27 17:11:34 +05:30
Saqib Ansari
6f718a31f0
refactor: tax withholding category against customer
2021-01-27 16:59:07 +05:30
Saqib
5ba2f58355
fix: e_invoice print format not showing other charges ( #24474 )
2021-01-27 12:34:08 +05:30
Deepesh Garg
dade7a4583
fix: Translation Syntax
2021-01-26 21:11:55 +05:30
Suraj Shetty
0c34a711eb
Merge branch 'develop' of github.com:frappe/erpnext into version-13-beta-pre-release
2021-01-25 16:06:38 +05:30
Marica
62a1caf6c4
Merge branch 'develop' into lcv_multicurrency
2021-01-25 12:39:16 +05:30
Marica
5631d014a7
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-22 12:35:35 +05:30
Suraj Shetty
f0ff23eac3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-21 19:07:57 +05:30
Saqib
577d2bed6e
fix: failing einvoice test ( #24434 )
2021-01-21 18:43:55 +05:30
Deepesh Garg
60a8ba5cbd
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2021-01-20 10:30:52 +05:30
Jannat Patel
953960b193
Merge branch 'develop' into item-wise-purchase-registry-item-name-error
2021-01-19 10:44:49 +05:30
Suraj Shetty
bbc6bfd3c3
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2021-01-19 09:34:06 +05:30
Saqib
7b8eac958e
feat: re-linking bank accounts with plaid ( #24392 )
2021-01-18 16:44:41 +05:30
pateljannat
6bec696396
fix: item_group fallback
2021-01-18 16:21:56 +05:30
pateljannat
fa2b0d43bd
fix: handled invoices with no item_code
2021-01-18 15:27:40 +05:30
Deepesh Garg
1564d6ee1f
fix: Test Case
2021-01-15 19:51:15 +05:30
Deepesh Garg
0c4d61269a
fix: test case
2021-01-15 15:57:18 +05:30
Deepesh Garg
cbed6f970a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-15 15:43:59 +05:30
Anuja P
47b42e6441
fix: Translation fixes
2021-01-14 21:20:00 +05:30
Anuja P
5ead7ee6cf
fix:Payment Period based on invoice date report fix/refactor
2021-01-14 20:58:34 +05:30
Deepesh Garg
c96ea002a0
Merge pull request #24375 from deepeshgarg007/plv_cost_center_ignore_v13
...
fix: Ignore group cost center validation for period closing voucher
2021-01-14 19:47:56 +05:30
Deepesh Garg
847c706d2f
fix: Ignore group cost center validation for period closing voucher
2021-01-14 19:44:41 +05:30
Marica
3c878505cb
Merge branch 'develop' into naming-series-proj
2021-01-14 16:34:51 +05:30
Anuja Pawar
e62ce4b172
fix: Add button PO, PI, SI, DN and, Quotation Dashboard ( #24187 )
2021-01-13 21:13:12 +05:30
Jannat Patel
00ccec7314
fix: subscription prepaid date validation ( #24356 )
2021-01-13 21:02:15 +05:30
Marica
1ff7743d81
Merge branch 'develop' into naming-series-proj
2021-01-13 10:40:24 +05:30
rohitwaghchaure
bc465a3045
Merge pull request #24332 from rohitwaghchaure/fixed-payment-entry-multi-currency-issue-develop
...
fix: payment entry multi-currency issue
2021-01-13 00:13:14 +05:30
Marica
cb079cd8c4
Merge branch 'develop' into naming-series-proj
2021-01-12 19:57:55 +05:30
Anurag Mishra
36fa0512d2
fix: not able to create dunning from sales invoice
2021-01-12 17:02:19 +05:30
Rushabh Mehta
7619d3d6d6
fix(merge): develop
2021-01-12 09:16:21 +05:30
Saqib
d43bb4db41
fix(pos): error while merging pos invoices into sales invoice ( #24337 )
2021-01-11 12:59:35 +05:30
Rohit Waghchaure
3777c6aa38
fix: payment entry multi-currency issue
2021-01-08 12:59:15 +05:30
Wolfram Schmidt
5eef19723d
Update item_tax_template_dashboard.py
...
added missing backlink. In Item Groups I can set Item Tax Temple in Table taxes.
2021-01-05 18:47:11 +01:00
Anurag Mishra
b864b09d40
Merge branch 'develop' into gratuity
2021-01-05 14:47:38 +05:30
Deepesh Garg
bfa71c23ae
Merge pull request #23965 from vorasmit/remarks-fix-develop
...
fix: add remarks to sales invoice
2021-01-05 09:54:53 +05:30
Nabin Hait
517fd8b9e6
fix: Ignore customer and supplier while deleting company transactions ( #24279 )
...
* fix: Ignore customer and supplier while deleting company transactions
* fix: Test cases fixed based on Travis
2021-01-05 09:23:39 +05:30
Deepesh Garg
797a742cb2
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2021-01-04 14:24:00 +05:30
Afshan
a245f667d0
fix: pos error pop up ( #24237 )
2021-01-02 10:30:22 +05:30
Saqib
fc7a11e2aa
fix (e-invoicing): item & invoice value calculation ( #24253 )
2020-12-31 11:35:46 +05:30
Deepesh Garg
23ab5c5cc0
fix: Multiplle sider issues
2020-12-31 11:29:06 +05:30
Deepesh Garg
133ce286f9
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-31 11:24:14 +05:30
Saqib
f946bbd032
fix: minor e-invoicing issues ( #24239 )
...
* fix: invoice value set to zero if rounded total disabled
* fix: unit rate & gross amount calculation
* fix: e-invoice-setup patch
* chore: no need to re-run the patch
* fix: item value & invoice value calculations
2020-12-30 14:43:42 +05:30
Deepesh Garg
ff51540eed
Merge branch 'accounting_dimension_filters' of github.com:deepeshgarg007/erpnext into accounting_dimension_filters
2020-12-29 17:02:07 +05:30
Deepesh Garg
e061004956
fix: Improve validation message
2020-12-29 17:00:39 +05:30
Deepesh Garg
4a8c2c4cb5
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-29 15:10:36 +05:30
Anurag Mishra
dfe8f7601b
Merge branch 'develop' into gratuity
2020-12-29 13:27:03 +05:30
Afshan
91e3c07d77
fix: assest depreciation ledger
2020-12-28 19:42:46 +05:30
Deepesh Garg
4f8da4c313
fix: Test Cases
2020-12-26 11:37:51 +05:30
Saqib
17e96901db
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 20:55:21 +05:30
Deepesh Garg
5269f02919
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2020-12-25 18:35:26 +05:30
Nabin Hait
b99c77b753
Reposting fixes ( #24202 )
...
* fix: finished item validation and rate
* fix: Check if stock and account balance in sync after reposting
* fix: validate stock accounts in journal entry
* fix: validate expense against budget
2020-12-25 18:12:35 +05:30
Nabin Hait
327f03566a
Reposting fixes pre release ( #24203 )
...
* fix: finished item validation and rate
* fix: Check if stock and account balance in sync after reposting
* fix: validate stock accounts in journal entry
* fix: validate expense against budget
2020-12-25 18:11:54 +05:30
Saqib
6d74f5b59b
feat: GST E Invoicing ( #23455 )
...
* feat: init e-invoice settings
* feat: read public key file
* feat: rsa encryption with public key
* feat: save token and sek from auth request
* chore: handle error response
* feat: AES decryption of SEK with appkey
* feat: decrypt json data with SEK
* feat: make e invoice from erpnext sales invoice
* feat: generate IRN
* feat: decode signed json and QR code
* chore: validations
* feat: cancel IRN
* feat: complete e-invoice schema
* chore: move e-invoice settings to regional
* chore: split einvoice settings and operations
* chore: rename schema to template & js cleanup
* feat: make IRN field on regional setup
* feat: Generate & Cancel IRN from Sales Invoice
* chore: minor fixes
* fix: item discount
* chore: show irn cancelled check after cancellation
* fix: hide cancel irn dialog on error
* fix: public key is required on validate
* fix: cannot find attached key file
* fix: validation if e invoicing is disabled
* fix: do not show generate irn for invalid supply type
* fix: update irn_cancelled after cancelling irn
* chore: show irn field for proper gst_category
* feat: e-way bill details in e-invoice
* fix: save e-way bill no on irn generation
* chore: no copy on e invoice custom fields
* feat: cancel e-way bill before cancelling IRN
* feat: manual download / upload json
* chore: group e-invoicing actions
* fix: fn name
* chore: save signed invoice and qrcode after uplaoding irn
* fix: fetch token if not valid
* chore: move einvoicing stuff to seperate folder
* feat: QRCode Image and E-Invoice Print Format
* fix: bug
* fix: invalid syntax
* chore: code cleanup
* chore: clean up e invoice actions
* fix: download & upload e-invoice
* fix: print format
* fix: validations
* fix: add permissions on regional setup
* feat: add patch
* fix: validate document name
* fix: return date
* fix: credit note einvoice
* fix: validations
* fix: error logging
* fix: e_invoice module not found
* fix: add missing package
* fix: rename e_invoice_utils.py
* fix: einvoice field validation
* fix: patch
* fix: invoice totals calculation
* fix: other charges calculation
* chore: improve document name validation message
* fix: qr code image string
* feat: initialize GSP connector
* chore: remove unwanted fields
* fix: qr code generation
* feat: fetch and cache GSTIN details
* feat: generate & cancel IRN
* feat: cancel eway bill
* chore: remove unwanted fuctions
* chore: clean up einvoice actions
* fix: attach qrcode on irn generation
* fix: generate & cancel IRN
* fix: show/hide eway bill fields
* fix: valiations
* feat: generate eway bill from IRN
* chore: remove unwanted imports
* chore: error logging
* feat: header & footer in GST E Invoice
* chore: remove test pincode
* fix: invalid syntax
* feat: cess non advolem on einvoice item
* chore: remove fetch token from e invocie settings
* fix: imports
* fix: error handling
* feat: update timeline on einvoice actions
* fix: qrcode image size
* fix: exclude intra company transactions
* fix: eway bill test
* fix: ewaybill mandatory conditions
* chore: add tests
* fix: returning condition
* feat: log e-invocing requests
* chore: add ack date and ack no field for print formats
* fix: sider issues
* feat: show e-invoice preview before IRN generation
* fix: use as_list for error message
* fix: minor ux issues
* fix: dialog is undefined
* fix: error handling
* feat: add docs link to e invoice settings
* feat: multiple gstins for e invoicing
* fix: uncomment test condition
* fix: remove test pincode
* fix: cannot cancel irn without submitting sales invoice
* chore: code cleanup
* fix: sider issues
* fix: e invoice request log permissions
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-25 10:26:43 +05:30
rohitwaghchaure
4e9361f74b
Merge pull request #24204 from rohitwaghchaure/pricing-rule-not-working-margin
...
fix: multiple pricing rule with margin type as Percentage is not working
2020-12-25 09:33:39 +05:30
Rohit Waghchaure
ba5b603a0b
fix: multiple pricing rule with margin type not working
2020-12-24 22:49:38 +05:30
Rohit Waghchaure
aea62da544
fix: multiple pricing rule with margin type not working
2020-12-24 22:44:31 +05:30
Anurag Mishra
ba6ff6e227
fix: conflict
2020-12-23 18:07:53 +05:30
Anurag Mishra
b88af3a3f7
feat: Accrural Entry for Gratuity beafore Payment
2020-12-23 18:07:53 +05:30
Anurag Mishra
25c356894d
test: gratuity
2020-12-23 18:07:53 +05:30
Anurag Mishra
49b326fc08
feat(HR): Gratuity Payment
2020-12-23 18:07:05 +05:30
Deepesh Garg
e5e2ad646a
fix: Test Cases
2020-12-22 19:53:07 +05:30
Deepesh Garg
e1320c7e47
Merge branch 'develop' of https://github.com/frappe/erpnext into lcv_multicurrency
2020-12-22 13:32:59 +05:30
barredterra
1725fbc59a
feat: separate equity tree in CoA SKR04
2020-12-22 12:32:36 +05:30
Nabin Hait
bd4bdca6ad
feat: Repost item costing ( #24183 )
...
* Repost item valuation (#24031 )
* feat: Reposting logic for future finished/transferred item
* feat: added fields to identify needs to recalculate rate while reposting
* refactor: Set rate for outgoing and finished items
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Get outgoing rate for purchase return
* refactor: Get incoming rate for sales return
* test: Added tests for reposting valuation of transferred/finished/returned items
* feat: added incoming rate field in DN, SI and Packed Item table
* feat: get incoming rate for returned item
* fix: no error while getting valuation rate in stock entry
* fix: update stock ledger for DN and SI
* feat: update item valuation rate in PR and PI based on supplied items cost
* feat: SLE reposting logic for sales return and subcontracted item with test cases
* feat: update qty in future sle
* feat: repost future sle and gle via Repost Item Valuation
* fix: Skip unwanted function calling while reposting
* fix: repost sle for specific item and warehouse
* test: Modified tests for backdated stock reco
* fix: ignore cancelled sle in few methods
* feat: role allowed to do backdated entry
* feat: Show reposting status on stock valuation related reports
* fix: minor fixes
* fix: fixed sider issues
* fix: serial no fix related to immutable ledger
* fix: Test cases fixes related to perpetual inventory
* fix: Test cases fixed
* fix: Fixed reposting on cancel and test cases
* feat: Restart reposting item valuation
* refactor: Code cleanup using small functions and test case fixes
* fix: minor fixes
* fix: Raise on error while reposting item valuation
* fix: minor fix
* fix: Tests fixed
* fix: skip some validation ig gle made from reposting
* fix: test fixes
* fix: debugging stock and account validation
* fix: debugging stock and account validation
* fix: debugging travis for stock and account sync validation
* fix: debugging travis
* fix: debugging travis
* fix: debugging travis
* fix: removed duplicate field from pos profile
2020-12-21 20:03:59 +05:30
Nabin Hait
a77b8c9fcc
Repost item valuation ( #24031 )
...
* feat: Reposting logic for future finished/transferred item
* feat: added fields to identify needs to recalculate rate while reposting
* refactor: Set rate for outgoing and finished items
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Arranged fields in Stock Entry item table and added fields to identify finished and scrap item
* refactor: Get outgoing rate for purchase return
* refactor: Get incoming rate for sales return
* test: Added tests for reposting valuation of transferred/finished/returned items
* feat: added incoming rate field in DN, SI and Packed Item table
* feat: get incoming rate for returned item
* fix: no error while getting valuation rate in stock entry
* fix: update stock ledger for DN and SI
* feat: update item valuation rate in PR and PI based on supplied items cost
* feat: SLE reposting logic for sales return and subcontracted item with test cases
* feat: update qty in future sle
* feat: repost future sle and gle via Repost Item Valuation
* fix: Skip unwanted function calling while reposting
* fix: repost sle for specific item and warehouse
* test: Modified tests for backdated stock reco
* fix: ignore cancelled sle in few methods
* feat: role allowed to do backdated entry
* feat: Show reposting status on stock valuation related reports
* fix: minor fixes
* fix: fixed sider issues
* fix: serial no fix related to immutable ledger
* fix: Test cases fixes related to perpetual inventory
* fix: Test cases fixed
* fix: Fixed reposting on cancel and test cases
* feat: Restart reposting item valuation
* refactor: Code cleanup using small functions and test case fixes
* fix: minor fixes
* fix: Raise on error while reposting item valuation
* fix: minor fix
* fix: Tests fixed
* fix: skip some validation ig gle made from reposting
* fix: test fixes
* fix: debugging stock and account validation
* fix: debugging stock and account validation
* fix: debugging travis for stock and account sync validation
* fix: debugging travis
* fix: debugging travis
* fix: debugging travis
2020-12-21 14:45:50 +05:30
Deepesh Garg
5432ee3364
Merge pull request #24095 from frappe/skr04_equity_dev
...
feat: separate equity tree in CoA SKR04
2020-12-17 12:37:28 +05:30
Deepesh Garg
d6cd02d29d
fix: Add tests
2020-12-17 09:21:24 +05:30
Deepesh Garg
924f99bead
fix: Help message
2020-12-16 15:42:50 +05:30
