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
Deepesh Garg
4638f604ed
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-16 14:59:30 +05:30
Shivam Mishra
fd044b032f
Merge branch 'rebrand-ui' of https://github.com/frappe/erpnext into desk-enhancements
2020-12-16 13:21:10 +05:30
Suraj Shetty
f2511c84b5
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-14 09:05:48 +05:30
Nabin Hait
3423d94145
fix: Fixed merge conflict
2020-12-12 21:12:56 +05:30
Deepesh Garg
f17ea2ccab
fix: Accounting for internal transfer invoices within same company ( #24021 )
...
* fix: Accounting for internal transfer invoices within same company
* fix: warehouse fetching
* fix: Linting issues
* fix: GL entry fixes and validation for intercompany account
* fix: Account naming changes and other fixes
* fix: Add test for internal transfer
* fix: Test Case
* fix: Add description for fields
* fix: Commonfied code
* fix: Map warehouse and serial no
2020-12-11 21:30:39 +05:30
Mohammad Hasnain Mohsin Rajan
f8d6726990
fix(acc recv report): columns mismatch ( #24109 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-12-11 13:28:23 +05:30
Suraj Shetty
dc13d4b0fc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-12-11 12:57:04 +05:30
Saqib
7acb42d6df
feat(POS): hide images & auto add item checkbox ( #24102 )
2020-12-10 16:22:01 +05:30
Raffael Meyer
7f387452ca
Merge branch 'develop' into skr04_equity_dev
2020-12-10 10:51:55 +01:00
Rushabh Mehta
39154e5296
fix(minor): add debounce to calls
2020-12-10 12:37:16 +05:30
barredterra
52d37edf98
feat: separate equity tree in CoA SKR04
2020-12-09 17:57:29 +01:00
Rushabh Mehta
fec8dba16c
fix(merge): merge develop
2020-12-08 16:23:09 +05:30
Rucha Mahabal
fa950662b9
fix: import statement
2020-12-08 12:32:19 +05:30
Rucha Mahabal
db0bbfac97
feat(reports): get item details from Item doctype instead of the Transaction
2020-12-08 12:20:07 +05:30
Afshan
727b2f9b97
fix: throw an error when no pos profile exist ( #24025 )
...
* fix: throw an error when no pos profile exist
* fix: throw an error when no pos profile exist
* fix: test cases
* fix: tests
* fix: test
* fix: space as indent
* fix: travis
2020-12-08 09:45:19 +05:30
Anuja P
550cb9c78f
fix: suggested changes
2020-12-07 11:11:00 +05:30
Anuja P
47b4b7009d
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
...
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
2020-12-07 10:55:44 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return
...
feat: Return tracking in PR/DN
2020-12-06 22:43:34 +05:30
Anuja P
b6cf75d2a8
fix: error messsage indent fix
2020-12-05 22:25:17 +05:30
Anuja P
d3157c9347
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
...
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
2020-12-05 22:21:03 +05:30
Anuja P
2e4faf96f2
fix: Added TDS Payable account number and an error message
2020-12-05 13:36:43 +05:30
Marica
067f35df26
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-12-04 21:13:23 +05:30
marination
c866abca56
fix: (travis) Disable update stock for deferred accounting item's Sales Invoice
2020-12-04 20:12:52 +05:30
marination
6a2431586e
fix: Make new Customers for account missing test and set company
2020-12-04 13:31:36 +05:30
Rohit Waghchaure
28e86cf183
fix: pricing rule with transaction not working for additional product
2020-12-04 11:57:56 +05:30
Glen Whitney
dea6a90a1f
feat(Accounting Dimension): other apps may have accounting dimension doctypes
...
Prior to this change, there was simply a single hardcoded list of doctypes
with accounting dimensions in ERPNext. However, when extending the
capabilities of ERPNext using an add-on app rather than by modifying
ERPNext itself, it may well be necessary to create new doctypes in other
apps that will have accounting dimensions as well.
So, this PR moves the list of doctypes with accounting dimensions into
hooks.py so it can be accumulated from multiple apps. It also allows the
list of doctypes in make_dimension_in_accounting_doctypes be specifiable,
for more convenient use in the after_install hooks of other apps.
2020-12-03 22:27:44 +00:00
Shivam Mishra
2fa3cac814
feat: update workspace folders
2020-12-03 15:48:57 +05:30
Shivam Mishra
2895645f86
feat: rename desk page to workspace
2020-12-03 15:39:53 +05:30
Deepesh Garg
12b45b3f2a
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-12-02 12:46:23 +05:30
Deepesh Garg
59820004b8
fix: Exception naming
2020-12-02 12:34:59 +05:30
Deepesh Garg
ab5053ef9c
fix: Accounting dimension import in PCV
2020-12-02 12:34:40 +05:30
Shivam Mishra
9aaca25edb
feat: update desk page json
2020-12-01 13:39:54 +05:30
Shivam Mishra
de68f74b4c
chore: update all desk pages
2020-12-01 12:51:38 +05:30
Afshan
ccf5dc66e2
feat: multi-currency payroll ( #23519 )
...
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* Update asset_value_adjustment.py
* patch: update columns
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: multi-currency payroll
* fix: refactor and added conditions
* fix: uncommented code
* style: removed comments
* fix: missing argument
* style: styling changes
* fix: test cases
* patch: update columns
* Update asset_value_adjustment.py
* style: formating
* style: formatting
* fix: 1st review
* fix: refactor
* Revert "fix: refactor"
This reverts commit eca0e17d11a192d60f249b2af992971c625aec46.
reverting to previous state
* Revert "fix: 1st review"
This reverts commit 7eac48b102157df4353598f73b2ea97308af436a.
reverting before 1st review
* fix: 2nd review changes
* fix: test cases
* fix: added call to fetch exchange rate
* fix: remove unnecessary code
* fix: refactor
* fix: refactor patch
* fix: refactor
* fix: refactor
* fix: clear test data
* fix: slider
* feat: Added company field in leave encashment and employee benefit
* refactor: Refactored multi-currency payroll patch
* fix: currency column in salary register
* refactor: Refactored code for making bank and return entry against employee advance
* fix: minor cleanup
* fix: fixed translation
* fix: removed salary component type
* fix: fixed sider issues
* fix: translation and slider
* style: formatted msg
* fix: fixed slider
* fix: travis
* fix: refactor
* fix: slider
* fix: slider
* fix: slider
* fix: travis
* fix: patch
* fix: patch
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: travis
* fix: re-run travis
* fix: rerun travis
* fix: rerun travis
* fix: rerun travis
* fix: travis rerun
* fix: increased throttle_user_limit from 60 to 100
* fix: patch
* fix: patch
* fix: assign payroll payable account as default payroll payable account in SSA
* fix: removed debugger
* fix: slider
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-12-01 09:11:05 +05:30
Shivam Mishra
27e7c264f2
fix: link type
2020-11-30 14:58:16 +05:30
Shivam Mishra
61388d412b
feat: update desk pages
2020-11-30 14:58:00 +05:30
marination
d0ee615c2c
chore: Pricing Rule with Item Price Test
2020-11-30 14:58:00 +05:30
marination
8e2ce641c3
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-11-30 14:58:00 +05:30
Raffael Meyer
896e4b1722
fix: improve UX of DATEV report ( #23892 )
...
* feat(DATEV Settings): button to show report
* feat(desk): add DATEV to Reports under Accounting
* fix(report DATEV): last calendar month as default
* fix: let user create DATEV Settings
(Instead of showing an error message.)
2020-11-30 14:58:00 +05:30
Raffael Meyer
1ea12079da
fix: fiscal year can be shorter than 12 months ( #23838 )
...
* fix: replace unnecessary SQL query
* feat: checkbox "Is Short Year"
Also, set checkbox and dates only once.
* fix: toggle no longer necessary
Date fields use set_only_once.
* feat: short years can be less than 12 months
* fix: if short year, don't add 12 months to start date
* test: short year
* fix: move short fiscal year to test records
2020-11-30 14:58:00 +05:30
marination
724e16bca1
chore: Use JSON style response and use ORM
...
- Use JSON style response for report columns
- Use ORM instead of frappe.db.sql
- Remove returned % from list view
2020-11-30 12:55:30 +05:30
Deepesh Garg
6302de9290
Merge pull request #23975 from deepeshgarg007/jv_zero_value
...
fix: Validation for journal entry with 0 debit and credit values
2020-11-30 10:56:40 +05:30
Deepesh Garg
2d5530da96
fix: Invoice discounting test
2020-11-29 22:17:47 +05:30
Marica
307bd01504
Merge branch 'develop' into pr-dn-return
2020-11-25 17:24:03 +05:30
Mohammad Hasnain Mohsin Rajan
90e33e53fd
refactor: Format translation strings ( #24004 )
...
* fix: translation strings
* fix: linting
2020-11-25 15:37:54 +05:30
Prssanna Desai
e60a62bde5
fix: function imports in account_balance_timeline.py ( #24003 )
2020-11-25 15:37:02 +05:30
Mohammad Hasnain Mohsin Rajan
e15b6a91de
Filters for tax templates ( #23998 )
...
* feat: add company filter to tax templates
* fix: remove filer from PO because it is from tran
* fix: linting
* fix: solve translation string issues
* fix: remove doctype name
2020-11-25 15:36:41 +05:30
Deepesh Garg
1a4390de44
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_filters
2020-11-25 14:51:11 +05:30
Deepesh Garg
6b9dda5f3e
fix: Move filter setup to doctype controllers
2020-11-25 14:49:10 +05:30
Deepesh Garg
92b3449789
fix: Label changes
2020-11-25 14:01:57 +05:30
Deepesh Garg
4e991fe668
fix: Define specific exceptions and fix tests
2020-11-25 13:46:07 +05:30
Deepesh Garg
df065f7044
fix: form layout and naming fixes
2020-11-25 13:44:52 +05:30
Marica
df17b4ff83
Merge branch 'develop' into pr-dn-return
2020-11-25 10:43:55 +05:30
Nabin Hait
0508e6bdfa
fix: Added link of bank reconciliation and clearance in accounting desk page ( #23809 )
2020-11-25 09:16:12 +05:30
Raffael Meyer
fbcc3c1b70
fix: Translatable strings ( #23783 )
...
* fix: start_pattern
* fix: translatable strings
* fix: add missing semicolon (task)
* fix: add missing semicolon (setup_wizard)
* fix: text should start on the same line
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: move out HTML element as variable
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: pull out message, translate "Undo".
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: typo
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* fix: text should start on the same line
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
* Revert "fix: start_pattern"
This reverts commit decc62e2ab75f45db1df022fe13780c2d0d2560d.
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-25 09:11:51 +05:30
Mohammad Hasnain Mohsin Rajan
e4755828c4
fix: template errors in pricing rule ( #23999 )
...
* fix: solve microtemplating errors
2020-11-24 23:31:06 +05:30
Deepesh Garg
20d6143c38
fix: Validation for journal entry with 0 debit and credit values
2020-11-21 12:09:11 +05:30
Smit Vora
8aeb340dc8
fix: add remarks to sales invoice
2020-11-19 19:18:48 +05:30
Rohit Waghchaure
f0b1670abc
fix: tds test case
2020-11-19 18:40:13 +05:30
Marica
9b897c4073
Merge branch 'develop' into pr-dn-return
2020-11-19 12:21:38 +05:30
Deepesh Garg
dd7a6d948c
Merge pull request #23672 from rohitwaghchaure/skip-non-apply-tds-invoices-develop
...
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-11-19 11:27:38 +05:30
Nabin Hait
2afc0bd87b
Merge branch 'develop' into naming-series-proj
2020-11-19 08:24:32 +05:30
Rucha Mahabal
14514f776b
fix: Enable Allow Auto Repeat for standard doctypes having auto_repeat field ( #23776 )
...
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
2020-11-19 08:17:16 +05:30
Deepesh Garg
f0187f6db2
Merge pull request #23447 from hasnain2808/UAE-VAT-Format
...
feat: UAE VAT 201 Report
2020-11-18 15:15:00 +05:30
Rushabh Mehta
542bc01718
fix(minor): update routes
2020-11-18 15:00:34 +05:30
Saqib
d82b76fe0a
fix: pos item search includes non stock items ( #23914 )
...
* fix: pos item search includes non stock items
* chore: add validation for non stock items
2020-11-18 11:56:49 +05:30
Deepesh Garg
350972ece4
fix: Account filters
2020-11-17 13:51:58 +05:30
Deepesh Garg
8b4d92d4fc
fix: Disable filters after test
2020-11-17 13:19:29 +05:30
Deepesh Garg
6456c3dc24
fix: Linting and test cases
2020-11-17 11:10:00 +05:30
Deepesh Garg
4bd52b4842
fix: Add test case
2020-11-16 23:01:36 +05:30
Deepesh Garg
d82c0f3bea
fix: Add disable and mandatory check for accounting dimension filters
2020-11-16 20:32:16 +05:30
Mohammad Hasnain
d2477e6cc5
fix(UAE VAT 201): remove branch parts
2020-11-16 18:47:05 +05:30
Mohammad Hasnain
2e1787300d
feat(UAE VAT 201): emirate according to branch
2020-11-16 17:36:27 +05:30
Marica
06f522cb27
Merge branch 'develop' into naming-series-proj
2020-11-16 13:32:24 +05:30
Deepesh Garg
0c6319194e
fix: GL Entry validation for dimensions
2020-11-16 13:20:19 +05:30
marination
d51c953c22
chore: Fix Tests, use project name instead of project_name field
2020-11-16 12:48:40 +05:30
rohitwaghchaure
6094d66a6d
Merge pull request #23636 from marination/item-price-pricing-rule-conflict
...
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-11-16 12:22:30 +05:30
Deepesh Garg
9e9ea96582
fix: linting
2020-11-16 12:03:47 +05:30
Deepesh Garg
1f9b03345d
fix: Remove project filter
2020-11-16 09:55:35 +05:30
Deepesh Garg
f916bc048f
fix: Remove cost center query from doctypes
2020-11-15 22:44:39 +05:30
Deepesh Garg
96e874bfda
fix: dimension filter query
2020-11-15 22:43:01 +05:30
Deepesh Garg
8b6370bb45
feat: Add accounting dimension filter doctype
2020-11-15 22:41:36 +05:30
Raffael Meyer
7178df8567
fix: improve UX of DATEV report ( #23892 )
...
* feat(DATEV Settings): button to show report
* feat(desk): add DATEV to Reports under Accounting
* fix(report DATEV): last calendar month as default
* fix: let user create DATEV Settings
(Instead of showing an error message.)
2020-11-15 09:45:10 +05:30
Raffael Meyer
4bf09dd02b
fix: fiscal year can be shorter than 12 months ( #23838 )
...
* fix: replace unnecessary SQL query
* feat: checkbox "Is Short Year"
Also, set checkbox and dates only once.
* fix: toggle no longer necessary
Date fields use set_only_once.
* feat: short years can be less than 12 months
* fix: if short year, don't add 12 months to start date
* test: short year
* fix: move short fiscal year to test records
2020-11-15 09:32:24 +05:30
Shivam Mishra
bed717b442
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-11-12 11:32:59 +05:30
Marica
2b44f22cf4
Merge branch 'develop' into fix-po-no-fetching
2020-11-11 11:10:34 +05:30
Mohammad Hasnain Mohsin Rajan
72adb0b218
Merge branch 'develop' into UAE-VAT-Format
2020-11-10 09:58:45 +05:30
Anurag Mishra
91fdb7aa69
feat: added column cost_center to receivable reports ( #23835 )
2020-11-09 20:20:05 +05:30
Marica
9a3e1f6f83
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 14:51:20 +05:30
Marica
63d1a0436c
Merge branch 'develop' into fix-po-no-fetching
2020-11-09 12:59:10 +05:30
Marica
f72a5a6dca
Merge branch 'develop' into pr-dn-return
2020-11-09 12:19:36 +05:30
Marica
709daf354b
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-09 10:33:32 +05:30
Marica
da2c6444f6
Merge branch 'develop' into bank-link-card-desk
2020-11-09 10:29:51 +05:30
Mohammad Hasnain Mohsin Rajan
d54969bd86
Merge branch 'develop' into UAE-VAT-Format
2020-11-06 23:39:34 +05:30
Mohammad Hasnain
c5aad7b6e5
feat(UAE VAT 201): reorder desk page listing
2020-11-06 23:36:50 +05:30
Mohammad Hasnain
4d99d695a3
feat(uae vat 201): update desk page entry
2020-11-06 23:33:19 +05:30
Saqib
e0af8fe8e5
fix: auto fetch sr nos with modifed conversion factor ( #23854 )
2020-11-06 18:19:36 +05:30
Saqib
1090181204
fix: auto fetch sr nos with modifed conversion factor ( #23855 )
2020-11-06 18:19:26 +05:30
Anupam Kumar
ca9b58589b
fix: replaced formatdate -> format_date ( #23847 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-11-06 14:56:27 +05:30
Marica
0d441b66cd
Merge pull request #23808 from nabinhait/web-page-bank-statement-section-pre-release
...
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-06 13:16:44 +05:30
marination
0b4946ba27
fix: Add missing links
...
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:15:46 +05:30
Nabin Hait
06ba92be7a
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-06 13:15:38 +05:30
marination
427c1bb0a7
fix: Add missing links
...
- Added Bank Transaction Statement Entry and Bank Statement Settings
2020-11-06 13:08:53 +05:30
Marica
7e1511f527
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-06 12:28:55 +05:30
Anupam
c3307f7900
fix: replaced formatdate -> format_date
2020-11-06 12:28:38 +05:30
Marica
d845e8a53a
Merge branch 'develop' into pr-dn-return
2020-11-06 12:25:11 +05:30
Marica
9694432270
Merge branch 'develop' into dialog-cleanup
2020-11-06 12:19:41 +05:30
Rohit Waghchaure
88e0a64df2
added test cases
2020-11-05 20:07:27 +05:30
Rohit Waghchaure
2fe3b1807f
fix: multiple pricing rules are not working on selling side
2020-11-05 20:07:19 +05:30
Anupam Kumar
3a9dc90695
fix: fix: replaced formatdate -> format_date ( #23829 )
2020-11-05 18:51:56 +05:30
Marica
6d2bcd2404
Merge branch 'develop' into purchase-invoice-payment-terms
2020-11-05 12:25:38 +05:30
Marica
a45f98ba99
Merge branch 'develop' into pr-dn-return
2020-11-05 10:34:23 +05:30
Marica
144fef0097
Merge branch 'develop' into item-price-pricing-rule-conflict
2020-11-05 09:28:30 +05:30
Marica
364916fa7b
Merge branch 'develop' into dialog-cleanup
2020-11-05 09:27:57 +05:30
Abhishek Balam
5db99e0649
fix: code improvement, match error type for message
2020-11-04 23:43:11 +05:30
Abhishek Balam
5fe3abcfae
fix: sales person without customer link throwing keyerror
2020-11-04 23:23:34 +05:30
Rucha Mahabal
dd7f4df669
fix: Budget test cases ( #23822 )
2020-11-04 21:59:08 +05:30
Nabin Hait
da14a76ee0
fix: Added link of bank reconciliation and clearance in accounting desk page
2020-11-04 13:06:36 +05:30
rohitwaghchaure
a53454d3d1
Update test_budget.py
2020-11-04 12:06:21 +05:30
marination
574477187f
chore: Pricing Rule with Item Price Test
2020-11-03 20:22:48 +05:30
Marica
cf08f0da70
Merge branch 'develop' into item-price-pricing-rule-conflict
2020-11-03 18:29:22 +05:30
Rohit Waghchaure
c8cc4bfc56
fix: Budget test cases
2020-11-03 17:09:09 +05:30
marination
53b1a9a40b
chore: Add Test for missing debit account
2020-11-03 15:56:09 +05:30
Marica
9a75a60784
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-11-03 12:03:50 +05:30
marination
28dd90f3dc
Merge branch 'develop' of https://github.com/frappe/erpnext into pr-dn-return
2020-11-02 15:16:31 +05:30
marination
d6596a169c
fix: Billing % Logic and Map Pending Qty only in PR and DN
...
- Billing % should consider unreturned amount as total
- While mapping to return doc, map unreturned amount
- Added field Received Qty in Stock UOM, to tally against Returned Qty in PR
- PR billing percentage updation custom function
- In patch set received qty in stock uom first, then update returned qty and billing
2020-11-02 15:07:48 +05:30
marination
97d38548aa
chore: Purchase Invoice Get Items From cleanup
2020-10-30 17:50:25 +05:30
marination
e14fdf4a3c
chore: RFQ cleanup and Title case for 'Get Items From'
...
- Cleanup up RFQ Get Items From Dialogs
- Title cased 'Get items from' to 'Get Items From'
2020-10-30 17:06:00 +05:30
Shivam Mishra
2d1f8341f9
feat: update onboarding for accounts
2020-10-30 15:55:19 +05:30
Shivam Mishra
18ef17f3ba
feat: add tour for sales taxes template
2020-10-30 15:55:19 +05:30
Mohammad Hasnain Mohsin Rajan
30197d7fba
Merge branch 'develop' into UAE-VAT-Format
2020-10-30 10:29:56 +05:30
Rucha Mahabal
1636383120
fix: subscription test case
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-30 00:09:55 +05:30
rohitwaghchaure
445d23223b
Merge branch 'develop' into multiple-pricing-rules-are-not-applied
2020-10-29 22:25:19 +05:30
Nabin Hait
2bb110b3d1
Merge branch 'develop' into fix-po-no-fetching
2020-10-29 18:57:33 +05:30
rohitwaghchaure
d0c2700c85
fix: subscription test case ( #23763 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-29 18:52:16 +05:30
prssanna
71e5b60df1
refactor: refactor contextual print setting implementation
2020-10-29 14:19:34 +05:30
Saqib
825d79b31b
fix: pos profile has no attr 'show_only_available_items' ( #23759 )
2020-10-29 13:23:59 +05:30
Saqib
b193731158
fix: pos profile has no attr 'show_only_available_items' ( #23758 )
2020-10-29 13:23:50 +05:30
Mohammad Hasnain Mohsin Rajan
55c78b17ba
fix(UAE VAT 201): change desk page record
2020-10-29 12:43:43 +05:30
Deepesh Garg
2004f64bcd
Merge pull request #23755 from deepeshgarg007/accounting_dimension_gl_fix_v13
...
fix: Do not allow Company as accounting dimension
2020-10-29 11:58:19 +05:30
Deepesh Garg
0dcb5887f3
fix: Do not allow Company as accounting dimension
2020-10-29 11:54:14 +05:30
Deepesh Garg
ae6a51b83a
Merge pull request #23749 from deepeshgarg007/accounting_dimension_gl_fix
...
fix: Do not allow Company as accounting dimension
2020-10-28 22:05:11 +05:30
Mohammad Hasnain Mohsin Rajan
6e9e6d2491
Merge branch 'develop' into UAE-VAT-Format
2020-10-28 21:06:11 +05:30
Rohit Waghchaure
0fa741b267
added test cases
2020-10-28 17:43:36 +05:30
Deepesh Garg
94a630c255
fix: Do not allow Company as accounting dimension
2020-10-28 17:15:14 +05:30
Saqib
0d5aff54c2
fix: pos register shows cancelled documents ( #23745 )
2020-10-28 17:09:07 +05:30
Saqib
a51d9e3259
fix: pos register shows cancelled documents ( #23747 )
2020-10-28 17:08:47 +05:30
Rohit Waghchaure
a248dfb9a5
fix: multiple pricing rules are not working on selling side
2020-10-28 16:22:49 +05:30
Marica
4326d21a79
Merge branch 'develop' into purchase-invoice-payment-terms
2020-10-27 18:40:20 +05:30
Marica
cf8698fb0b
Merge branch 'develop' into pr-dn-return
2020-10-27 15:34:51 +05:30
marination
fa085d7f4b
fix: Payment Terms not fetched in Purchase Invoice from Purchase Receipt
2020-10-27 13:18:30 +05:30
Saqib
fa5fe18b70
fix error message
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-10-26 19:27:02 +05:30
Deepesh Garg
64a4437b48
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-26 18:41:32 +05:30
Afshan
3f971b2371
fix: copying po no when mapping doc
2020-10-26 16:59:57 +05:30
rohitwaghchaure
8ba05dc674
Merge branch 'develop' into skip-non-apply-tds-invoices-develop
2020-10-26 14:11:34 +05:30
Saqib
34873bf26b
fix: multiple pos issues ( #23725 )
...
* fix: point of sale search
* fix: pos fetches expired serial nos
* fix: pos doesn't refresh on route change
* fix: opening balances not set in opening entry
* fix: remove debug statement
* fix: invalid query if no serial no is reserved by pos invoice
* chore: make new order btn primary
* chore: filter warehouse by company
* chore: add shortcuts for new order and email
* fix: cannot fetch serial no if no batch control
* chore: add shortcuts for menu items
* feat: standard keyboard shortcuts for pos page
* feat: display only items that are in stock
* fix: empty point of sale page if opening entry dialog is closed
* feat: conversion factor in pos item details
* fix: show all invalid mode of payments
* chore: show all items if allow negative stock is checked
* fix: -ve amount set when changing mode of payment
* fix: pos closing validations
* fix: test
* fix: non expired serial no fetching query
* fix: cannot dismiss pos opening creation dialog
* fix: transalation strings
* fix: msgprint to throw
* chore: use as_list in frappe.throw
* chore: clean up pos invoice.js & .py
* fix: codacy
* fix: transalation syntax
* fix: codacy
* fix: set_missing_values called twice from pos page
* fix: mode selector with double spaces
* fix: do not allow tables in pos additional fields
* fix: pos is not defined
* feat: set mode of payments for returns
* fix: remove naming series from pos profile
* fix: error message
* fix: minor bugs
* chore: re-arrange pos closing entry detail fields
* fix: sider & frappe linter
* fix: more translation strings
* fix: travis
* fix: more translation strings
* fix: sider
* fix: travis
* fix: unexpected end of string
* fix: travis
2020-10-26 13:24:47 +05:30
Saqib
60212ff9b9
fix: multiple pos issues ( #23347 )
...
* fix: point of sale search
* fix: pos fetches expired serial nos
* fix: pos doesn't refresh on route change
* fix: opening balances not set in opening entry
* fix: remove debug statement
* fix: invalid query if no serial no is reserved by pos invoice
* chore: make new order btn primary
* chore: filter warehouse by company
* chore: add shortcuts for new order and email
* fix: cannot fetch serial no if no batch control
* chore: add shortcuts for menu items
* feat: standard keyboard shortcuts for pos page
* feat: display only items that are in stock
* fix: empty point of sale page if opening entry dialog is closed
* feat: conversion factor in pos item details
* fix: show all invalid mode of payments
* chore: show all items if allow negative stock is checked
* fix: -ve amount set when changing mode of payment
* fix: pos closing validations
* fix: test
* fix: non expired serial no fetching query
* fix: cannot dismiss pos opening creation dialog
* fix: transalation strings
* fix: msgprint to throw
* chore: use as_list in frappe.throw
* chore: clean up pos invoice.js & .py
* fix: codacy
* fix: transalation syntax
* fix: codacy
* fix: set_missing_values called twice from pos page
* fix: mode selector with double spaces
* fix: do not allow tables in pos additional fields
* fix: pos is not defined
* feat: set mode of payments for returns
* fix: remove naming series from pos profile
* fix: error message
* fix: minor bugs
* chore: re-arrange pos closing entry detail fields
* fix: sider & frappe linter
* fix: more translation strings
* fix: travis
* fix: more translation strings
* fix: sider
* fix: travis
* fix: unexpected end of string
* fix: travis
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-26 11:17:04 +05:30
Nabin Hait
da301b0b7a
fix: merge conflict
2020-10-25 13:07:59 +05:30
Nabin Hait
ba1cca6b2d
fix: Show accounts in financial statements upto level 20 ( #23718 )
2020-10-24 22:00:32 +05:30
Marica
6f45a86920
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-23 19:56:15 +05:30
Deepesh Garg
c4be397954
Merge pull request #23439 from Mangesh-Khairnar/mpesa-integration
...
feat: M-pesa integration
2020-10-23 19:35:52 +05:30
Saqib
b4448114cf
feat: opening invoice creation tool with background jobs ( #23595 )
...
* feat: opening invoice creation tool with background jobs
* fix: tests
* fix: codacy
* fix: sider
* fix: codacy
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:32:37 +05:30
Marica
758a68da35
fix: Sequence Matcher shouldn't get None input ( #23539 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-23 19:26:43 +05:30
Michelle Alva
b39c17dd55
fix: Typo/Grammatical fixes in Settings ( #23612 )
...
* fix(Stock Settings): Type/Grammatical fixes in Settings
* fix: grammatical fixes in manufacturing settings
* fix: typo fix in accounting settings
* fix: typo fixes in HR settings
* fix: typo fixes in buying settings
* fix: typo fixes in Selling Settings
* Update erpnext/accounts/doctype/accounts_settings/accounts_settings.json
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Apply suggestions from code review
Co-authored-by: Sagar Vora <sagar@resilient.tech>
* Update accounts_settings.json
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Rushabh Mehta <rmehta@gmail.com>
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-23 18:22:26 +05:30
Mangesh-Khairnar
675f79920e
fix: consider the existing paid payment request for phone payment channel
2020-10-23 15:41:05 +05:30
Mangesh-Khairnar
e03a02d9c0
fix: show descriptive message for missing fields
2020-10-23 13:38:55 +05:30
marination
efcc489967
fix: Cashier Closing Type Issue
2020-10-23 11:55:03 +05:30
Nabin Hait
5778595d50
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-22 21:42:54 +05:30
Mangesh-Khairnar
1a6d82a447
fix(payment-request): only consider paid transactions
2020-10-22 01:07:49 +05:30
Shivam Mishra
5e00ed926c
feat: update icons
2020-10-21 12:30:22 +05:30
Shivam Mishra
9d468a8daf
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-21 11:38:31 +05:30
Mohammad Hasnain
c08591124c
chore(UAE VAT 21): solve merge conflicts
2020-10-20 10:17:48 +05:30
Mohammad Hasnain
75ccb62d46
Merge branch 'develop' into UAE-VAT-Format
2020-10-20 09:40:44 +05:30
Mohammad Hasnain
33cdfdfb7f
feat(UAE VAT 201): Add tests for report
2020-10-19 20:48:43 +05:30
Mangesh-Khairnar
5c29eb08c4
Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration
2020-10-19 18:29:46 +05:30
Mangesh-Khairnar
ebb8ee3dc6
fix(payment gateway account): add patch to set the payment channel as email
2020-10-19 18:27:40 +05:30
Joseph Marie Alba
8115be58a3
fix: Posting Date bug in load_defaults ( #23415 )
...
this.frm.posting_date is always invalid and should be changed to this.frm.doc.posting_date
The effect of this bug fix is, a default Posting Date value may now be set in Custom Script's onload event, and the default value will be honored.
Example: (Assuming posting date has been included in standard filter)
```
frappe.ui.form.on('Journal Entry', {
before_load(frm) {
var posting_date = $("input[data-fieldname='posting_date']")[0].value
posting_date = moment(posting_date)._d
frm.set_value('posting_date', posting_date )
}
})
```
Without the fix, the posting date will always be today's date. With the bug fix, the default value for posting date which is taken from the posting date's Standard Filter vale is honored.
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-10-19 17:02:04 +05:30
Glen Whitney
f5a8dc0f9c
fix(Bank Reconciliation): update/merge CR/DR journal entry search ( #23629 )
...
* fix(Bank Reconciliation): update/merge CR/DR journal entry search
Prior to this commit, the debit journal entry search (for
credit-side Bank Transaction entries) and the corresponding
credit journal entry search had diverged, with the latter
working but the former not working. Thus, the search for
journal entries matching a credit Bank Transaction (for the
purposes of reconciliation) was never returning any matching
journal entries, making reconciliation difficult.
To fix this, this commit not only updates the debit journal
entry search, but takes advantage of the fact that the two SQL
queries for the two sides (debit/credit) differ only by the
word "debit" or "credit," to merge the code for the two
queries, making the code more DRY and hopefully reducing the
chance of similar bugs occurring in the future.
* fix: message translation
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-19 16:49:55 +05:30
Shivam Mishra
2c2e7297ae
feat: update accounts onboarding
2020-10-19 14:44:02 +05:30
Saqib
896a0cc1f7
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-19 11:55:12 +05:30
Rucha Mahabal
c3b1aef9f9
fix(minor): msgprint not defined in POS Invoice ( #23680 )
...
* fix(minor): msgprint not defined in POS Invoice
* fix: translation friendly syntax
2020-10-18 19:28:26 +05:30
Faris Ansari
c6f4e84a45
Merge pull request #23640 from abhishekbalam/address_customisation
2020-10-16 18:21:09 +05:30
Marica
569e218aa0
Merge pull request #23666 from marination/payment-reco-mandatory-check
...
fix: Payment Reconciliation client side validations
2020-10-16 18:06:16 +05:30
Rohit Waghchaure
c70cc0d950
fix: tds calculation, skip invoices with "Apply Tax Withholding Amount" has disabled
2020-10-16 17:43:36 +05:30
rohitwaghchaure
6646c524e6
Merge pull request #23670 from rohitwaghchaure/enabled-no-copy-for-bill-date-devlop
...
refactor: enabled no copy property for Supplier Invoice Date to due date validation
2020-10-16 16:45:56 +05:30
marination
b14ffc4349
fix: Missing semicolon
2020-10-16 16:04:56 +05:30
Faris Ansari
be0fcbea68
fix: Dont add Contact link if is company address
2020-10-16 15:55:25 +05:30
Faris Ansari
22bcad9dc7
fix: Cleanup code
2020-10-16 15:28:12 +05:30
Rohit Waghchaure
3cdaa92582
refactor: enabled no copy property for Supplier Invoice Date to avoid due date validation
2020-10-16 15:26:27 +05:30
Shivam Mishra
5418818683
feat: add tour for account settings
2020-10-16 14:24:22 +05:30
marination
e9b04dc727
fix: Payment Reconciliation client side validations
2020-10-16 12:36:13 +05:30
Saqib Ansari
de505631a6
fix: codacy
2020-10-16 11:30:34 +05:30
Saqib Ansari
1dec68e8e4
fix: transalation syntax
2020-10-16 10:47:29 +05:30
Shivam Mishra
cb8457b9ae
feat: add description to Accounts onboarding
2020-10-15 13:53:12 +05:30
Wolfram Schmidt
3959ed5bef
Update payment_term.json ( #23644 )
...
added descriptions to fields to clarify input.
2020-10-14 22:48:46 +05:30
Deepesh Garg
ddccec4f5d
Merge pull request #23643 from deepeshgarg007/payment_reco_cancel
...
fix: Do not get cancelled vouchers in Payment Reconciliation
2020-10-14 22:09:08 +05:30
Deepesh Garg
37c2ed269e
fix: Do not get cancelled vouchers in Payment Reconciliation
2020-10-14 21:47:43 +05:30
Abhishek Balam
89419c9a30
fix: move get_shipping_address() from frappe to erpnext and fix references
2020-10-14 20:09:05 +05:30
Abhishek Balam
2f528c1c73
fix: gettext import and changed function order in address.py
2020-10-14 19:48:57 +05:30
Abhishek Balam
6e9e7b4c7a
fix: serverside validation overrides
2020-10-14 19:31:37 +05:30
Abhishek Balam
346ca568b7
fix: set company link in address when is_your_company_address is set
2020-10-14 18:11:04 +05:30
Nabin Hait
a2d6f254c5
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-14 16:34:56 +05:30
Saqib
577a7fe01d
fix: stock & account balance difference in fraction ( #23635 )
2020-10-14 15:44:30 +05:30
Marica
1cdb9b5b39
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-14 14:26:22 +05:30
marination
b5d16a82eb
fix: Dont overrule Item Price via Pricing Rule Rate if 0
2020-10-14 14:05:54 +05:30
Mohammad Hasnain
dfc3993cec
chore(UAE VAT 21): rename report
2020-10-14 12:21:36 +05:30
Raffael Meyer
d1863e6f9e
fix: Chart of Accounts ( #23530 )
...
* fix: Chart of Accounts
* fix: Chart of Accounts with lower case "of"
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-10-14 10:29:53 +05:30
Mohammad Hasnain Mohsin Rajan
abf628c95d
Merge branch 'develop' into UAE-VAT-Format
2020-10-14 00:26:57 +05:30
Saqib
639eea142f
Merge branch 'develop' into add-acc-to-a-group-fix
2020-10-13 21:42:22 +05:30
Sun Howwrongbum
93da52941e
fix: consider rounded_total in returns ( #23609 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-10-13 21:23:26 +05:30
Shivam Mishra
55f52e8135
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-10-13 20:09:22 +05:30
Mangesh-Khairnar
51228b5ee3
fix: make response handling more descriptive
2020-10-13 17:10:16 +05:30
Marica
43d3176d62
Merge branch 'develop' into patch-3
2020-10-13 17:01:18 +05:30
Marica
50b708f615
Merge branch 'develop' into pr-dn-return
2020-10-13 16:57:11 +05:30
Marica
6f819d797b
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-13 16:54:39 +05:30
Marica
c5e139a542
fix: Travis ( #23606 )
...
* fix: Rename `make_supplier_quotation` to `make_supplier_quotation_from_rfq` in missing places
* fix: Item Barcode and Test
* fix: Over Receipt on subcontracting test
* fix: POS Invoice and Loyalty Program Tests
* fix: POS serialized item test and subcontracting exploded items in PO
* fix: Subcontracting test considering sourced_by_supplier items
* fix: Make only one Additonal Salary List with overwrite set
2020-10-13 16:53:10 +05:30
aakvatech
617892db20
feat: Add company and correct filter in bank statement reconciliation report filters
...
If you have multi company scenario and many bank accounts that are no longer active, then it becomes difficult in bank statement reconciliation report to filter the account to reconcile and it also shows disabled accounts so futher confusion is created.
https://github.com/frappe/erpnext/issues/23613
2020-10-13 08:18:59 +03:00
Marica
978e16481e
Merge branch 'develop' into debit-credit-opening-invoice-tool
2020-10-12 21:17:22 +05:30
Anupam Kumar
71c02a6e89
Merge branch 'develop' into subscription-invoice-issue
2020-10-12 19:41:31 +05:30
Raffael Meyer
0975b961f9
Merge branch 'develop' into validate_regional_germany
2020-10-12 15:08:58 +02:00
Saqib
3daad224ad
fix: cannot merge pos invoice if validate selling price is checked ( #23593 )
...
* fix: cannot merge pos invoice if validate selling price is checked
* fix: validate selling price
* fix: test
* chore: add test
* fix: error message
2020-10-12 18:31:23 +05:30
Saqib
b332c5f06f
fix: sales invoice series gets overwritten with pos invoice series ( #23479 )
...
* fix: sales invoice series gets overwritten with pos invoice series
* chore: show is consolidated only if sales invoice is pos
2020-10-12 17:10:37 +05:30
Saqib
ebbe285872
feat: (report) POS Register ( #23313 )
...
* feat: pos register report
* feat: group by fields in pos register
* chore: add paid amount column
* fix: (minor) remove redundant group by label
2020-10-12 17:02:31 +05:30
Glen Whitney
6ec3dc5453
fix(asset): cannot create asset if cwip disabled and account not set ( #23580 )
...
* Never add an asset GL entry if CWIP is not enabled
* fix: asset purchase with purchase invoice
* chore: allow enable cwip accounting only if cwip account is set
* fix: cannot create asset if cwip disabled and account not set
Co-authored-by: Saqib Ansari <nextchamp.saqib@gmail.com>
2020-10-12 14:56:55 +05:30
Deepesh Garg
15d46040ff
fix: Do not consider opening entries for TDS calculation ( #23597 )
2020-10-12 12:39:08 +05:30
Anupam
efc3e1fa62
fix: Payment Schedule not fetching
2020-10-12 12:15:49 +05:30
Mohammad Hasnain
fc2ace1a31
Merge branch 'develop' into UAE-VAT-Format
2020-10-10 22:06:06 +05:30
rohitwaghchaure
ad9db89514
Merge pull request #23573 from deepeshgarg007/opening_jv
...
fix: Opening Journal Entry via Data Import
2020-10-10 13:16:41 +05:30
Deepesh Garg
e9c1098f5f
Merge pull request #23566 from michellealva/sales_team
...
fix: Change name of Sales Team table
2020-10-10 12:14:00 +05:30
rohitwaghchaure
1bcd84450c
Merge pull request #23560 from deepeshgarg007/regional_doctypes_desk
...
fix: Add lower deduction certificate in desk page
2020-10-10 11:23:26 +05:30
rohitwaghchaure
04ddf24ffe
Merge pull request #23572 from marination/payment-entry-list-view
...
fix: Check if list view standard filter exists in Payment Entry
2020-10-10 11:09:31 +05:30
Deepesh Garg
2676f96203
fix: Opening Journal Entry via Data Import
2020-10-09 21:58:38 +05:30
marination
07731c7735
fix: Check if list view standard filter exists in Payment Entry
2020-10-09 21:44:23 +05:30
Saqib Ansari
d927c8efba
fix: (revert) Add Delivery Note Count in Sales Invoice Dashboard
2020-10-09 21:00:33 +05:30
michellealva
1bc7fc41a5
fix: Change name of Sales Team table
2020-10-09 16:01:13 +05:30
Deepesh Garg
5e6ea36938
fix: Add lower deduction certificate in desk page
2020-10-08 20:32:36 +05:30
marination
4be5b5c891
fix: Handle missing Account and Item in Opening Invoice Creation Tool
2020-10-08 19:51:42 +05:30
Deepesh Garg
c837b5f48c
Merge pull request #23014 from abhishekbalam/pricing_rule_on_condition
...
feat(Accounts): Add Condition Field In Pricing Rule
2020-10-08 16:32:21 +05:30
Abhishek Balam
6d1af84fef
Merge branch 'develop' into budget
2020-10-08 16:23:36 +05:30
Saqib Ansari
3f28fb19aa
chore: validate is_group of child parent account before auto creating an account
2020-10-08 14:57:27 +05:30
Saqib
22b4c86a38
fix: cannot merge pos invoices with inclusive tax ( #23541 )
...
* fix: cannot merge pos invoices with inclusive tax
* fix: item rate calculation
2020-10-08 11:23:21 +05:30
michellealva
a9c2401a2d
fix: Typo in Accounts Setings
2020-10-07 15:13:57 +05:30
Abhishek Balam
937308854a
Merge branch 'develop' into pricing_rule_on_condition
2020-10-07 13:35:53 +05:30
Raffael Meyer
2acfc2a034
Merge branch 'develop' into validate_regional_germany
2020-10-06 16:53:52 +02:00
michellealva
2e425efae8
fix: blank option in the beginning
2020-10-06 15:15:29 +05:30
michellealva
a2aae5644e
fix(Budget): Change options in select field
2020-10-06 15:02:01 +05:30
Deepesh Garg
f183dd6d3a
Merge branch 'develop' into tax_fetch_quote
2020-10-06 13:27:28 +05:30
Mangesh-Khairnar
8d54d61c28
fix: handle payment completion via payment request
2020-10-05 22:37:31 +05:30
Deepesh Garg
5bf35e465e
Merge pull request #23220 from marination/account-add-rename
...
feat: Validate and Update Child Company Accounts on Rename/Adding Account
2020-10-04 15:19:26 +05:30
Mangesh-Khairnar
1bef6a530c
fix: create payment entry against payment request
2020-10-04 13:01:11 +05:30
aakvatech
38ccf82604
fix: get_outstanding_invoices not ignoring the cancelled transactions
...
Added is_cancelled=0 in 2 places for get_outstanding_invoices
2020-10-03 19:41:38 +03:00
rohitwaghchaure
3c77a4697b
Merge pull request #23471 from rohitwaghchaure/fixed-currency-issue-in-pl-report
...
fix: currency symbol in profit and loss report
2020-10-03 10:32:00 +05:30
Abhishek Balam
71c24c8a90
feat: add tests
2020-10-01 14:54:11 +05:30
rohitwaghchaure
d65e050f4b
Update profit_and_loss_statement.py
2020-09-30 18:17:21 +05:30
Rohit Waghchaure
b428e4c493
fix: currency symbol in profit and loss report
2020-09-30 17:44:35 +05:30
Deepesh Garg
23313538df
Merge pull request #23465 from abhishekbalam/currency_in_trial_balance
...
fix(Accounts): Add Currency filter in Trial Balance report
2020-09-30 13:16:16 +05:30
Abhishek Balam
001e7e9df9
fix: remove default value
2020-09-30 10:39:26 +05:30
Abhishek Balam
42d8db59f0
fix: add currency select to Trial Balance
2020-09-30 01:32:42 +05:30
Deepesh Garg
bc44bc64cc
fix: Add test
2020-09-29 18:39:45 +05:30
barredterra
81ad90c1d4
feat: validate sales invoice for germany
2020-09-29 11:54:57 +02:00
Marica
25f4c1636e
Merge branch 'develop' into account-add-rename
2020-09-29 13:18:54 +05:30
hasnain2808
a5e8e449ee
chore: Merge branch 'develop' into UAE-VAT-Format
2020-09-28 20:43:03 +05:30
hasnain2808
23c8966e81
Merge branch 'develop' into UAE-VAT-Format
2020-09-28 20:06:02 +05:30
Mangesh-Khairnar
8d12c3841f
fix: process transaction callback
2020-09-28 19:40:42 +05:30
hasnain2808
587bb05a37
feat(UAE VAT 21): Add desk page for UAE VAT 21
2020-09-28 14:52:29 +05:30
Mangesh-Khairnar
98658603dd
Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration
2020-09-28 02:10:53 +05:30
Shivam Mishra
9a4d603403
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-09-25 11:44:37 +05:30
marination
8370d9b997
fix: Check Company in Payment Entry before selecting values
2020-09-24 11:51:03 +05:30
Deepesh Garg
cfc5e29127
fix: Post cancellation accounting entry on posting date instaed of current ( #23361 )
2020-09-23 17:19:11 +05:30
Mangesh-Khairnar
4eb215badb
fix: bind callback callback for realtime event
2020-09-23 15:55:21 +05:30
Afshan
8be51e22c4
fix: escape apostrophe in cost centre and project if exist
2020-09-23 14:52:36 +05:30
marination
fd155408e5
fix: Check if account exists in parent company on rename
...
- Check if child company is dependent on parent company
- Check if account-to-be-renamed exists in parent, if yes, block
- Revised Test basd on the same
2020-09-23 14:42:10 +05:30
Marica
ef2b5e8284
Merge branch 'develop' into pr-dn-return
2020-09-22 15:39:25 +05:30
Mangesh-Khairnar
97ab96c8bf
fix: handle api changes from callbacks
2020-09-22 12:58:32 +05:30
Rohan
e42f08085b
fix: use Plaid's new API (develop) ( #23318 )
...
Co-authored-by: Mangesh-Khairnar <mkhairnar10@gmail.com>
2020-09-21 13:14:07 +05:30
Deepesh Garg
5c8dd6a0ed
Merge pull request #23355 from Anurag810/accounts_recievable
...
fix: Cost Center filter in accounts receivable and payable report
2020-09-20 19:36:30 +05:30
Saqib
4b25eb4db4
fix: mode of payment not fetched if no account is set ( #23334 )
...
Co-authored-by: Sagar Vora <sagar@resilient.tech>
2020-09-19 19:33:21 +05:30
Mangesh-Khairnar
a3ac4bf681
fix: create payment request via pos
2020-09-18 19:47:33 +05:30
Saqib
7126e179c3
fix: button click event not working in POS custom fields ( #23358 )
2020-09-22 16:35:11 +05:30
Abhishek Balam
4e6733293f
fix(DocTypes): Reset "owner" values in DocTypes to Administrator ( #23350 )
...
* fix: reset owner values in doctype to Administrator
* fix: updated modified value
* fix: also fixed modified by
* fix: change modified_by to Administrator
2020-09-18 18:27:24 +05:30
Saqib
c29ee691d4
fix: button click event not working in POS custom fields ( #23358 )
2020-09-18 15:27:17 +05:30
Anurag Mishra
170ecdc76e
fix: No handlefor Cost centers in Accounts Receivable
2020-09-18 13:26:46 +05:30
Deepesh Garg
5c04b2eea4
Merge pull request #23235 from Anurag810/custom_remark
...
feat: added option to add custom remarks in payment entry
2020-09-16 13:38:04 +05:30
Deepesh Garg
2f50cb3e58
fix: Supplier trigger onload
2020-09-15 15:00:32 +05:30
Anurag Mishra
9397b7f58b
fix: requested changes
2020-09-15 12:36:01 +05:30
Deepesh Garg
36bc0577a2
fix: Item GL entries for purchase invoice ( #23027 )
2020-09-15 09:44:46 +05:30
Rucha Mahabal
fcb6ba6ec7
fix: get_transaction_entries function arguments in Bank Statement Transaction Entry ( #23051 )
2020-09-14 21:12:36 +05:30
Mangesh-Khairnar
40d3add63c
feat(payment-gateway-account): add additional payment channel
2020-09-14 15:14:36 +05:30
marination
02c550c07d
fix: Redundant imports
2020-09-11 16:22:54 +05:30
Marica
4153a9f8de
Merge branch 'develop' into pr-dn-return
2020-09-11 16:10:48 +05:30
marination
9533318832
chore: Tests for Rename and Add child Account
2020-09-11 16:09:27 +05:30
Saqib
cd89994b33
fix: multiple pos issues ( #23297 )
...
* fix: returns can be made against unconsolidated invoices
* fix: indentation
* fix: mode of payment not fetching for pos returns
* patch: default pos profile print format
* fix: tests
* chore: clean up retail desk page
2020-09-10 19:28:46 +05:30
Suraj Shetty
67095d239f
fix: Custom dashboard sections
2020-09-10 17:15:52 +05:30
marination
efb211af6d
chore: Fix Received/Delivered Items to Billed Logic
2020-09-09 16:24:11 +05:30
rohitwaghchaure
1d555f35a7
Merge pull request #23282 from deepeshgarg007/tds_bug
...
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-08 16:59:29 +05:30
Deepesh Garg
f7731b0715
fix: TDS applicable on creating PI from get items button
2020-09-08 13:41:04 +05:30
Afshan
12ab8ebc95
fix: removed ignore permission flag
2020-09-08 12:55:42 +05:30
rohitwaghchaure
0cb805308f
Merge pull request #23256 from Mangesh-Khairnar/fix-adv-payment-payment-order
...
fix: capture advance payments in payment order
2020-09-08 09:59:47 +05:30
barry86m
5b381ac5b7
fix: consolidated financial statement sums values into wrong parent
...
fix proposed by Andriesvn in bug report
closes #22180
2020-09-08 00:27:57 +01:00
Deepesh Garg
74ab1084b3
fix: Apply TDS on Purchase Invoice creation from Purchase Order and Purchase Receipt
2020-09-07 17:55:10 +05:30
Mangesh-Khairnar
7456ffca0f
fix: teardown created payment order
2020-09-04 19:59:01 +05:30
Mangesh-Khairnar
a76bf4d7af
fix: remove unused imports
2020-09-04 19:08:08 +05:30
Mangesh-Khairnar
d9e4883392
test: check payment order creation against payment entry
2020-09-04 18:55:14 +05:30
Mangesh-Khairnar
e1889d0c1b
fix(payment entry): update payment order status
2020-09-04 14:45:19 +05:30
Mangesh-Khairnar
8d8af94182
fix: capture advance payments in payment order
2020-09-04 12:17:56 +05:30
Deepesh Garg
b306fa355d
Merge pull request #23248 from deepeshgarg007/pda_account_filter
...
fix: Account filter in Process Deferred Accounting doctype
2020-09-03 19:22:56 +05:30
Deepesh Garg
9b681770d0
fix: Account filter in Process Deferred Accounting doctype
2020-09-03 18:09:02 +05:30
michellealva
0857e6d669
fix: Add "Bank Clearance" and "Bank Reconciliation" in desk
2020-09-03 10:37:43 +05:30
Anurag Mishra
41f421d400
feat: added option to add custom remarks in payment entry
2020-09-02 13:47:18 +05:30
rohitwaghchaure
3312956890
Merge pull request #23019 from prssanna/gross-profit-total
...
feat: enable total row in Gross Profit Report
2020-09-02 12:18:41 +05:30
rohitwaghchaure
6a51f3929b
Merge pull request #23054 from marination/general-ledger-filters
...
fix: General Ledger filter validation
2020-09-01 17:53:32 +05:30
Anupam Kumar
232cb37ebf
Merge branch 'develop' into variance-report-fix
2020-09-01 09:31:22 +05:30
Afshan
1dc9a9b669
fix: reverse journal entry for multi-currency ( #23165 )
...
* fix: reverse journal entry for multi-currency
* fix: test case for reverse journal entry
2020-08-31 20:35:05 +05:30
marination
8938d1040d
fix: Rename/Update Child company Accounts as well
2020-08-31 18:18:10 +05:30
Deepesh Garg
bdc933b3d3
Merge pull request #22985 from deepeshgarg007/accounting_period_cancellation
...
fix: Cancellation of accounting transactions within closed accounting period
2020-08-31 17:16:55 +05:30
marination
fdcda85f87
fix: Validate Missing Accounts in Child Companies
...
- If parent account exists in Parent and now child, throw error
2020-08-31 16:10:52 +05:30
Deepesh Garg
56ddf41873
Merge pull request #23211 from michellealva/tax-cat
...
feat: Allow Rename for Tax Category
2020-08-31 15:56:43 +05:30
michellealva
c71e37c988
feat: Allow Rename for Tax Category
2020-08-30 19:42:24 +05:30
Syed Mujeer Hashmi
b23840bf7b
fix: Filter out cancelled entries in customer ledger summary
...
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-08-29 23:09:18 +05:30
Rucha Mahabal
8cdc3b5d91
Merge branch 'develop' into patch-9
2020-08-28 10:41:02 +05:30
Suraj Shetty
f39bb116cc
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-27 19:27:49 +05:30
prssanna
a324e9bd12
fix: remove text-muted and small class fromtree items
2020-08-27 19:26:14 +05:30
Suraj Shetty
a49af09705
fix: Primary button icon
2020-08-27 18:57:43 +05:30
Suraj Shetty
b6ebcd7559
refactor: Replace darkgray indicator with gray indicator
2020-08-27 18:57:18 +05:30
prssanna
744169833c
fix: replace indicator color darkgrey with darkgray
2020-08-27 17:06:10 +05:30
michellealva
ead2f6abf0
fix: Chage fiedtype of Customer's PO in Sales Invoice
2020-08-27 13:57:15 +05:30
Marica
e7fabb10e1
Merge branch 'develop' into general-ledger-filters
2020-08-27 11:59:01 +05:30
bhavesh95863
bb5d886930
fix: account & cost center filter by company
2020-08-26 18:23:21 +05:30
Abhishek Balam
dc9af639a7
fix: move condition field
2020-08-26 12:26:15 +05:30
Abhishek Balam
7d0bb25aca
fix: dont show message on condition syntax error
2020-08-26 12:22:31 +05:30
Michelle Alva
258b256dc6
fix: Add Delivery Note link in Sales Invoice Dashboard ( #23161 )
2020-08-25 20:37:39 +05:30
Rushabh Mehta
ee921052c0
fix(minor): test dependencies
2020-08-25 14:35:49 +05:30
Rushabh Mehta
b5b8f9e72d
fix(minor): import
2020-08-25 14:14:23 +05:30
Rushabh Mehta
8ad0fa48bf
fix(minor): circular imports?
2020-08-25 12:24:31 +05:30
Rushabh Mehta
ff5d19609f
fix(hot): Pricing Rule encoding fixed
2020-08-25 11:59:57 +05:30
Deepesh Garg
07ee7a5bd6
Merge branch 'develop' into dims_in_gl_report
2020-08-24 20:23:19 +05:30
Suraj Shetty
6f9f40992c
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-23 16:33:50 +05:30
Nabin Hait
111183d080
fix: Installation failed due to global variable ( #23114 )
2020-08-22 12:31:06 +05:30
rohitwaghchaure
019d4debb2
fix: incorrect stock value in return case ( #23102 )
2020-08-20 15:53:58 +05:30
Rucha Mahabal
434bab8003
fix: Print Language for Customer not set for Print Receipt in POS
2020-08-19 01:00:59 +05:30
Rohit Waghchaure
310ade7282
profit and loss report not working
2020-08-18 16:07:24 +05:30
Marica
847343af86
Merge branch 'develop' into general-ledger-filters
2020-08-18 13:40:45 +05:30
Michelle Alva
849b712770
fix: Change spelling of "Successful" ( #23063 )
...
Before:
Import Successfull
After:
Import Successful
2020-08-18 12:06:46 +05:30
Rucha Mahabal
035907a24f
fix: remove Request for Quotation link from Fiscal Year dashboard ( #23040 )
2020-08-18 10:57:10 +05:30
Glen Whitney
b2604d1f77
fix(General Ledger): include Accounting Dimension columns in report
...
Prior to this commit, custom Accounting Dimensions are not
(by default) shown or even considered in generating a General
Ledger report. Moreover, as they are not considered, they are
not used to distinguish GL Entry lines in the same voucher
with the same Account when the "Group By" value is
"Group by Voucher (Consolidated)". This situation leads to
lines with different values for the accounting dimension
to be ganged together in the General Ledger view of a Journal
entry, making the entry difficult for an accountant to read.
This commit alleviates the problem by adding a checkbox
to control whether Accounting Dimension columns are considered
in the General Ledger report. When they are considered, they
are displayed and also included in the key that distinguishes
lines in the "Group by Voucher (Consolidated)" mode.
Resolves #23033 .
2020-08-17 20:43:56 +00:00
Deepesh Garg
1067f7ed3e
fix: Price rule filtering in case of no doc
2020-08-17 23:47:58 +05:30
marination
eb241c6c42
fix: General Ledger filter validation
2020-08-17 12:57:56 +05:30
Afshan
5b45961b9d
fix: the JSON object must be str, bytes or bytearray, not "list" ( #23047 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-17 10:51:53 +05:30
Deepesh Garg
d9accededa
fix: filter pricing rules based on condition
2020-08-14 22:36:01 +05:30
Rucha Mahabal
5fb0e7184e
fix: list index out of range error while setting POS payment mode ( #23018 )
2020-08-14 17:11:39 +05:30
bhavesh95863
a647bef682
fix: warehouse mandatory even update stock uncheck ( #23023 )
2020-08-13 17:41:55 +05:30
Anupam K
b3bd780d46
fix: codasy dix
2020-08-13 17:07:15 +05:30
Abhishek Balam
a25760046f
fix: condition syntax validation readded, fetch item details if condition not met ignoring rule
2020-08-13 13:22:58 +05:30
Abhishek Balam
487aa30aef
fix: eval fail message fix
2020-08-13 12:19:34 +05:30
Deepesh Garg
ca898c6da3
fix: Condition fix
2020-08-13 11:54:18 +05:30
Deepesh Garg
cbde04d3da
fix: Pass doc instead of args
2020-08-13 11:47:41 +05:30
prssanna
bfb219612e
feat: enable total row in Gross Profit Report
2020-08-13 11:34:05 +05:30
Abhishek Balam
fdfab03c11
feat: add condition field in pricing rule
2020-08-12 20:33:54 +05:30
Nabin Hait
19ea7218d9
fix: Calculate taxes if tax is based on item quantity and inclusive on item price
2020-08-11 20:34:57 +05:30
Abhishek Balam
ee5b9c7691
feat(Accounting): Process Statement Of Accounts ( #22901 )
...
* feat: Process Statement Of Accounts initial commit
* fix: add jinja supported inputs for subject and body in email settings
* feat: utils support in template, tested autoemail, fixed issues
2020-08-11 16:23:47 +05:30
Anupam Kumar
79d731dcd8
feat: Naming series for Sales/Purchase Return ( #22942 )
...
* feat: adding return naming series
* Update purchase_invoice.json
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-11 16:11:20 +05:30
Afshan
acc3d42cf0
fix: escape apostrophe in company name if exist ( #22956 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2020-08-11 14:40:44 +05:30
Rucha Mahabal
f7a7cc08d9
Merge branch 'develop' into escape-company-field
2020-08-11 10:22:32 +05:30
sahil28297
4e4a19d3e6
Merge pull request #22984 from saurabh6790/tax-template-issue
...
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 16:01:35 +05:30
Deepesh Garg
069a54e5c3
fix: Cancellation of accounting transactions within closed accounting period
2020-08-10 16:01:01 +05:30
marination
3beeeb589a
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:55:02 +05:30
Saqib Ansari
cc5b49bff4
fix: [pos] minor bugs
2020-08-10 15:52:32 +05:30
Deepesh Garg
372abaa420
Merge pull request #22976 from marination/sales-taxes-dashboard
...
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:59 +05:30
marination
0f27500197
fix: Susbcription in Sales Taxes and Charges Dashboard
2020-08-10 15:17:58 +05:30
Saqib Ansari
f1091534cd
fix: [pos] minor bugs
2020-08-10 14:45:58 +05:30
Afshan
1f3cc7553c
fix: grand_total assigment before reference
2020-08-07 15:57:31 +05:30
Rucha Mahabal
8118dd9e62
fix: escape company field
2020-08-07 14:52:50 +05:30
Raffael Meyer
d854d39c00
fix: show only company's bank accounts
2020-08-06 15:09:22 +02:00
Deepesh Garg
44d62ad0d7
Merge pull request #22921 from ruchamahabal/fix-payment-entry-ref
...
fix: condition for checking reference details for Payment Entry
2020-08-05 23:16:14 +05:30
Suraj Shetty
8d05514260
refactor: Format and sanitise user inputs to search queries. ( #22922 )
...
* refactor: Sanitize whitelisted method inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Format and sanitize tax_account_query inputs
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Validate and sanitize search inputs via decorator
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* style: Minor formatting fix
* refactor: Validate and sanitize search inputs using decorator
* fix: Typo
* fix: Remove unwanted import statement
* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 20:07:30 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. ( #22913 )
...
* refactor: Sanitize whitelisted method inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Format and sanitize tax_account_query inputs
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* refactor: Validate and sanitize search inputs via decorator
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
* style: Minor formatting fix
* refactor: Validate and sanitize search inputs using decorator
* fix: Typo
* fix: Remove unwanted import statement
* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-08-05 19:42:25 +05:30
Rucha Mahabal
5da067b689
fix: condition for checking reference detail for Payment Entry
2020-08-05 18:18:57 +05:30
Nabin Hait
a042d4721e
fix: Bank Clearance of POS purchase invoice ( #22882 )
2020-08-03 20:42:15 +05:30
Nabin Hait
a1d3537f2a
fix: Bank Clearance of POS purchase invoice ( #22883 )
2020-08-03 20:42:00 +05:30
Rucha Mahabal
b7311c8fc1
fix: SQL query in accounts receivable, payable reports ( #22888 )
2020-08-03 20:41:25 +05:30
Nabin Hait
5e548b4387
Dunning cleanup beta ( #22899 )
...
* fix: Dunning cleanup
* fix: Added dashboard for Dunning
2020-08-03 20:39:15 +05:30
Nabin Hait
48163e31c5
Dunning cleanup ( #22898 )
...
* fix: Dunning cleanup
* fix: Added dashboard for Dunning
2020-08-03 20:38:28 +05:30
Rucha Mahabal
b50b20458e
fix: TypeError while concatenating account number and name in COA ( #22885 )
...
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-08-03 15:51:57 +05:30
Deepesh Garg
2f2de2264d
Merge pull request #22887 from deepeshgarg007/subscription_test
...
fix: Test case for subscription
2020-08-03 14:31:21 +05:30
Deepesh Garg
5572f8eb1e
fix: Test case for subscription
2020-08-03 13:40:11 +05:30
Shivam Mishra
de80553d89
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-08-03 12:34:05 +05:30
Nabin Hait
826158c792
fix: Update modified timestamp in accounts settings ( #22874 )
2020-08-03 09:34:55 +05:30
Nabin Hait
4cc99286c0
fix: Update modified timestamp in accounts settings ( #22873 )
2020-08-03 09:33:31 +05:30
Deepesh Garg
01e0d50eba
Merge pull request #22854 from nabinhait/gl-balance-fix
...
fix: Ignore cancelled gl entries to get account balance
2020-07-30 22:15:23 +05:30
Shivam Mishra
11111cd9a9
Merge branch 'develop' of https://github.com/frappe/erpnext into rebrand-ui
2020-07-30 21:29:02 +05:30
Nabin Hait
38d5c2e04f
fix: Ignore cancelled gl entries to get account balance
2020-07-30 20:53:07 +05:30
Nabin Hait
9837285bf1
fix: Ignore cancelled gl entries to get account balance
2020-07-30 20:52:20 +05:30
Marica
c1e46d8131
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-07-28 12:29:47 +05:30
Deepesh Garg
9119b4c538
fix: Unable to submit backdated stock transactions for different items ( #22648 )
...
* fix: Unable to submit backdated stock transactions for different items
* fix: Test cases
* fix: Test Cases
* fix: Test Cases
* fix: Test for stock account JV
* fix: Journal Entry Test
2020-07-28 08:49:44 +05:30
Deepesh Garg
fa28e600b5
fix: Unable to submit backdated stock transactions for different items ( #22822 )
...
* fix: Unable to submit backdated stock transactions for different items
* fix: Test cases
* fix: Test Cases
* fix: Test Cases
* fix: Test for stock account JV
* fix: Journal Entry Test
* fix: Delete unwanted code
2020-07-28 08:49:21 +05:30
Anupam K
8718daa11e
Adding formatter in budget variance report
2020-07-25 23:56:11 +05:30
Deepesh Garg
c591b77613
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-07-24 19:04:05 +05:30
Mangesh-Khairnar
762f6297f6
fix(payment-request): do not set guest as administrator ( #22804 )
2020-07-24 18:05:13 +05:30
Mangesh-Khairnar
8721530b4b
fix(payment-request): do not set guest as administrator ( #22801 )
2020-07-24 17:19:56 +05:30
Nabin Hait
a8efe8eb5f
Merge branch 'develop' into version-13-beta-pre-release
2020-07-24 11:15:13 +05:30
Afshan
91fe10666e
fix: buying price for non stock item in gross profit report ( #22616 )
...
* fix: buying price for non stock item in gross profit report
* fix: refactor query
2020-07-24 09:49:17 +05:30
Nabin Hait
39969647ca
fix: Added missing project field in Purchase invoice ( #22799 )
2020-07-24 09:48:54 +05:30
Deepesh Garg
9843e9f917
fix: Expnese claim outstanding while making payment entry ( #22735 )
2020-07-23 20:58:57 +05:30
Deepesh Garg
76028cde6a
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-07-23 19:05:17 +05:30
Abhishek Balam
d05a98517d
Fix: Increase Length Of "In Words" and "In Words (Company Currency)" fields ( #22732 )
...
* new parent updating logic, made requested changes
* fix: Increase Length of In Words fields
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 19:01:31 +05:30
Saqib
a6f98d48bc
refactor: POS workflow ( #20789 )
...
* refactor: add pos invoice doctype replacing sales invoice in POS
* refactor: move pos.py to pos invoice
* feat: add pos invoice merge log doctype
* feat: ability to merge pos invoices into a sales invoice
* feat: [wip] new ui for point of sale
* fix: pos.py moved to pos_invoice
* feat: loyalty points for POS Invoice
* fix: loyalty points on merging
* feat: return against pos invoices
* Merge 'fork/serial-no-selector' into refactor-pos-invoice
* chore: status fix and set warehouse from pos profile
* fix: naming series
* feat: merge pos returns into credit notes
* feat: add pos list action for merging into sales invoices
* feat[UX]: add shortcuts & focus on search after customer selection
* feat: stock validation from previous pos transactions
* Merge 'fork/serial-no-selector' into refactor-pos-invoice
* chore: fix df not found for base_amount precision
* feat: serial no validation from previous pos transactions
* chore: move pos.py into pos page
* feat: pos opening voucher
* feat: link pos closing voucher with opening voucher
* chore: use map_doc instead of get_mapped_doc for better perf
* feat: enforce opening voucher on pos page
* feat: [ui] [wip] point of sale beta ui refactor
* fix: auto fetching serial nos with batch no
* feat: [ui] item details section for new pos ui
* feat: remove item from cart
* refactor: [ui] [wip] split point_of_sale into components
* new payment component
* new numberpad
* fix pos opening status
* move from flex to grids
* fix: search from item selector
* feat: loyalty points as payment method
* feat: pos invoice status
* fix a bug with invalid JSON
* fix: loyalty program ui fixes
* feat: past order list and past order summary
* feat: (minor) setting discount from item details
* fix: adding item before customer selection
* feat: post order submission summary
* save and open draft orders
* fix: item group filter
* fix: item_det not defined while submitting sle
* fix: minor bugs
* fix: minor ux fixes
* feat: show opening time in pos ui
* feat: item and customer images
* feat: emailing and printing an invoice
* fix: item details field edit shows empty alert
* fix: (minor) ux fixes
* chore: rename pos opening voucher to pos opening entry
* chore: (minor) rename pos closing voucher and sub doctypes
* chore: add patch for renaming pos closing doctypes
* fix: negative stock not allowed in pos invoices* default is_pos in pos invoices* fix: transalation
* fix: invoices not getting fetched on pos closing
* fix: indentation
* feat: view / edit customer info
* fix: minor bugs
* fix: minor bug
* fix: patch
* fix: minor ux issues
* fix: remove uppercase status
* refactor: pos closing payment reconciliation
* fix: move pos invoice print formats to pos invoice doctype
* fix: ui issues
* feat: new child doctype to store pos payment mode details
* fix: add to patches.txt
* feat: search by serial no
* chore: [wip] code cleanup
* fix: item not selectable from cart
* chore: [wip] code cleanup
* fix: minor issues
* loyalty points transactions
* default payment mode
* fix: minor fixes
* set correct mop amount with loaylty points
* editing draft invoices from UI
* chore: pos invoice merge log tests
* fix: batch / serial validation in pos ui and on submission
* feat: use onscan js for barcode scan events
* fix: cart header with amount column
* fix: validate batch no and qty in pos transactions
* chore: do not fetch closing balances as opening balance
* feat: show available qty in item selector
* feat: shortcuts
* fix: onscan.js not found
* fix: onscan.js not found
* fix: cannot return partial items
* fix: neagtive stock indicator
* feat: invoice discount
* fix: change available stock on warehouse change
* chore: cleanup code
* fix: pos profile payment method table
* feat: adding same item with different uom
* fix: loyalty points deleted after consolidation
* fix: enter loyalty amount instead of loyalty points
* chore: return print format
* feat: custom fields in pos view
* chore: pos invoice test
* chore: remove offline pos
* fix: cyclic dependency
* fix: cyclic dependency
* patch: remove pos page and order fixes
* chore: little fixes
* fix: patch perf and plural naming
* chore: tidy up pos invoice validation
* chore: move pos closing to accounts
* fix: move pos doctypes to accounts
* fix: move pos doctypes to accounts
* fix: item description in cart
* fix: item description in cart
* chore: loyalty tests
* minor fixes
* chore: rename point of sale beta to point of sale
* chore: reset past order summary on filter change
* chore: add point of sale to accounting desk
* fix: payment reconciliation table in pos closing
* fix: travis
* Update accounting.json
* fix: test cases
* fix: tests
* patch loyalty point entries
* fix: remove test
* default mode of payment is mandatory for pos transaction
* chore: remove unused checks from pos profile
* fix: loyalty point entry patch
* fix: numpad reset and patches
* fix: minor bugs
* fix: travis
* fix: travis
* fix: travis
* fix: travis
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 18:51:26 +05:30
Shivam Mishra
f59d927f73
feat: update summary items
2020-07-23 17:02:32 +05:30
Shivam Mishra
840550e25f
refactor: change sequence for profit and loss statement
2020-07-23 17:02:32 +05:30
Shivam Mishra
1358efe896
feat: update icons
2020-07-23 17:02:32 +05:30
KanchanChauhan
2826fd3c20
feat: Dunning ( #22559 )
...
* feat: Dunning
* fix: Replaces spaces with tab
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-07-23 15:45:03 +05:30
Deepesh Garg
7ac4ad8410
fix: Error due to comma in Pricing rule name ( #22741 )
...
* fix: Error due to commma in Pricing rule name
* fix: Remove print statement
* fix: Tests
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-23 12:12:55 +05:30
Deepesh Garg
9c49f2d886
feat: Enhancement in subscription ( #22263 )
...
* feat: Add supplier in subscription doctype
* fix: Code cleanup
* fix: Add dynamic link in subscription invoices
* fix: Multiple enhanccement in subscription
* feat: Follow calendar months in subscription
* fix: Test Cases and patch
* fix: Patch
* fix: Update patch and add fixes
* fix: Update permission for subscription settings
* fix: Patch and Test
* fix: Add cost center dimension in Subscripiton
2020-07-23 11:11:23 +05:30
Deepesh Garg
7c50f421e1
fix: Move branch code back to bank account ( #22725 )
...
* fix: Move branch code back to bank account
* fix: Patch
2020-07-22 18:21:04 +05:30
Deepesh Garg
c7eadfceb0
fix: Multi currency payment reconciliation ( #22738 )
...
* fix: Multi currency payment reconciliation
* fix: Hide currency link fields
2020-07-22 17:59:37 +05:30
Rucha Mahabal
1fddc6d126
chore: Exported Accounts Module Dashboard ( #22769 )
...
* chore: Exported Accounts Module Dashboards
* chore: deleted dashboard fixtures for Accounts module
2020-07-22 16:11:06 +05:30
Nabin Hait
493b581862
fix: Ignore cancelled entries in trial balance opening
2020-07-21 12:47:16 +05:30
Deepesh Garg
d81372a39c
Merge pull request #22734 from deepeshgarg007/custom_cash_flow
...
fix: Period list api changes for custom cash flow report
2020-07-18 20:35:28 +05:30
Deepesh Garg
07f8e749be
fix: Period list api changes for custom cash flow report
2020-07-18 19:47:33 +05:30
Rucha Mahabal
6b3110ed13
Merge branch 'develop' into expense-claim-payment-fix
2020-07-16 12:23:26 +05:30
Anurag Mishra
50902cf30c
Fix: Changes Requested
2020-07-16 12:21:46 +05:30
Suraj Shetty
11b0554ae9
Merge branch 'develop' into fix-financial-statement-print-format
2020-07-16 09:45:26 +05:30
Rohit Waghchaure
e0de0ac617
fix: not able to submit sales invoice
2020-07-15 17:13:43 +05:30
Suraj Shetty
34617744e1
fix: Show total row in print format of financial statement
2020-07-15 16:37:21 +05:30
Deepesh Garg
5beac7a0cc
fix: Period list fixes in financial statements ( #22677 )
2020-07-15 12:17:43 +05:30
Anurag Mishra
c1636f8fab
fix: conversion rate as 1 if no conversion rate
2020-07-14 18:58:02 +05:30
rohitwaghchaure
eb2a42d9e1
Merge pull request #22589 from deepeshgarg007/rcm_fix
...
fix: Do not add GST tax amount in grand total for reverse charge invoices
2020-07-14 13:42:48 +05:30
rohitwaghchaure
62fe2cac19
Merge pull request #22051 from deepeshgarg007/project-link-for-all-accounts
...
fix: Project link not set in accounts other than profit and loss accounts
2020-07-13 18:09:41 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts
2020-07-13 11:50:11 +05:30
Deepesh Garg
62d047bf9b
Merge branch 'develop' into payment_reco_cost_center_fix
2020-07-11 21:05:32 +05:30
Deepesh Garg
8cdf33f618
Merge pull request #22635 from deepeshgarg007/item_tax_test
...
fix(travis): Item Tax template test
2020-07-11 21:04:31 +05:30
marination
a6c10b1bc0
fix: Pricing Rule breaks if no item_code
2020-07-10 20:09:58 +05:30
Deepesh Garg
e99091fd4f
Merge pull request #22644 from deepeshgarg007/dcc_query
...
fix: Distributed cost center query
2020-07-10 13:35:34 +05:30
Deepesh Garg
7cb195b304
fix: Distributed cost center query
2020-07-10 13:33:50 +05:30
Afshan
fd28f1071e
style: arrangements of filters for reports ( #22636 )
2020-07-10 11:25:39 +05:30
Deepesh Garg
b74077faf5
fix(travis): Item Tax tempate template test
2020-07-09 19:50:41 +05:30
Michelle Alva
5d514fe4df
fix: grammatical fixes in module onboarding ( #22580 )
...
* fix: grammatical fixes in module onboarding
* fix: more grammatical changes for consistency
* fix: Reorder Stock Onboarding
* fix: update success message
* fix: change order of stock onboarding steps
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-08 14:25:51 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts
2020-07-08 13:11:37 +05:30
rohitwaghchaure
37d828eda6
Merge pull request #22511 from deepeshgarg007/gl_entry_ignore_validation
...
fix: Do not ignore validate methods on GL entry submit
2020-07-08 13:06:47 +05:30
Deepesh Garg
9071a7de82
fix: Add default cost center in payment reconciliation JV
2020-07-08 11:27:25 +05:30
Deepesh Garg
addd1e842b
Merge pull request #22568 from ahmadpak/develop
...
fix: Item Tax Template permissions as per company
2020-07-08 10:08:53 +05:30
Marica
f4d0a3e7b0
Merge branch 'develop' into whitelist-query
2020-07-07 15:42:42 +05:30
rohitwaghchaure
546cfdaac2
Merge pull request #22601 from deepeshgarg007/payment_reco_company
...
fix: Payment reco error in multi-company setup
2020-07-07 15:32:36 +05:30
Deepesh Garg
ca351e3549
fix: Pass company
2020-07-07 14:37:17 +05:30
Deepesh Garg
e2fdff5777
fix: Payment reco error in multicompany setup
2020-07-07 14:14:07 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query
2020-07-07 11:53:19 +05:30
Deepesh Garg
05738bd29a
fix: Remove print statements
2020-07-06 13:40:48 +05:30
rohitwaghchaure
1cc1fd4f86
Merge pull request #22576 from marination/party-details
...
fix: Check for Company before trying to fetch party details
2020-07-06 12:42:16 +05:30
Deepesh Garg
92a03aa5db
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-07-06 12:37:28 +05:30
rohitwaghchaure
e5d9ebe32e
Merge pull request #22577 from deepeshgarg007/coa_fiscal_year_fix
...
fix: Consider company fiscal year for getting balance
2020-07-06 12:34:56 +05:30
Deepesh Garg
be05c4e14a
fix: Codacy and minor fixes
2020-07-05 18:16:16 +05:30
Deepesh Garg
96d40ec9da
fix: Consider company fiscal for getting balalnce
2020-07-03 22:59:00 +05:30
marination
e27b996e38
fix: Check for Company before trying to fetch party details
2020-07-03 22:12:00 +05:30
mohammadahmad1990
015910b4c4
Company Field Added in Item Tax Template
2020-07-03 15:02:32 +05:00
Deepesh Garg
9ed0384bea
fix: Code cleanup
2020-07-03 14:54:41 +05:30
Deepesh Garg
3c004ad798
fix(GST): Do not add tax amount in grand total for reverse charge invoices
2020-07-02 21:18:29 +05:30
Afshan
bfffd9b01b
made "Subscription Section", "Auto Repeat" and Hub Publishing" collapsible by default ( #22521 )
...
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2020-07-02 15:11:45 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist
...
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-07-02 12:35:41 +05:30
Deepesh Garg
8230e41a42
fix: Insert instead of DB insert
2020-06-29 21:20:05 +05:30
Deepesh Garg
d1bf6e0277
fix: Do not ignore validate methods on GLL entry submit
2020-06-29 21:14:03 +05:30
Rohit Waghchaure
04cf2e029f
fix: letter head not found in opening invoice creation tool
2020-06-28 17:08:12 +05:30
rohitwaghchaure
69aa2e400a
Merge pull request #22412 from frappe/mergify/bp/version-13-beta-pre-release/pr-22223
...
feat: Accounting entries for service item in Purchase receipt (bp #22223 )
2020-06-28 11:26:21 +05:30
Deepesh Garg
4c726b25ee
fix: Add view ledger button for cancelled docs ( #22433 )
...
* fix: Add view ledger button for cancelled docs
* fix: Add moddified to date in Stock Ledger
2020-06-25 15:37:04 +05:30
Deepesh Garg
8a55ec1580
fix: Add view ledger button for cancelled docs ( #22432 )
...
* fix: Add view ledger button for cancelled docs
* fix: Add moddified to date in Stock Ledger
2020-06-25 15:34:01 +05:30
Deepesh Garg
be9a8e1a14
Resolve merge conflicts
2020-06-24 18:47:58 +05:30
Deepesh Garg
faa0c5624e
fix: Update journal entry account timestamp
2020-06-24 18:45:16 +05:30
Deepesh Garg
2abd66da9d
fix: Update journal entry account timesstamp
2020-06-24 17:49:50 +05:30
Deepesh Garg
51ce1e1d4e
fix: Test Cases
...
(cherry picked from commit ded3ab1cd7
2020-06-24 05:38:33 +00:00
Deepesh Garg
12f1f8e111
fix: Move check from Stock Settings to Company Master
...
(cherry picked from commit 53d5d16abb
2020-06-24 05:38:33 +00:00
Deepesh Garg
6e2ca779c5
feat: Accounting entries for service item in Purchase receipt
...
(cherry picked from commit c258ac82c5
2020-06-24 05:38:32 +00:00
rohitwaghchaure
d63c59ced4
Merge branch 'develop' into grn_posting
2020-06-24 10:23:23 +05:30
Deepesh Garg
7cc1cf36ca
feat: More controlled deferred revenue booking ( #21671 )
...
* feat: More controller deferred revenue booking
* fix: Query for last gl entry
* fix: Accounting Dimension for Deferred entries
* fix: Deferred revenue booking against paid invoices
* fix: Don not update outstanding on Deferred Entry submission
* fix: Naming fixes
* feat: Deferred revenue/expense booking based on months
* fix: Test case for fix monthly deferred revenue booking
* fix: Typo
* fix: Patch to update settings
* fix: Test case to book deferred expense via journal entry
* fix: Update field for better UX
* fix: Codacy
* fix: Change select field to checkbox
2020-06-23 09:57:56 +05:30
Marica
b073544e06
Merge branch 'develop' into fix-payment-entry-wrong-bank-account-fetch-develop
2020-06-23 02:24:35 +05:30
Rohit Waghchaure
aaed3b988f
added validation and clear fields for Apply Rule On Other
...
(cherry picked from commit ebbbc85fc0f9aa418163f8344d3a234ecbe08488)
2020-06-22 14:52:30 +00:00
Poranut Chollavorn
e3973a4730
fix(pricing_rule): apply_on logic dont get cleanup
...
(cherry picked from commit acf399c4e0c74458c17866be7d72788aeecbe829)
2020-06-22 14:52:29 +00:00
Deepesh Garg
be4fc1a78e
fix(UX): Notify user of expense account change in Purchase Invoice ( #22193 )
2020-06-22 18:03:11 +05:30
Deepesh Garg
edd4aa6faa
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-06-22 09:59:39 +05:30
Deepesh Garg
ded3ab1cd7
fix: Test Cases
2020-06-22 09:40:15 +05:30
Deepesh Garg
95a497cffb
Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_fix
2020-06-20 12:33:41 +05:30
Deepesh Garg
bef80b7981
fix: Test
2020-06-20 12:32:30 +05:30
Deepesh Garg
dee1c92df1
Merge pull request #22351 from kennethsequeira/purchase_inv_due
...
fix: status error in purchase invoice
2020-06-20 11:58:19 +05:30
Deepesh Garg
c70eb30e7e
Merge branch 'develop' of https://github.com/frappe/erpnext into grn_posting
2020-06-20 11:56:25 +05:30
Deepesh Garg
53d5d16abb
fix: Move check from Stock Settings to Company Master
2020-06-20 11:55:56 +05:30
Kenneth Sequeira
b7c8037e9a
fix codacy
2020-06-19 22:33:51 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module ( #21990 )
...
* feat: Moved Document to Payroll Module
* feat: Moved Reports to Payroll Module
* feat: Moved Print fromat With Patch
* feat: Moved Notifiction to Payroll Module and patches
* feat: added dashboard and desk page to Payroll
* feat: Payroll Dashboard
* feat: Module onboarding
* feat: Income tax Deductions Report
* feat: Ecs Checklist Report
* feat: Provident Fund Report
* feat: Professional Fund report and commonified Code
* feat: Total Payments Based On Payment Mode Report
* fix: refactor and added chart Total Payments Based On Payment Mode
* feat: Payroll Settings
* fix: Bank remittance Report
* feat(Payroll based on): Considered unmarked days
* feat: Added Help for condition an formula in Salary structure
* fix: requested changes
* fix: rename report Ecs checklist to salary_payments_via_ecs
* fix: renamed report report/total_payments_based_on_payment_mode
* fix: added role via setup.py for regional report
* feat: added All reports to desk page
* fix: frappe.reload doc in all patches
* fix: codacy
* fix: frappe.reload_doctype for patches
* patch: is_income_tax_component and component_type for salary component
* fix: uncommented code
* test: fixture
* fix: test
* test: test_payment_days_based_on_attendance
2020-06-19 19:17:57 +05:30
Marica
47a4567301
Merge branch 'develop' into purchase_inv_due
2020-06-19 18:44:53 +05:30
Kenneth Sequeira
02f3e045ab
fix: due date filter in purchase invoice
2020-06-19 18:22:04 +05:30
Deepesh Garg
aea450c36a
Revert "fix: update remark on submitting payment entry"
2020-06-19 17:29:49 +05:30
Marica
383807f72e
feat: Selling Desk, Dashboard and Onboarding ( #22055 )
...
* feat: Selling Desk, Dashboard and Onboarding
* chore: Selling Onboarding and fixes in Other onboardings
* chore: Dashboard and Number card Fixtures
* fix: Escape filters and Reposition Accounts Dashboard shortcut.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-19 15:33:21 +05:30
Deepesh Garg
1b30ca6a36
fix: Codacy
2020-06-19 12:12:08 +05:30
Deepesh Garg
3c63f5b76b
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-06-19 11:41:21 +05:30
Afshan
a9cdc7b696
style: moved project from reference section to accounting dimensions section ( #22309 )
2020-06-19 11:11:33 +05:30
Prssanna Desai
82ddef58c0
feat: date filter for fiscal year ( #21880 )
...
* feat: date filter for fiscal year
* fix: rename fieldtypes to valid_for_fieldtypes
* Update utils.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-18 18:18:41 +05:30
P-Froggy
c3b74affe3
fix: Set Value of wrong Bank Account Field in Payment Entry
...
Company bank account was wrongly inserted into the field "Party Bank Account" in payment entry, instead of "Bank Account".
Also changes the label of "Default Bank Account" to "Default Company Bank Account", like suggested in PR #20632
2020-06-18 01:48:37 +02:00
Kaviya Periyasamy
fec894f530
fix: modified time updated with the latest date ( #22286 )
2020-06-17 17:39:12 +05:30
rohitwaghchaure
d8683d381b
Merge pull request #22205 from deepeshgarg007/fiscal_year_travis
...
fix: Travis(develop)
2020-06-15 16:12:10 +05:30
Deepesh Garg
0d880079b1
fix: Validation for group cost center
2020-06-15 12:23:24 +05:30
Deepesh Garg
817cbc4b48
fix: Minor fixes in cost center
2020-06-15 12:07:04 +05:30
rohitwaghchaure
25f49d59c5
Merge pull request #22233 from deepeshgarg007/pi_billing_address
...
fix: Billing address in for Purchase documents
2020-06-14 15:10:43 +05:30
Rohit Waghchaure
d6f9a51cbb
fix: item none not found while making sales invoice using opening invoice creation tool
2020-06-14 14:46:49 +05:30
Deepesh Garg
6760077674
fix: Billing address in for Purchase documents
2020-06-13 22:40:23 +05:30
Deepesh Garg
5f4330621c
Merge pull request #22231 from deepeshgarg007/financila_satement_immutable
...
fix: Handle cancelled entries in financial statements
2020-06-13 21:19:20 +05:30
Deepesh Garg
cc4943d54d
fix: Distributed cost center query updation
2020-06-13 21:13:52 +05:30
Deepesh Garg
d80d442aa1
fix: Do not select cancelled entries in financial statements
2020-06-13 21:12:19 +05:30
Deepesh Garg
f3261794d9
Merge pull request #22230 from deepeshgarg007/financial_statement_to_date_v13
...
fix: Data not appearing properly for some fiscal_year in financial statements
2020-06-13 19:27:38 +05:30
Deepesh Garg
15231aa60d
fix: Data not appearing properly for some fiscal_year in financial statemets
2020-06-13 19:26:39 +05:30
Deepesh Garg
c258ac82c5
feat: Accounting entries for service item in Purchase receipt
2020-06-12 18:33:42 +05:30
Deepesh Garg
7e974c9e2c
fix: Test Cases
2020-06-12 15:29:40 +05:30
Deepesh Garg
ca97e19b7e
Merge pull request #22203 from marination/account-tree
...
fix: Check for Company before rendering tree in Account Tree
2020-06-12 10:02:41 +05:30
Deepesh Garg
9df4532d14
fix: Travis(develop)
2020-06-11 21:33:43 +05:30
marination
c9a6e4f151
fix: Check for Company before rendering tree in Account Tree
2020-06-11 19:54:44 +05:30
Abhishek Balam
44b8cf4fef
enable 'user cannot create' for payment request ( #22044 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-11 19:31:41 +05:30
Deepesh Garg
7d3c3b9a8b
Merge pull request #22188 from deepeshgarg007/payment_terms_outstanding
...
fix: Update payment schedule based on payment terms
2020-06-10 22:17:37 +05:30
Deepesh Garg
a0fd97f2ac
fix: Update payment schedule based on payment terms
2020-06-10 22:15:27 +05:30
Deepesh Garg
f108574772
Merge pull request #22186 from deepeshgarg007/inter_warehouse_party_validation
...
fix: Party validation for inter-warehouse transaction
2020-06-10 20:02:43 +05:30
Deepesh Garg
7963e2b708
fix: Party validation for inter-warehouse transaction
2020-06-10 19:57:49 +05:30
Deepesh Garg
6e0d6bd74c
Merge pull request #22184 from deepeshgarg007/item-wise-report-export
...
fix: Item-wise sales and purchase register export
2020-06-10 18:48:35 +05:30
Deepesh Garg
08fee12266
fix: Item-wise sales and purchase register export
2020-06-10 18:33:24 +05:30
rohitwaghchaure
0233f94570
Merge pull request #22081 from deepeshgarg007/jv_list_view
...
fix: Add total debit in Journal Entry list view
2020-06-10 14:17:13 +05:30
Karthikeyan S
e9ff6d3d52
feat(Cost Center): Distributed Cost Center ( #21531 )
...
* feat: Distributed Cost Center
Squashed commit of the following:
commit 274236eb92dfddfd015583ee1e6b5e1937366d28
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Mon Mar 23 18:32:26 2020 +0530
Fix: Indentation
commit beae0b9849f333dd1d9f29c27192ea7de2e4e809
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Mon Mar 23 18:26:50 2020 +0530
The validations are added to distributed cost center.
commit 3f66943adacb5797338ef3510251bf6633be3dba
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Thu Mar 19 22:17:25 2020 +0530
The distributed cost centers are shown with the percentage allocation in the reports
commit 1ac11df522096fa187d2f5863b4c970e18b37fac
Author: Vignesh <kaviya.3111999@gmail.com>
Date: Thu Mar 19 13:36:04 2020 +0530
The child table distributed cost center are added to cost center doctype and then validate percentage allocation.
* fix(Distributed Cost Center): validation and filters
* fix(Distributed Cost Center): financial statement query
* fix(Distributed Cost Center): add test cases
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
* fix(Distributed Cost Center): budget variance, general ledger, profitability analysis reports.
* Merge branch 'develop' into develop-distributed-cost-center
* fix(Distributed Cost Center): Added DCC reflection in actual amount column of Budget Variance Report.
* Update creation field in general ledger report
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
* creation field updated in gl_entries query
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviya.3111999@gmail.com>
Co-authored-by: Vignesh S <svignesh0308@gmail.com>
Co-authored-by: KaviyaPeriyasamy <kaviyaperiyasamy22@gmail.com>
Co-authored-by: Kaviya Periyasamy <36359901+KaviyaPeriyasamy@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-06-08 12:20:21 +05:30
rohitwaghchaure
b3b5c96749
Merge pull request #22092 from marination/shippinng-address
...
fix: Apply shipping rule without address too
2020-06-08 10:36:19 +05:30
Deepesh Garg
76ddf4f0b5
Merge pull request #22132 from deepeshgarg007/tds_monthly_cancelled_v13
...
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:08:57 +05:30
Deepesh Garg
c01b4aa2e5
Merge pull request #22131 from deepeshgarg007/tds_monthly_cancelled
...
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:08:17 +05:30
Deepesh Garg
cdd92d756d
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:03:28 +05:30
Deepesh Garg
57f9d43c43
fix: Cancelled entries in tds payable monthly report
2020-06-07 00:01:20 +05:30
Deepesh Garg
7135a75e5e
fix: Error when no data is present in AR/AP reeport
2020-06-03 21:51:21 +05:30
marination
0c72249403
fix: Apply shipping rule without address too
2020-06-03 14:32:07 +05:30
Deepesh Garg
60f3a2b8e7
fix: Add total debit in Journal Entry list view
2020-06-02 18:26:43 +05:30
Deepesh Garg
3609ddedbb
fix: Purchase receipt item json
2020-05-30 12:03:37 +05:30
Deepesh Garg
c96bf870e4
fix: Test Cases
2020-05-30 11:46:39 +05:30
Deepesh Garg
8a4dc521cd
Revert 'fix: tests depending on global default company'
2020-05-30 11:40:16 +05:30
Deepesh Garg
36f7710356
Revert "fix: tests depending on global default company"
...
This reverts commit 1f20c99ecf
2020-05-30 11:38:04 +05:30
Deepesh Garg
f8550790fa
This reverts commit aa196c0a66
2020-05-30 11:37:36 +05:30
Deepesh Garg
52baf8f863
fix: Test Cases
2020-05-29 17:20:03 +05:30
Deepesh Garg
c897e800ed
Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts
2020-05-29 11:04:20 +05:30
Saqib
3c460364b5
fix: disposed asset creates inconsistencies in asset depr report ( #22021 )
2020-05-29 10:18:06 +05:30
Deepesh Garg
1f3fe59e36
fix: Default period start date and period end date for financial statements ( #22011 )
2020-05-28 18:36:21 +05:30
mergify[bot]
fd351f8268
fix: set fiscal year for Profit and Loss chart ( #22006 )
...
(cherry picked from commit 4afda76015
2020-05-28 15:18:47 +05:30
Shivam Mishra
4afda76015
fix: set fiscal year for Profit and Loss chart
2020-05-28 15:06:38 +05:30
rohitwaghchaure
af91e13435
Merge pull request #22001 from nextchamp-saqib/price-rule-date-field-fix
...
fix: transaction date not found in sales invoice
2020-05-28 14:38:13 +05:30
Deepesh Garg
cfcdd52bf4
fix: Inter-company Invoice currency for multicurrency transactions ( #21984 )
2020-05-28 13:35:29 +05:30
Saqib Ansari
dd39ba0014
chore: tests
2020-05-28 13:11:04 +05:30
Saqib Ansari
603cc3d05e
fix: transaction date not found in sales invoice
2020-05-28 12:49:33 +05:30
Deepesh Garg
6fe3a24c5d
Merge pull request #21986 from deepeshgarg007/tds_computation_summary
...
fix: TDS computation summary report
2020-05-27 22:49:42 +05:30
Deepesh Garg
33a08f1ea7
fix: TDS computation summary report
2020-05-27 22:44:50 +05:30
Deepesh Garg
c63b689497
fix: Total for ageing column 121-Above ( #21972 )
...
(cherry picked from commit 152377f84d
2020-05-27 15:27:23 +00:00
Marica
8f1aed73fd
fix: Buying Module fixes ( #21966 )
...
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
2020-05-27 20:57:02 +05:30
Marica
c2aabb0fbf
fix: Buying Module fixes ( #21965 )
...
* fix: Buying Module fixes
* fix: Delete Report files as well
* fix: Add Purchase Order Analysis to Stock & Accounting
2020-05-27 20:56:39 +05:30
mergify[bot]
01dda8a000
fix: Filtering issues in opneing invoice creation tool ( #21969 ) ( #21979 )
...
(cherry picked from commit 0030b95595
2020-05-27 20:50:20 +05:30
Deepesh Garg
152377f84d
fix: Total for ageing column 121-Above ( #21972 )
2020-05-27 20:29:10 +05:30
Deepesh Garg
0030b95595
fix: Filtering issues in opneing invoice creation tool ( #21969 )
2020-05-27 20:27:33 +05:30
Deepesh Garg
ed2c1803df
fix: Post Dated unallocated amount not considered in Advance Amount in AR/AP summary ( #21837 )
...
* fix: Post Dated unallocateed amount not considered in Advance Amount in AR/AP summary report
* fix: Add future payment filter in AR/AP summary
* fix: Show unallocated future payments only till current creation date
* fix: Remove extra query
* fix: Remove debug
* fix: Condition
2020-05-27 12:46:12 +05:30
Deepesh Garg
3a723dd815
Merge pull request #21940 from deepeshgarg007/acc_dim_report_filter
...
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:30:43 +05:30
Deepesh Garg
11ea0b1289
fix: Do not add filters in report on accounting dimension creation if it already exists
2020-05-26 19:23:45 +05:30
Afshan
c0b4ec52de
fix: UX date range field separated in from and to date fields. ( #21765 )
...
* fix for issue #21419
* changing group by filter to default Group by Voucher (Consolidated)
* divided date range to seperate from and to date
* divided date range to seperate from and to date for purcase and sales register
2020-05-26 18:20:47 +05:30
Saqib
48e4abf43f
fix: fetch depreciation amount only if depr entry is made ( #21893 )
2020-05-25 19:21:08 +05:30
Chinmay D. Pai
a7f39a9879
fix: set default posting_date value to None
...
using mutable python defaults, and especially function calls, inside
function definitions causes bugs that can be really hard to debug
sometimes. please refrain from using such defaults.
instead, using None is almost always a sane default. the values can
then be manipulated inside the function instead.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
(cherry picked from commit 0d147b011e
2020-05-24 07:24:34 +00:00
Chinmay D. Pai
0d147b011e
fix: set default posting_date value to None
...
using mutable python defaults, and especially function calls, inside
function definitions causes bugs that can be really hard to debug
sometimes. please refrain from using such defaults.
instead, using None is almost always a sane default. the values can
then be manipulated inside the function instead.
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-24 00:54:04 +05:30
Deepesh Garg
18ace30a81
fix: Project filter in Trial Baalance Report
2020-05-22 20:39:14 +05:30
Deepesh Garg
29c748184c
fix: Project filter in Trial Baalance Report
2020-05-20 22:15:12 +05:30
Marica
2b04e8eef0
fix: Validate Payment Gateway only if it exists in Payment Request. ( #21805 )
2020-05-20 16:13:43 +05:30
Rohit Waghchaure
e6147ed9bc
feat: production forecasting using exponential smoothing method
2020-05-20 11:31:06 +05:30
Deepesh Garg
1b1787c61a
fix: Against voucher in General Ledger
2020-05-19 20:51:30 +05:30
Nabin Hait
ddec05ee07
Merge branch 'marination-stock-dashboard' into develop
2020-05-19 19:08:58 +05:30
Nabin Hait
8b686a5721
feat: stock module dashboard and onboarding
2020-05-19 19:08:30 +05:30
rohitwaghchaure
f128b1c0c5
refactor: changed the fieldtype from data to small text ( #21782 )
2020-05-19 19:05:42 +05:30
Shivam Mishra
31f00b6052
refactor: rename dashboards in desk page
2020-05-19 15:56:47 +05:30
rohitwaghchaure
65c90959d1
fix: renamed manufacturing dashboards to manufacturing ( #21776 )
2020-05-19 15:54:24 +05:30
Nabin Hait
9aae6f4793
feat: accounting dashboard + desk
2020-05-18 18:03:11 +05:30
Nabin Hait
31b8be6c41
Merge branch 'accounts_dashboard' of https://github.com/deepeshgarg007/erpnext into deepeshgarg007-accounts_dashboard
2020-05-18 11:31:30 +05:30
Deepesh Garg
ec8c28e487
Revert "fix(accounting): Allow 0 threshold in Tax Withholding Category"
2020-05-18 11:27:38 +05:30
Rucha Mahabal
e83d1d221d
Merge branch 'develop' into multi_company
2020-05-17 20:02:12 +05:30
Deepesh Garg
bf16956d10
Merge pull request #21656 from kevingdc/bugfix/tax-withholding-category-description
...
fix(accounting): Tax Withholding Category Description default
2020-05-16 18:07:45 +05:30
Deepesh Garg
2a0e3e3515
fix: Remove strip
2020-05-16 18:07:03 +05:30
Deepesh Garg
2567815b03
Merge pull request #21655 from kevingdc/bugfix/zero-threshold-in-tax-withholding-category
...
fix(accounting): Allow 0 threshold in Tax Withholding Category
2020-05-16 17:55:51 +05:30
rohitwaghchaure
7435174300
Merge pull request #21747 from rohitwaghchaure/fix-supplier-schema-save-issue
...
fix: promotional scheme not able to save
2020-05-16 11:34:23 +05:30
Rohit Waghchaure
49dbbdc4cb
fix: promotional scheme not able to savce
2020-05-16 04:59:59 +05:30
Deepesh Garg
7be71c88f2
fix: Better validation message for group accounts ( #21725 )
2020-05-15 19:23:41 +05:30
Deepesh Garg
1b821fec4b
Merge pull request #21742 from nextchamp-saqib/payment-remark-fix
...
fix: update remark on submitting payment entry
2020-05-15 17:48:51 +05:30
Saqib Ansari
03d165ff79
fix: update remark on submitting payment entry
2020-05-15 16:39:02 +05:30
Deepesh Garg
a812ad7555
Merge pull request #21699 from nextchamp-saqib/pur-inv-status-fix
...
fix: purchase inv shows overdue for fraction of outstanding
2020-05-15 15:46:23 +05:30
Saqib Ansari
940856cc16
fix: add tests for set_status
2020-05-15 14:30:24 +05:30
Deepesh Garg
7d61c03af4
fix: Add missing dimensions in GL entries ( #21689 )
...
* fix: Add misssing dimensions in GL entries
* fix: Add project filter in trial balance report
* fix: Use current dimensions instead of dimensions from asset
2020-05-15 12:58:48 +05:30
Rohan
200af04657
format: better error messages for invalid coupon codes (develop) ( #21599 )
...
* format: better error messages for invalid coupon codes
* fix: remove unnecessary docstatus check
2020-05-15 12:10:34 +05:30
Deepesh Garg
33f654ebfe
Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard
2020-05-14 22:57:27 +05:30
Deepesh Garg
8bbac6defc
fix: Onboarding and Dashboard for accounts module
2020-05-14 22:57:11 +05:30
Shivam Mishra
0fbc96cc8c
Merge pull request #21731 from prssanna/custom-chart-fix
...
fix: add heatmap_year parameter to get
2020-05-14 18:27:07 +05:30
prssanna
39cb749f95
fix: add heatmap_year parameter to get
2020-05-14 18:25:58 +05:30
Saqib Ansari
13096cdbfe
fix: invalid conditional statement
2020-05-13 22:02:56 +05:30
Saqib
2b8f307ffe
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 21:56:45 +05:30
Afshan
bd7e535885
Fix: Set General Ledger 'Group By' filter as 'Group by Voucher(Consolidated)' when opened from Invoice ( #21673 )
...
* fix for issue #21419
* changing group by filter to default Group by Voucher (Consolidated)
2020-05-13 19:48:42 +05:30
Saqib
7adfc34a26
Merge branch 'develop' into pur-inv-status-fix
2020-05-13 14:02:19 +05:30
Deepesh Garg
cdeb897fff
fix: Account shortcut in desk page
2020-05-12 17:23:15 +05:30
Saqib Ansari
734bfcdfc2
fix: purchase inv shows overdue for fraction of outstanding
2020-05-12 14:11:33 +05:30
Deepesh Garg
c6bd012e72
Merge branch 'develop' of https://github.com/frappe/erpnext into accounts_dashboard
2020-05-12 11:30:07 +05:30
Chinmay Pai
30f26b4457
fix: do not setup charts if not setup_complete or no company found ( #21670 )
...
* fix: do not setup charts if not setup_complete or no company found
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: remove check for setup_complete
moved the check for setup_complete to frappe
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
* chore: return an empty dict from get_data if company not set
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-05-11 19:54:46 +05:30
Deepesh Garg
0defefda92
feat: Standard accounts dashboard
2020-05-11 12:14:46 +05:30
rohitwaghchaure
76dd10f48a
Merge pull request #21652 from rohitwaghchaure/fixed-branch-code-and-swift-number
...
fix: wrong fieldname branch_code in add_fetch
2020-05-11 07:06:42 +05:30
Deepesh Garg
e720882410
Merge pull request #21642 from kevingdc/bugfix/fix-budget-variance-report
...
fix(accounting): fix incorrect output in Budget Variance Report
2020-05-10 17:27:46 +05:30
Deepesh Garg
b81bd5f70c
fix: Formatting fixes
2020-05-10 17:24:11 +05:30
Suraj Shetty
65d3ac814d
fix: Add accidentally removed function
2020-05-09 17:39:59 +05:30
Suraj Shetty
d53822f012
Merge pull request #21618 from scmmishra/sync-dashboards
2020-05-09 14:15:20 +05:30
Kevin Chan
bc05855805
fix: Simplify get_dimension_account_month_map
...
This commit updates get_dimension_account_month_map to no longer show
the actual expense when there is no budget. This also removes the other
functions and queries related to it. Spaces are also converted to tabs.
2020-05-09 16:02:11 +08:00
Deepesh Garg
9b70a0ac18
Merge pull request #21663 from deepeshgarg007/gross_net_profit
...
fix: Gross and net profit report fix
2020-05-08 19:56:58 +05:30
Deepesh Garg
3392e6b80c
fix: User filters instead of hardcoded values
2020-05-08 19:53:09 +05:30
Deepesh Garg
8d9f86f781
fix: Gross and net profit report fix
2020-05-08 19:45:57 +05:30
Kevin Chan
9d81f97fe6
fix: Tax Withholding Category Description default
...
This commit fixes a bug that happens when a Purchase Invoice uses a
Tax Withholding Category without a category_name. The category_name is
used as the tax description which is a required field. The bug was
fixed by using the Tax Withholding Category's name as the description
if the category_name is empty.
2020-05-08 18:01:18 +08:00
Kevin Chan
e29283630b
fix: Zero threshold in Tax Withholding Category
...
This fixes a bug in Tax Withholding Category where if it has a threshold
of 0, it doesn't apply to Purchase Invoices. The bug was fixed by
updating the condition.
2020-05-08 17:45:08 +08:00
Rohit Waghchaure
7d4ccdf240
fix: wrong fieldname branch_code in add_fetch
2020-05-08 13:27:25 +05:30
rohitwaghchaure
b310d6f372
Merge pull request #21649 from anupamvs/payment-order-fix
...
fix: Payment Order not allowing to create Payment Entry
2020-05-08 10:26:42 +05:30
Anupam K
8b52697723
Payment Order not allowing to create Payment Entry
2020-05-08 02:23:28 +05:30
Kevin Chan
b3ee6314f9
fix: Fix Budget Variance Report
...
This commit fixes a bug in Budget Variance Report where it combines the
actual expense amounts across different fiscal years. This was fixed by
updating the function and queries for computing the actual expense
amounts.
2020-05-07 18:39:47 +08:00
Kevin Chan
52189cba86
style: Improve formatting
...
This commit improves indentations and makes sql queries more readable.
2020-05-07 17:49:32 +08:00
Deepesh Garg
9513171d3f
Merge pull request #21624 from deepeshgarg007/reversse_gl_fix
...
fix(minor): Reverse GL fix
2020-05-06 18:19:19 +05:30
Deepesh Garg
b821f22b7c
fix(minor): Reverse GL fix
2020-05-06 18:12:23 +05:30
Shivam Mishra
28436d2bc1
feat: added dashboard fixtures for accounts
2020-05-06 15:19:10 +05:30
Shivam Mishra
b2103f5470
feat: remove old fixtures
2020-05-06 15:18:43 +05:30
rohitwaghchaure
54a6c64b0f
fix: against voucher no not all records showing in case of Group By Voucher (consolidated) ( #21592 )
2020-05-05 16:17:15 +05:30
Saqib
d46696fa03
fix: cannot make payment entry against shareholder ( #21597 )
2020-05-05 16:10:47 +05:30
rohitwaghchaure
5210761e57
fix: heatmap not working for customer and supplier ( #21578 )
...
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-05 12:12:33 +05:30
Andy Zhu
f7a0b8b5b6
fix: fieldname update for 'Credit' and 'Debit' ( #21405 )
...
* fix: fieldname update for 'Credit' and 'Debit'
'credit' updated to 'credit_in_account_currency'
'debit' updated to 'debit_in_account_currency'
* Update journal_entry.py
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-05-04 12:09:28 +05:30
Deepesh Garg
095b5586a2
fix: Accounting Dimensions in Period Closing Voucher ( #21564 )
2020-05-04 11:12:14 +05:30
Suraj Shetty
9a8512d01d
fix: NameError due to invalid variable
2020-05-03 20:17:47 +05:30
Suraj Shetty
9fffe254fc
refactor: Folio no validation
2020-05-03 19:10:02 +05:30
Mangesh-Khairnar
2f7861a9b8
feat: Process deferred accounting entry ( #19658 )
...
* feat: process deferred accounting
* feat: maintain entry for deferred accounting
* feat: add check for automatic deferred accounting entry
* feat: add build conditions for company and account
* fix: create record for automatic processing of deferred accounting
* feat: add custom naming series
* fix: change the deferred revenue creation via hooks
* fix: add client side validations
* test: creation of gl entries on submission of process deferred accounting
* fix: add multiple validations
* patch(accounts-settings): set automatically process deferred accounting entry
* fix: On cancel function for deferred entry
* fix: Send email per process instead of per invoice
* fix: Test cases
* fix: Label
* fix: Process deferred accounting fixes
* fix: Error flag
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: deepeshgarg007 <deepeshgarg6@gmail.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-05-02 20:09:33 +05:30
Deepesh Garg
cea4eeaa53
fix: Reverse GL Entry on cancel fix
2020-05-02 18:05:33 +05:30
Deepesh Garg
f7966f444d
Merge pull request #21404 from abhishekbalam/develop
...
feat(Accounts): Journal Entry Templates v1
2020-05-01 18:42:54 +05:30
Deepesh Garg
978de8779c
fix: Add multi currency check and proper account filters
2020-05-01 18:38:13 +05:30
Saqib
39805918d4
fix: accounts payable shows advance amount of other company ( #21548 )
2020-05-01 18:15:13 +05:30
Deepesh Garg
662838adb3
fix: Party Type filter in payment entry list view ( #21541 )
2020-05-01 15:00:55 +05:30
Deepesh Garg
db83c29079
Merge branch 'develop' into develop
2020-05-01 14:20:53 +05:30
Deepesh Garg
1a1b06cf59
Merge pull request #21539 from deepeshgarg007/trvis_child_table_validation_fix
...
fix: Travis (develop)
2020-05-01 14:17:46 +05:30
Deepesh Garg
032814b86a
fix: Patch test
2020-05-01 13:26:26 +05:30
rohitwaghchaure
52005d1ea3
Merge pull request #21501 from nextchamp-saqib/validate-paid-inv-msg
...
chore: validate and warn payment against paid invoices
2020-05-01 10:37:23 +05:30
Deepesh Garg
2dbd228eab
fix: Check is child table for POS profile user
2020-05-01 09:50:56 +05:30
rohitwaghchaure
260bf54c99
Merge pull request #21171 from nextchamp-saqib/rename-bank-reco
...
chore: rename bank reconciliation to bank clearance
2020-05-01 09:33:52 +05:30
Saqib
dac51ea1cf
Merge branch 'develop' into validate-paid-inv-msg
2020-04-30 20:08:18 +05:30
Saqib Ansari
c604109287
chore: handle credit note validation
2020-04-30 13:23:59 +05:30
Saqib
a8779872ee
feat: force cost center renaming from cost center form ( #21503 )
2020-04-30 11:28:43 +05:30
Saqib
090e6093f2
fix: list index out of range error ( #21467 )
...
* fix: list index out of range error
* fix: condititon
2020-04-30 11:04:44 +05:30
Saqib
078c95c438
fix: print heading field shown in gst section for india region ( #21499 )
2020-04-30 10:57:38 +05:30
Deepesh Garg
2a9c5badc6
feat: Immutable ledger ( #18740 )
...
* fix: Reverse GL entry on cancellation of document
* fix: Removed set posting time field for multiple docs
* fix: Stop future reposting and reverse entry for purchase receipt and delivery note
* fix: Change is_cancelled field from select to check
* Revert "fix: Removed set posting time field for multiple docs"
This reverts commit 81fb808db7da69ab1e58ba226c0cd0b77e5b90c8.
* fix: Multiple fixes in GL Entry
* fix: Remove future reporting from doctypes
* fix: Canceled entry filters in Stock Ledger and General Ledger Report
* fix: Remove print statement
* fix: Validation for back dated entries
* fix: Codacy fixes
* fix: Add ignore links to multiple doctypes
* fix: Codacy Fixes
* fix: Ignore GL Entry and Stock Ledger entry while cancel
* fix: Test case fixes
* fix: Patch
* fix: Codacy
* fix: Budget Test Cases
* fix: Patch
* fix: Patch
* fix: Multiple test cases
* fix: changes in make_reverse_entry function
* fix: Update patch
* fix: Test Cases
* fix: Test Case fixes
* fix: Move patch upward in patches.txt
* fix: Budget Test Cases
* fix: Test Case and codacy
* fix: Patch
* fix: Minor label and UX fixes
* fix: Move freezing date check
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Test Case
* fix: Remove update_gl_entries_after function
* fix: Remove update_gl_entries_after function
* fix: Test Cases
* fix: Fiscal Year wise backdated entry
* fix: Update entries only for current SLE
* fix: Remove is_cancelled
* fix: Test Cases
* fix: Test cases
* fix: Test Cases
* fix: Uncomment account and stock balance sync logic
* fix: Stock balance and Account balance out of sync fixes
* fix: Test Cases
* fix: Test cases for POS, Stock Reco and Purchase Receipt
* fix: Stock Reco tests
* fix: Test stock reco precision
* fix: Test stock reco for fifo precision
* fix: Test stock reco for fifo precision
* fix: Stock Entry test case
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-30 10:38:58 +05:30
Saqib Ansari
769c0ce72b
chore: validate and warn payment against paid invoices
2020-04-29 15:19:08 +05:30
Abhishek Balam
b59e46d773
fix semicolons as per codacy review
2020-04-29 15:01:56 +05:30
Deepesh Garg
0d8f66dafa
Merge pull request #21493 from deepeshgarg007/item_wise_sale_purchase
...
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:36:08 +05:30
Abhishek Balam
e35bb16436
added journal entry template to accounting desk page
2020-04-29 12:18:33 +05:30
Deepesh Garg
3d8dadaab6
fix: Group by filter fix in item wise sales and purchase register
2020-04-29 12:05:56 +05:30
Abhishek Balam
0c4ce4dbba
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-29 12:02:13 +05:30
Abhishek Balam
3b26b24af6
fix semicolons as per codacy review
2020-04-29 11:28:40 +05:30
Abhishek Balam
8dbc4e648b
rearranged fields in journal entry and journal entry type
2020-04-29 11:13:55 +05:30
Deepesh Garg
e006a76f8d
Merge pull request #21486 from rohitwaghchaure/not-able-to-make-payment-request-against-fees
...
fix: payment request not able to make against fees
2020-04-29 09:36:37 +05:30
Rohit Waghchaure
50b4106d1d
fix: payment request not able to make against fees
2020-04-29 02:27:47 +05:30
Deepesh Garg
428978762b
Merge pull request #21461 from deepeshgarg007/consolidate_statement_fix
...
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:30:12 +05:30
Deepesh Garg
fa2eecc5fc
fix: Report summary fix in consolidated financial statement for report type Profit and Loss
2020-04-28 13:12:22 +05:30
Deepesh Garg
558f6aa4cb
Merge pull request #21456 from deepeshgarg007/gross_profit_width
...
fix: Default column width in Gross profit report
2020-04-28 12:35:50 +05:30
Anoop
b5e7ea7ab8
Merge branch 'develop' into multi_company
2020-04-28 11:38:07 +05:30
Deepesh Garg
142af4b58a
fix: Default column width in Gross profit report
2020-04-28 11:17:45 +05:30
Deepesh Garg
57bfd38944
Merge pull request #21436 from deepeshgarg007/ewb_bill_error_message
...
fix: E-Way bill error message
2020-04-27 15:04:32 +05:30
Deepesh Garg
fe7e6f5f53
fix: Test
2020-04-27 14:05:45 +05:30
Deepesh Garg
10aff8e118
fix: E-way bill fix in List view
2020-04-27 10:50:17 +05:30
Deepesh Garg
9979ceb96b
fix: E-way bill fix in sales invoice
2020-04-27 10:50:03 +05:30
Deepesh Garg
d78cf97250
feat: Allow tax withholding category selection at invoice level ( #20870 )
...
* feat: Allow tax withholding category selection at invoice level
* fix: Linitng fixes
* feat: TDS calculation using common PAN
* fix: Add provision to deduct Lower TDS in purchase invoice
* fix: Consider only ref docs company while computing TDS
* fix: Default permission fixes
* fix: Add validation for dates in fiscal year
* fix: Undefined variable
2020-04-26 20:08:52 +05:30
Marica
5d5454ef1f
fix [ux]: Purchase Order Form Cleanup ( #20932 )
...
* chore: Purchase Order Form Cleanup
* fix: Get Items from popups cleanup
* fix: Shift Set Target Warehouse next to Supply Raw Materials.
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-26 20:07:22 +05:30
Nabin Hait
58ee6c1e08
feat: Income tax slab ( #21399 )
...
* Feat: Multiple tax as per new taxation rule
* patch:for multiple tax slab, fix: payroll and exemption validation
* Test: Fixture
* feat: income tax slab with other charges and tax exempted deduction components
* fix: added missing init file
* fix: Patch fixed
* fix: Patch fixed
* fix: test fixes
* fix: validate duplicate exemption declaration
* fix: payment entry test case
Co-authored-by: Anurag Mishra <mishranaman123@gmail.com>
2020-04-26 17:45:57 +05:30
Abhishek Balam
e4e23836e7
mandatory depends on for cheque no and date, fix typo
2020-04-26 13:06:55 +05:30
Abhishek Balam
84187fb8e9
Code cleanup and improvements requested in PR:21404
2020-04-26 05:00:36 +05:30
Abhishek Balam
539c67966f
rename je template account dt
2020-04-25 18:13:01 +05:30
Abhishek Balam
fb5fbd7e0c
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-25 17:59:00 +05:30
Nabin Hait
ad16e61bc2
fix: Valid warehouse in woocommerce syncing and other small fixes ( #21407 )
...
* fix: Valid warehouse in woocommerce syncing
* fix: dmall fixes in gross & net profit report
* fix: company is required for getting party details
* fix: None issue while getting raw material rate based on last purchase rate
2020-04-25 14:52:05 +05:30
Abhishek Balam
d64438ff47
feat: Journal Entry Template
2020-04-25 03:13:50 +05:30
Abhishek Balam
291837e63d
Merge branch 'develop' of https://github.com/frappe/erpnext into develop
2020-04-25 02:46:00 +05:30
Abhishek Balam
7bbb77e66f
feat: Journal Entry Template
2020-04-25 02:45:45 +05:30
Diksha Jadhav
7b91617303
feat(accounting): show actual qty for warehouse in sales invoice
2020-04-25 00:02:32 +05:30
Saqib Ansari
40140c63dc
fix: rate gets overwritten when pricing rule is set
2020-04-24 14:51:56 +05:30
anoop
c02eceb989
style: intendation
2020-04-23 21:15:06 +05:30
Deepesh Garg
525204bc50
feat: Payment allocation based on payment terms ( #20945 )
...
* feat: Payment allocation based on payment terms
* fix: Add desccription for checkbox
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 16:07:36 +05:30
Deepesh Garg
b1e68bd022
fix: Rename bank account type doctypes ( #21179 )
...
* fix: Rename bank account type doctypes
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-23 12:19:30 +05:30
Deepesh Garg
fa8396feb5
fix: Budget against accounting dimensions ( #21268 )
...
* fix: Budget warning against custom accounting dimension
* fix: Codacy
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-23 10:34:57 +05:30
Rucha Mahabal
d7304519e2
fix: conflicts
2020-04-23 00:52:47 +05:30
Nabin Hait
471cf95300
Update purchase_invoice_item.json
2020-04-22 11:46:31 +05:30
Chinmay Pai
8fb863da07
chore: remove oldfieldtype from purchase invoice item ( #21365 )
...
fixes issue where framework expects data field type to be validated with
options either set to "Email" or "Phone".
removing oldfieldtype works for now, should be fixed inside framework
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-22 11:23:14 +05:30
Rohit Waghchaure
690855d3a1
fix: unsupported operand type issue in pricing rule
2020-04-22 02:49:48 +05:30
Marica
34bbd5b612
fix: Purchase Invoice Form Cleanup ( #21230 )
...
* fix: Purchase Invoice Form Cleanup
* fix: Made Supplier field mandatory
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-21 13:00:14 +05:30
Saqib
b61d2411b1
Merge branch 'develop' into rename-bank-reco
2020-04-20 12:21:22 +05:30
Saqib Ansari
9de76de621
fix: patch
2020-04-20 12:19:27 +05:30
Deepesh Garg
3cec5cbb0f
fix: Total amount field ordering in transactions ( #21313 )
2020-04-18 22:13:48 +05:30
Deepesh Garg
6298bbb1eb
Merge pull request #21328 from rohitwaghchaure/fixed-account-name-in-gl_print
...
fix: account name not showing in the gl print
2020-04-18 20:40:50 +05:30
Rohit Waghchaure
9793500154
fix: account name not showing in the gl print
2020-04-18 19:02:07 +05:30
rohitwaghchaure
866867661e
Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop
...
fix: minor issues
2020-04-18 02:08:26 +05:30
Mangesh-Khairnar
bd14a64bfb
fix: add label to gl entry
2020-04-17 19:52:47 +05:30
Nabin Hait
7eaa7f2e41
fix: requested qty for customer provided item and rate for sales ( #21299 )
...
* fix: requested qty for customer provided item and rate for sales
* fix: requested qty for material transfer
* fix: customer provided item can be sales item
* fix: requested qty test cases
2020-04-17 10:52:28 +05:30
Nabin Hait
03af0299a6
fix: requested qty calculation and some other small fixes ( #21296 )
...
* fix: Made received qty readonly and no-copy
* fix: Made release date mandatory
* fix: requested qty calculation fix for UOM
2020-04-16 20:11:32 +05:30
anoop
93d0c78ca5
feat: multi-company billing
...
sales onvoice - filter get items based on company
utils - company filters in all get item helper methods
utils - refactor appointemnt items
2020-04-16 13:01:43 +05:30
Deepesh Garg
44c0c6c159
Merge branch 'develop' into asset-cat-validation
2020-04-16 11:23:52 +05:30
Deepesh Garg
17ab1592c7
Merge pull request #21265 from vishdha/chart_account_v13
...
fix: Chart of account importer UX improved
2020-04-16 11:21:05 +05:30
vishdha
5b36d15927
fix: fix Transalation
2020-04-16 11:13:43 +05:30
Marica
20ce433652
Merge branch 'develop' into warehouse-fix-dev
2020-04-15 23:48:27 +05:30
Saqib Ansari
34640777cd
fix: pos not accessible without default customer
2020-04-15 22:10:43 +05:30
rohitwaghchaure
c3f994b15e
Merge pull request #21197 from marination/default-item-manufacturer
...
feat: Provision to set Default Item Manufacturer
2020-04-15 16:35:08 +05:30
Saqib Ansari
55410e03e4
fix: tests depending on global default company
2020-04-15 12:57:55 +05:30
Saqib Ansari
1f20c99ecf
fix: tests depending on global default company
2020-04-14 19:40:25 +05:30
Rohit Waghchaure
d0f6f1808b
fix: minor issues
2020-04-14 17:26:58 +05:30
vishdha
5008be1db5
fix: message bold
2020-04-14 17:17:26 +05:30
vishdha
10a6f4bd05
fix: Chart of account importer UX improved
2020-04-14 17:17:26 +05:30
Saqib
b52cd59dc3
Merge branch 'develop' into project-link-for-all-accounts
2020-04-14 14:05:32 +05:30
Saqib Ansari
aa196c0a66
fix: travis
2020-04-14 14:03:02 +05:30
rohitwaghchaure
fc31dbef12
fix: on changing qty free item not removed ( #21251 )
2020-04-14 12:53:54 +05:30
Faris Ansari
64f01bddc8
fix: Set Price List in case of User Permissions ( #21237 )
...
Frontport of #18968
2020-04-14 11:51:48 +05:30
Vishal Dhayagude
b1c2f4ef22
fix: str object not callable ( #21227 )
2020-04-14 11:42:52 +05:30
Rushabh Mehta
4c0484b60e
Merge pull request #20811 from ruchamahabal/healthcare_refactor
...
refactor: Healthcare Module
2020-04-13 17:16:02 +05:30
Saqib
2e45076dcf
Merge branch 'develop' into asset-cat-validation
2020-04-12 13:39:43 +05:30
Rucha Mahabal
59e6c7730b
Merge branch 'develop' into healthcare_refactor
2020-04-10 20:32:37 +05:30
Deepesh Garg
470679f227
fix: SQL ssyntax error
2020-04-10 20:22:42 +05:30
Deepesh Garg
9b312bfbd0
Merge branch 'develop' of https://github.com/frappe/erpnext into purchase-register-filters
2020-04-10 20:19:30 +05:30
Deepesh Garg
e2a5828f5e
Merge pull request #21193 from nextchamp-saqib/pay-entry-ux-fix
...
chore: hide redundant base received amount
2020-04-10 20:17:56 +05:30
Deepesh Garg
669c5c6370
fix: Syntax Error
2020-04-10 20:15:53 +05:30
Deepesh Garg
550771058a
fix: Code styling
2020-04-10 20:14:29 +05:30
Rucha Mahabal
1ff0cfd4f9
fix: merge conflicts
2020-04-10 18:58:25 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages ( #21138 )
2020-04-10 18:52:05 +05:30
Saqib Ansari
c9d6630f17
fix: formatting
2020-04-10 12:43:54 +05:30
Saqib Ansari
debee1c977
fix: travis
2020-04-10 12:38:44 +05:30
Rucha Mahabal
41520f9fca
Merge branch 'develop' into healthcare_refactor
2020-04-09 19:16:31 +05:30
rohitwaghchaure
cf17809c3f
Merge pull request #21156 from marination/mr-customer-provided-to-stock-entry
...
fix: Mapping Customer Provided Material Request to Stock Entry
2020-04-09 13:18:25 +05:30
Deepesh Garg
ef220c1989
Merge branch 'develop' into pay-entry-ux-fix
2020-04-09 12:54:33 +05:30
Marica
3e84ab1349
fix: Error on any new doc from Shipping Rule. ( #21206 )
2020-04-09 12:01:10 +05:30
Saqib
683581edef
fix: cannot find accounting module while rendering breadcrumb ( #21190 )
2020-04-08 11:49:06 +05:30
Saqib
f93dc8dd88
fix: [ux] enforce 'get references from' in payment order ( #21175 )
2020-04-08 09:20:17 +05:30
marination
3e7a8abf29
feat: Provision to set Default Item Manufacturer
...
- Is Default checkbox added in Item Manufacturer
- Default Item Manufacturer and Part No fields added to Item Master
- Manufacturer Part No field editable in all child tables with validation
- Manufacturer and Part No auto fetched via get_item_details in child table
2020-04-07 21:00:57 +05:30
Saqib Ansari
e9b63e45b9
chore: hide redundant base received amount
2020-04-07 17:22:11 +05:30
Rucha Mahabal
21f5680914
fix: merge conflicts
2020-04-07 16:42:50 +05:30
Deepesh Garg
6c36cddbd3
Merge pull request #21188 from deepeshgarg007/dimension_filter_fix
...
fix: Use separate condition for tree and normal doctype
2020-04-07 15:23:36 +05:30
Deepesh Garg
62e9f83aab
fix: Use separate condition for tree and normal doctype
2020-04-07 15:17:06 +05:30
Deepesh Garg
24a2c9b978
feat: Date range in financial statements ( #21020 )
...
* feat: Date range in financial statements
* feat: Add date range filter in consolidated financial statement
* fix: Handle API changes in query_report
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:16:25 +05:30
Vishal Dhayagude
8ef0609fc7
fix: Make Sales Invoice paid when it create from shopping cart ( #20879 )
...
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
2020-04-07 12:07:01 +05:30
Deepesh Garg
f3c44a97f0
Merge pull request #21100 from nextchamp-saqib/payment-req-status-fix
...
fix: payment request status fixes
2020-04-07 10:13:08 +05:30
Saqib Ansari
ca3967d52f
feat: (minor) purchase register filters
2020-04-06 18:25:23 +05:30
Saqib Ansari
b2a84fe478
chore: rename bank reconciliation to bank clearance
2020-04-06 16:32:33 +05:30
Deepesh Garg
433e58d131
feat: Add report summary in financial statements ( #20876 )
...
* feat: Add report summary API for Balance Sheet and PL report
* fix: Add summary cards in Cash flow report
* feat: Add report summary in consolidated financial statements
* fix: Remove accumulated values filter from P&L and cashflow report
* fix: set company default currency in profit and loss statement if no data
Co-authored-by: Prssanna Desai <prssud@gmail.com>
2020-04-06 14:07:20 +05:30
Saqib Ansari
474222074b
fix: tests
2020-04-06 12:40:41 +05:30
Saqib Ansari
4de2416806
fix: change request status on payment entry cancel
2020-04-06 12:34:38 +05:30
Marica
b37f0bb052
Merge pull request #20864 from deepeshgarg007/po_supplier_skip
...
feat: Allow PI creation without PO
2020-04-06 12:15:42 +05:30
Deepesh Garg
1958749382
fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype ( #21147 )
...
* fix(minor): Minor anti pattern fixes in Exchange rate revaluation doctype
* fix: Codacy
2020-04-06 10:21:50 +05:30
Saqib
63bdf5dc74
fix: [ux] credit to & debit to error message ( #21132 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-04-03 19:35:55 +05:30
marination
2a9a5352bb
fix: Test Cases and block expense on outward entry
...
- Throw error if rate present against Customer Provided Item in DN and SI
- Added test cases for Sales Invoice and Delivery Note
- Allow SI and DN with 0 rate in Test
2020-04-03 18:25:21 +05:30
Saqib
e2c355f670
Merge branch 'develop' into payment-req-status-fix
2020-04-03 11:29:15 +05:30
Marica
5d14af52a5
Merge branch 'develop' into po_supplier_skip
2020-04-02 21:17:52 +05:30
Deepesh Garg
872fcb6cae
fix: Travis
2020-04-02 18:11:46 +05:30
Deepesh Garg
5dcd2c118e
Merge pull request #21096 from nextchamp-saqib/customer-group-price-list-in-pos
...
fix: customer group price list not fetched in pos
2020-04-01 09:42:13 +05:30
Saqib Ansari
9a7851096c
fix: check if selling price exists then set it
2020-03-31 18:48:35 +05:30
Saqib Ansari
8ed7535e8a
fix: travis
2020-03-31 18:44:02 +05:30
Deepesh Garg
cf9347d2f5
fix: Undo unneccessary changes
2020-03-31 17:28:43 +05:30
Deepesh Garg
5fd456baa4
Merge branch 'develop' into customer-group-price-list-in-pos
2020-03-31 16:33:41 +05:30
Deepesh Garg
eeb9ba81d7
Merge branch 'develop' into project-link-for-all-accounts
2020-03-31 16:07:23 +05:30
Deepesh Garg
d45e0e0b5b
Merge branch 'develop' into billing-contact
2020-03-31 16:06:11 +05:30
Nabin Hait
95330c850c
Merge branch 'develop' into healthcare_refactor
2020-03-31 15:59:22 +05:30
Deepesh Garg
bdcc4b47d6
Merge pull request #21061 from anupamvs/customer-doctype-issue
...
fix: Adding proper error message
2020-03-31 15:30:46 +05:30
Raffael Meyer
c19330df63
fix: account groups ( #21070 )
2020-03-31 15:28:45 +05:30
Deepesh Garg
31ea093283
Merge branch 'develop' into customer-doctype-issue
2020-03-31 13:50:40 +05:30
Anupam Kumar
ee0dec8776
fix: email_to, party_type and party are not set in payment request when order made from portal ( #21084 )
...
Co-authored-by: Anupam K <anupam@Anupams-MacBook-Air.local>
2020-03-31 10:51:09 +05:30
Deepesh Garg
f0760dee80
Merge branch 'develop' of https://github.com/frappe/erpnext into customer-doctype-issue
2020-03-30 15:05:34 +05:30
Deepesh Garg
56bc36f9e2
fix: Test cases
2020-03-30 15:05:20 +05:30
Deepesh Garg
f144b8b205
Merge branch 'develop' into po_supplier_skip
2020-03-30 13:07:03 +05:30
Deepesh Garg
025762f395
Merge pull request #21119 from rohitwaghchaure/fixed_parent_account_error_while_adding_equity_account_develop
...
fix: not able to add equity account in the chart of accounts
2020-03-30 12:15:01 +05:30
Rohit Waghchaure
cdf80eb4ad
fix: not able to add equity account in the chart of accounts
2020-03-29 16:35:10 +05:30
Deepesh Garg
f528aef49c
Merge pull request #21089 from scmmishra/print-format-fix
...
fix: total currency formatting in Acc Receivable and Payable
2020-03-28 21:27:56 +05:30
Deepesh Garg
1a2cf5cabe
fix: get_party_gle_currency failing if customer_name or supplier_name is passed
2020-03-28 21:26:16 +05:30
Deepesh Garg
c6b850eacb
fix: Improve message
2020-03-28 21:17:58 +05:30
Deepesh Garg
b5c6412ed4
Merge pull request #21101 from nextchamp-saqib/gl-entry-currency-fix
...
fix: currency formatting in gl entry dr cr field
2020-03-28 18:56:49 +05:30
Saqib Ansari
c1678203f1
fix: currency formatting in gl entry dr cr field
2020-03-28 16:39:22 +05:30
Saqib Ansari
0ec01d98d6
fix: payment request status fixes
2020-03-28 16:11:23 +05:30
Saqib Ansari
8488ef8eb1
fix: customer group price list not fetched in pos
2020-03-28 14:07:09 +05:30
Deepesh Garg
e86f6d0738
Merge branch 'develop' into print-format-fix
2020-03-27 21:39:16 +05:30
Shivam Mishra
cf6a814328
fix: total currency formatting
2020-03-27 19:15:59 +05:30
Anupam K
7ca28fdab5
fix: Adding proper error message
2020-03-26 15:54:15 +05:30
Deepesh Garg
d74bcad7af
fix: Added hidden GL column in general ledger ( #21021 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-26 13:37:40 +05:30
Anupam K
9725e43eed
fix: Adding proper error message
2020-03-26 00:17:09 +05:30
Deepesh Garg
bdcfab3a0f
fix: Update patch and bank form cleanup
2020-03-25 21:32:10 +05:30
Deepesh Garg
3cf70a6e79
Merge branch 'develop' of https://github.com/frappe/erpnext into P-Froggy-develop
2020-03-25 21:00:25 +05:30
Rucha Mahabal
1900a62c54
fix: Merge branch 'develop' into healthcare_refactor
2020-03-25 02:08:42 +05:30
Deepesh Garg
75225316f0
fix: Remove quick entry from accouting dimensions
2020-03-22 21:50:22 +05:30
Deepesh Garg
fa6454b9c5
fix: Update is_tree field in Tree doctypes ( #20981 )
2020-03-19 11:01:23 +05:30
Nabin Hait
2e67c33657
Release testing fixes develop ( #20987 )
...
* fix: Multiple fixes during pre-release testing
* fix: Merge conflict
2020-03-19 10:59:32 +05:30
Prssanna Desai
b4909b8fd2
fix: set filters as argument filters if passed ( #20975 )
2020-03-18 18:23:38 +05:30
Priyanka Gangar
2602c7ea38
Label changes in account settings develop ( #20965 )
...
* fix: Account setting words switches to US Terminology
* created united_states.js
* Remove Unwanted Spaces
* Remove all changes
* Add spaces between arguments
Co-authored-by: PriyankaGangar <pinka0925@gmail.com>
2020-03-17 19:39:30 +05:30
Deepesh Garg
745897c354
Merge pull request #20862 from alyf-de/skr04_groups
...
fix(accounts): adjust account groups in SKR04
2020-03-17 17:27:16 +05:30
Nabin Hait
ddc3bb2251
fix: Multiple fixes for travis ( #20924 )
...
* fix: Multiple fixes for travis
* fix: Multiple fixes for travis
* fix: Run dashboard patch if table already exists
* fix: Multiple fixes for travis
* fix: deletion of auto-created batch
2020-03-17 17:04:18 +05:30
Deepesh Garg
ff7bbd2d38
fix: Party Name not visible in statement of accounts ( #20913 )
...
* fix: Party name in Statement Of Accounts
* Update general_ledger.html
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-17 17:00:06 +05:30
Deepesh Garg
e7aefc1163
fix: Add check to skip PR in supplier master
2020-03-17 11:44:02 +05:30
Deepesh Garg
eeb1922e37
fix: Add check to skip SO and DN in customer master
2020-03-17 11:43:34 +05:30
Deepesh Garg
ed0965a572
feat: Nested set filtering for accounting dimension ( #20860 )
...
* feat: Nested set filtering for accounting dimension
* fix: Remove print statement
2020-03-17 10:53:24 +05:30
Deepesh Garg
d1bc74d650
Merge pull request #20958 from deepeshgarg007/mode_of_payment_fix
...
fix: Mode of payment not fetcched in Item wise purchase register
2020-03-16 22:43:09 +05:30
Don-Leopardo
2b6a20aab5
fix: sql injection ( #20818 )
2020-03-16 22:36:44 +05:30
Deepesh Garg
07116c7922
fix: Mode of payment not fetcched in Item wise purchase register
2020-03-16 22:36:32 +05:30
Deepesh Garg
0a74261a94
Merge pull request #20920 from deepeshgarg007/c_form_fix
...
fix: Get invoice details only if invoice is selected
2020-03-16 15:56:32 +05:30
Raffael Meyer
1433436670
fix(accounts): add account_type and tax_rate to some VAT accounts ( #20940 )
...
* Add account_type and tax rate to some VAT accounts
* fix indentation
2020-03-16 15:45:05 +05:30
Rucha Mahabal
200cb34ecf
Merge branch 'develop' into healthcare_refactor
2020-03-12 19:44:27 +05:30
Shivam Mishra
aecf9d6168
Merge branch 'develop' into desk-settings-card
2020-03-12 17:13:03 +05:30
Saqib Ansari
af1221bcbd
chore: add tests and remove test based on allow_cost_center_for_bs_accounts
2020-03-12 17:04:17 +05:30
Shivam Mishra
451382e08e
feat: update desk pages
2020-03-12 16:34:34 +05:30
Ronel Cabrera
fcb54762a1
feat(Contacts): select billing contact for sales invoice
2020-03-12 16:58:59 +08:00
Rucha Mahabal
72993d6828
Merge branch 'develop' into healthcare_refactor
2020-03-12 12:52:38 +05:30
Saqib
6ec4618914
fix: travis ( #20903 )
2020-03-11 16:04:00 +05:30
Saqib Ansari
706c239cf6
fix: remove enable_allow_cost_center_in_entry_of_bs_account
2020-03-11 15:17:10 +05:30
Saqib Ansari
0a42d81993
fix: cannot find get_allow_cost_center_in_entry_of_bs_account
2020-03-11 14:27:40 +05:30
Saqib Ansari
91b307e7f8
fix: project link not set in accounts other than profilt and loss accounts
2020-03-11 13:59:15 +05:30
Prssanna Desai
4fd61c3f83
fix: parameters un get function for accounts dashboard ( #20847 )
2020-03-11 12:37:56 +05:30
Shivam Mishra
1fd1852c6a
Merge branch 'develop' into yet-another-desk
2020-03-10 18:20:27 +05:30
Deepesh Garg
4b20e852ea
fix: Get invoice details only if invoice is selected
2020-03-10 10:36:05 +05:30
Deepesh Garg
9f28a3124c
Merge pull request #20890 from deepeshgarg007/itemised_purchase_register
...
fix: HSN code not visible in GST Itemised Purchase register
2020-03-10 10:05:31 +05:30
Deepesh Garg
5e58666091
fix: HSN code not visible in GST Itemised Purchase register
2020-03-09 22:38:41 +05:30
Saqib
f866ed9679
fix: [pos] customer group filter resets on syncing offline invoices ( #20873 )
2020-03-09 18:30:47 +05:30
Rucha Mahabal
27512c86ae
refactor: Healthcare utils
2020-03-09 17:29:23 +05:30
Raffael Meyer
f669f30c08
add missing equity accounts
2020-03-06 16:17:06 +01:00
Deepesh Garg
1943fb0de4
feat: Allow PI creation without PO
2020-03-06 18:50:11 +05:30
Raffael Meyer
7b7513ab2b
adjust groups
2020-03-06 12:32:49 +01:00
Saqib
b978d79573
fix: show uom in print formats instead of stock uom ( #20843 )
...
Co-authored-by: Saqib Ansari <saqibansari@Saqibs-MacBook-Pro.local>
2020-03-06 11:03:46 +05:30
Shivam Mishra
0310366d5a
fix (cleanup): remove incomplete dependencies data
2020-03-05 11:28:40 +05:30
Deepesh Garg
6dc335d898
Merge pull request #20824 from scmmishra/report-options
...
feat: update profit and loss for new report summary API
2020-03-04 16:07:31 +05:30
Deepesh Garg
12aa35aa43
fix: Label and UX fixes in AP/AP reports ( #20803 )
2020-03-02 19:10:29 +05:30
Deepesh Garg
cd96be9993
fix: Excel support and UX fixes for chart of accounts importer ( #20703 )
...
* fix: Excel support and UX fixes for chart of accounts importer
* fix: Linting Errors
* fix: Blank chart preview
* fix: Added template types for download
* fix: Description on template selection
* fix: Linting fixes
* fix: Move logic for download template to dialog
2020-03-02 18:57:21 +05:30
Deepesh Garg
cc2771baa7
fix: Total amount not displayed in Journal Entry ( #20794 )
...
* fix: Total amount not displayed in Journal Entry
* fix: Update paid_to_received field
* fix: set total amount
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-03-02 18:09:19 +05:30
Saurabh
19df2ffbd8
[bug][fix]: set status to object instead of variable ( #20790 )
2020-03-02 17:50:05 +05:30
Shivam Mishra
8a8e8d6c5c
feat: added base pages for desk
2020-03-02 16:56:31 +05:30
Marica
ed25ec7ee5
chore: Item Price and Product Bundle Form cleanup ( #20772 )
...
* chore: Item Price and Product Bundle Form cleanup
* fix: Trailing comma
2020-03-02 15:51:14 +05:30
Saqib
ff52d16fb3
chore: control reposting of future gl entries with flags ( #20774 )
2020-03-02 15:19:18 +05:30
Saqib
7b8c3dee3d
fix: reconciled entries showing in bank reco ( #20787 )
2020-03-02 15:01:06 +05:30
P-Froggy
f1014bb978
Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop
2020-03-02 00:21:12 +01:00
P-Froggy
313efe9b32
fix: add missing semicolon
2020-03-02 00:21:08 +01:00
P-Froggy
3bf04154b1
Merge branch 'develop' into develop
2020-03-02 00:18:23 +01:00
P-Froggy
f9b3e4be78
Merge branch 'develop' of https://github.com/P-Froggy/erpnext into develop
2020-02-28 20:46:41 +01:00
P-Froggy
266e689c4f
fix: Show swift number and branch code in quick entry of bank doctype
2020-02-28 20:46:36 +01:00
P-Froggy
393a626834
fix: Allow only bank accounts of the respective party in payment entry
2020-02-28 20:45:48 +01:00
Deepesh Garg
5707c9a731
fix: Item Wise report query fix ( #20760 )
2020-02-28 12:28:54 +05:30
Saqib
8cf841ce60
fix: wrong calculation of depreciation eliminated for a period ( #20502 )
2020-02-27 19:09:34 +05:30
Saqib
fb35a54bee
perf: improve gl entry submission ( #20676 )
...
* perf: improve gl entry submission
* perf: add indexes
* fix: replace **kwargs with *args
* fix: syntax error
* fix: remove cypress
* fix: travis
* chore: remove purchase invoice from status updater
* fix: set_staus args
Co-Authored-By: Nabin Hait <nabinhait@gmail.com>
* fix: only update status for invoices & fees
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-27 18:32:19 +05:30
Deepesh Garg
f444f451ac
fix: Remove debug statement
2020-02-27 16:04:01 +05:30
Deepesh Garg
50b3472eba
fix: Journal Entry not being fetched in Bank Reconciliation
2020-02-27 16:01:47 +05:30
Deepesh Garg
fe18b92b61
fix: Mandatory bank account error fix ( #20733 )
...
* fix: Mandatory bank account error fix
* fix: SQL condition
2020-02-26 17:17:02 +05:30
Nabin Hait
2bd6ac56c6
Merge branch 'develop' into develop
2020-02-26 13:21:38 +05:30
rohitwaghchaure
aa3ba41e83
fix: same free item not working for pricing rule ( #20712 )
2020-02-26 12:51:46 +05:30
Deepesh Garg
5a2f22258a
Merge pull request #20592 from byugandhara/develop
...
fix: Changes done to get valid customer and employee list on payment entry form(#20498 )
2020-02-26 12:17:47 +05:30
Saqib
3957ac1408
perf: search for customer's return invoices then filter out gl_entries ( #20709 )
...
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-26 11:36:55 +05:30
Deepesh Garg
d1d0a50a70
feat: Loan management and accounting ( #19035 )
...
* fix: Create Loan Management module
* fix: Move loan doctype for hr module to loan management
* fix: Add loan dashboard
* fix: Move loan application form hr module to loan management
* fix: Move Loan Type from hr to loan management
* fix: Move salary slip loan from hr to loan management
* fix: Create loan security pledge doctype
* fix: Create loan security type doctype
* fix: Create Loan security doctype
* fix: Add customer in loan_common.js
* fix: Import patch for loan
* fix: Add security pledging in loan doctype
* fix: Add loan application pledge doctype
* fix: Add logic for security pledgeing in loan
* fix: Add logic for security pledging in loan application
* fix: Rename Loan security doctype to Loan Security Pledge
* fix: Add doctype for loan security
* fix: Fixes in loan and loan application
* fix: Add doctypes for loan repayment
* fix: Fixes in loan and loan application
* fix: Move loan repayment report from HR module to loan management
* fix: Create doctype for loan security price
* fix: Create doctype for loan security shortfall
* fix: Make fields in Loan shortfall readonly
* fix: Make loan type submittable
* fix: Add daily job for loan security revaluation in hooks.py
* fix: Add loan management module
* fix: Doctype for loan disbursement Entry
* fix: GL entry fix for loan disbursement
* fix: Add company currency options in Loan related doctypes
* fix: Changes in Loan Doctypes
* fix: Allow miltiple loan securities in Loan Security Pledge
* fix: Add proposed pledges in Loan Application
* fix: Add test cases for loan
* fix: Interest Accrual Entry for loans
* fix: Remove loan from journal entry
* fix: Update triggers in loan_common.js
* fix: Accrual Entries for loan Interest
* fix: Proposed Pledges for loan application
* fix: Update items in loan management module
* fix: Allow multiple disbursements against a loan
* fix: Add loan security code in loan security master
* fix: Allow multiple securities in a single pledge
* fix: Spelling and label fixes
* fix: Replace date in loan security price with datetime
* fix: Add dashboard to loan master
* fix: Move Repayment Schedule from HR to Loan Management
* fix: Add back jobs for loan accrual entries
* fix: Multiple fixes in loan
* fix: Multiple fixes in loan application
* fix: Loan Reapayment for term loans
* fix: Interest Accural Entries for term loans
* fix: Changes in Loan Doctypes
* fix: Add test case for term loan repayment
* fix: Add custom button to update loan security price and trigger shortfall
* fix: Usability fixes in Loan management
* fix: Multiple usablity and doctype fixes
* fix: Muliple bug and usability fixes in loan
* fix: Test case fixes for loan repayment from Salary
* fix: Codacy fixes
* fix: Test Case fixes
* fix: Minor fix in validate_repayment_method
* fix: Test case and codacy fixes
* fix: Provide consistent naming series to loan doctypes
* fix: Loan Application fix
* fix: Loan Application Dashboard
* fix: Add doctypes to process loan interest accural and loan security price
* fix: Provision to make loan topup
* fix: Pledge and unpledge statuses and doctype for loan securit unpledge
* fix: Multiple fixes in Loan Cycle
* fix: Add missing dashboards to loan doctypes
* fix: Add Loan Manager role to loan doctypes
* fix: Loan Process fixes
* fix: Loan Security Unpledge fixes
* fix: UX, List and dashboards fixes
* fix: Minor fixes
* fix: Minor fixes
* fix: Status on additional loan security
* fix: Codacy fixes
* fix: Multiple fixes in loan
* fix: Rename Process Loan Security Price to Process Loan Security Shortfall
* fix: Loan Repayment and Closure report
* fix: Loan Security Status report and minor fixes
* fix: Multiple UX fixes
* fix: Test Case fixes and UX fixes
* fix: Currency symbol fixes in Salary Slip Loan
* fix: Make loan account details read only
* fix: Changes in loan security price updation
* fix: Sanctioned Loan Amount doctype
* fix: Updates in process loan interest accrual
* fix: Pass loan doc instead of loan name
* fix: Fixes in process loan interest accrual
* fix: Add missing semicolon
* fix: Test case
* fix: Test case
* fix: Sandbox method to get proposed pledges
* fix: Sandbox method
* fix: Nonetype fix in loan sanction limit
* fix: GL entry fixes
* fix: Update maximum loan amount on loan security pledging
* fix: Round off loan amounts
* fix: Loan Security unpledging
* fix: Interest amount for loan closure
* fix: Due date for loan repayments
* fix: API fixes for loan disbursement method
* fix: Disable quick entry for sanctioned loan amount
* fix: Add misssing translations for validations and codecleanup
* fix: Translation fixes and code cleanup
* fix: Test Cases
* fix: Loan Interest Accrual test case
2020-02-26 10:44:24 +05:30
Deepesh Garg
7f2ad5dd82
Merge pull request #20714 from rohitwaghchaure/account_dashboard_not_working_issue
...
fix: account dashboard not working
2020-02-26 10:18:03 +05:30
Deepesh Garg
0ebace5da2
fix: Update paid amount for pos return ( #20543 )
...
* fix: Paid amount updation for pos return
* fix: Remove console
* fix: Styling
* fix: get default mode of payment from POS profile
* fix: Add test cases
* fix: Codacy
2020-02-25 13:21:16 +05:30
Rohit Waghchaure
ebdf80ddb5
fix: account dashboard not working
2020-02-24 18:45:47 +05:30
Saqib
ca7f53b4ea
chore: SINV set_status remove redundant function calls ( #20660 )
...
* chore: SINV set_status remove redundant function calls
* Update erpnext/accounts/doctype/sales_invoice/sales_invoice.py
Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-02-20 12:32:05 +05:30
Saqib
cfe2db6d77
fix: mandatory on hold comment for purchase invoice ( #20666 )
2020-02-20 12:29:44 +05:30
Deepesh Garg
ad246a4415
Merge pull request #19856 from alyf-de/skr03_gnucash
...
feat(accounts): add german CoA "SKR03" (GnuCash)
2020-02-19 19:21:51 +05:30
Deepesh Garg
0a6314ab92
Merge pull request #20659 from deepeshgarg007/plaid_fix_develop
...
fix: Plaid fixes and enhancements
2020-02-18 18:09:01 +05:30
Deepesh Garg
16445305d5
fix: Styling and minor fixes
2020-02-18 18:04:09 +05:30
racitup
547a0bb909
fix: attempt at pymysql InternalError 1054 about clearance_date in field list when removing payments from bank transactions
2020-02-18 17:49:57 +05:30
racitup
719678957a
fix: Bank Reconciliation Bank Account and Bank Account No field names
2020-02-18 17:49:45 +05:30
racitup
1548e20b78
fix: KeyError about bank_account_no due to non-existent field: #20343
2020-02-18 17:49:08 +05:30
racitup
7cda218af3
fix: pymysql.err.InternalError about t2.bank_account_no due to removal of field from Journal Entry Account table: #20343
2020-02-18 17:48:54 +05:30
Deepesh Garg
0ce9e0cc1f
feat: Group by AR/AP report ( #20573 )
...
* feat: Group by AR/AP report
* fix: Do not consider total row in charts
* fix: Subtotal row for last party
2020-02-18 16:07:34 +05:30
rohitwaghchaure
0abc181360
Merge pull request #20638 from nextchamp-saqib/pos-mode-of-pay-fix
...
fix: disabled mode of payments fetches in sales invoices
2020-02-18 12:38:06 +05:30
Deepesh Garg
15ff6a594b
feat: Inter warehouse stock transfer on valuation rate with taxation ( #20083 )
...
* fix: Validation for target warehouse
* feat: Get items on valuation rate in delivery note on Internal transfers
* fix: Create Inter company purchase receipt from delivery note
* feat: Inter company stock transfer on valuation rate with taxation
* fix: Add from warehouse in purchase invoice
* fix: Use get_value instead of get_cached_value
* fix: Get incoming rate instead of valuation rate
* fix: GL entry for from warehouse in purchase receipt
* fix: GL Entries fixes in purchase invoice
* fix: Address and tax fetching fixes
* fix: Add test case for stock transfer via purchase receipt
* fix: Code cleanup, added validations and test cases
* fix: Validation for supplier warehouse
* fix: Test Cases
* fix: Change validation condition
* fix: Address fixes while creating Purchase Receipt from delivery note
* fix: Set taxes while creating Purchase Receipt from Delivery Note
* fix: Update set_missing_value function
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
2020-02-18 12:28:41 +05:30
P-Froggy
3cb9f4ab73
Add address and contact fields to bank
...
Address and contact fields are enabled for DocType Bank
2020-02-18 02:14:03 +01:00
P-Froggy
4cc929cabb
Move SWIFT-number and branch-code from bank account to bank
...
The bank's SWIFT-Number and branch-code should be a field in bank DocType, not in bank account DocType.
2020-02-18 00:38:46 +01:00
thefalconx33
23e728612f
fix: disabled mode of payments fetches in sales invoices
2020-02-17 14:15:20 +05:30
Yugandhara
ad645afeb2
fix: Changes done to get valid customer and employee list on payment entry form
2020-02-15 10:56:41 +05:30
Raffael Meyer
0fac1f9429
Add groups for account types "Bank" and "Cash"
2020-02-12 13:59:48 +01:00
Raffael Meyer
cad404c355
Merge branch 'develop' into skr03_gnucash
2020-02-12 13:58:53 +01:00
Deepesh Garg
c688f9f584
Merge pull request #20559 from rohitwaghchaure/added_indexing_on_columns_to_fix_performance_issue_develop
...
fix: added indexing on columns to fix performace issue
2020-02-11 10:12:49 +05:30
Deepesh Garg
9462ba6559
feat: Group by item wise sales register ( #20251 )
...
* fix: Group by sales register report
* fix: Remove group-by item
* fix: Grand total query fix
* fix: Remove debug param
* fix: Code cleanup and commonification
* fix: Add group by functionality to purchase register
* fix: Changes in total row display
* fix: Minor fixes
* fix: Add total row
* fix: Do not calculate total for rate
2020-02-10 17:59:17 +05:30
Rohit Waghchaure
50886f02c3
fix: added indexing on columns to fix performace issue
2020-02-10 15:56:56 +05:30
rohitwaghchaure
7d2c8cffb0
fix: pricing rule not working on item groups ( #20547 )
...
Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>
2020-02-09 21:23:53 +05:30
Deepesh Garg
30e766b228
fix: SQL query in financial statements
2020-02-05 12:12:47 +05:30
Pranav Nachnekar
6c14a08631
fix: disallow quick entry for doctypes with tree view ( #20452 )
2020-02-03 17:05:26 +05:30
Deepesh Garg
9e1fbaf59e
fix: Label and UX fixes while creating payment entry against customer ( #20465 )
...
* fix: Label and UX fixes while creating payment entry against customer
* fix: filter
2020-02-03 15:58:50 +05:30
Saqib
4fca6cae34
feat: add tax category in pos profile ( #20413 )
...
* feat: add tax category in pos profile
* fix: review fixes
2020-02-03 15:53:27 +05:30
Deepesh Garg
589f2cd16c
fix: Get only specified company accounts in financial statements ( #20486 )
2020-02-03 15:49:24 +05:30
Deepesh Garg
cce3ac9f79
fix: Move E-Way bill button under create
2020-02-02 21:25:58 +05:30
rohitwaghchaure
ffa74ad5c1
Merge pull request #20478 from deepeshgarg007/finance-book-filter-new
...
fix: Do not show any finance book record if no finance book filter is applied
2020-01-31 13:19:16 +05:30
Deepesh Garg
34c33baa82
fix: Cash flow filter fix
2020-01-31 11:16:30 +05:30
Deepesh Garg
ba44f28202
fix: Filtering fixes in financial statement
2020-01-31 09:08:29 +05:30
Deepesh Garg
ce04526db8
fix: Do not show any finance book record if no finance book filter is applied
2020-01-30 15:33:51 +05:30
Faris Ansari
8e131c7cad
fix: Remove translated strings from test
2020-01-30 13:03:05 +05:30
Raffael Meyer
e21cd5e7f1
fix: account number for "Kasse"
2020-01-29 23:39:55 +01:00
Raffael Meyer
3716434218
fix: add missing account types
2020-01-29 22:21:19 +01:00
Suraj Shetty
da2c69e836
fix(translations): Incorrect syntax
2020-01-29 15:34:06 +05:30
Suraj Shetty
2f67647f7b
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-incorrect-translations
2020-01-29 15:06:50 +05:30
Suraj Shetty
48e9bc3fc9
fix: Incorrect translation syntax
2020-01-29 15:06:18 +05:30
Pranav Nachnekar
3fb48ebf61
fix: discounting not applied on sales invoice created by subscriptions ( #20431 )
2020-01-28 12:52:13 +05:30
Marica
4e7625bd8f
fix: Column 'project' in where clause is ambiguous ( #20438 )
...
* fix: Column 'project' in where clause is ambiguous
* fix: Fixed alias in query
2020-01-28 12:43:38 +05:30
Deepesh Garg
ef41a0eda5
fix: Finance book filtering in financial statements ( #20410 )
...
* fix: Finance book filtering in financial statements
* fix: Use IS NULL instead of ifnull
2020-01-27 15:18:51 +05:30
Saqib
9cb02bf2e1
fix: incorrect status for fraction of outstanding amount ( #20369 )
2020-01-27 14:22:43 +05:30
Saqib
9291df4d4c
fix: wrong outstanding invoices fetched against employee ( #20373 )
2020-01-24 16:22:49 +05:30
Deepesh Garg
60e8d52f32
Merge pull request #20401 from deepeshgarg007/general_ledger_sort
...
fix: Order GL entries by creation time in General ledger
2020-01-24 13:19:39 +05:30
Rohit Waghchaure
8996b7d8a4
delete the auto created batch
2020-01-23 17:44:19 +05:30
deepeshgarg007
fdba26d476
fix: Order GL entries by creation time in General ledger
2020-01-23 17:42:57 +05:30
Rohit Waghchaure
4f4dbf1996
fix: unlink references from batch on cacnellation of stock transactions
2020-01-23 12:45:45 +05:30
rohitwaghchaure
5056c8bcb4
fix: not able to import chart of account if parent account is missing ( #20368 )
2020-01-21 15:32:26 +05:30
Saqib
eea0ffcb38
fix: account not added to child company ( #20361 )
2020-01-21 15:25:51 +05:30
Saqib
bcb6130bbe
fix: hide total amount field from journal entry PF ( #20324 )
2020-01-16 13:38:43 +05:30
sahil28297
32d643ed3c
fix(patch): reload tax category ( #20308 )
2020-01-15 18:57:54 +05:30
Saqib
617a24191f
fix: get existing payment req amount only from unpaid req ( #20289 )
2020-01-15 16:36:13 +05:30
Shivam Mishra
a59c2ce17a
fix: profit and loss indicator bug
2020-01-14 17:55:49 +05:30
Shivam Mishra
748c3d9e8b
feat: update profit and loss for new report summary API
2020-01-14 17:31:19 +05:30
Saqib
1218160c70
fix: payment entry can be created against on hold PI ( #20270 )
2020-01-14 12:07:24 +05:30
Deepesh Garg
16b8673554
Merge pull request #20257 from nextchamp-saqib/revery-jv-fix
...
fix: remove default customer as party type
2020-01-13 13:48:55 +05:30
thefalconx33
f04d054faa
fix: remove default customer as party type
2020-01-13 12:43:49 +05:30
rohitwaghchaure
d4d7d211ea
feat: report to show difference between stock and account value ( #20186 )
2020-01-09 15:05:05 +05:30
Marica
287f491f7b
fix: Employee name in Report trial balance for party ( #20223 )
...
* fix: Employee name in Report trial balance for party
* fix: Add account filter in trial balance for party report
Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>
2020-01-09 13:35:06 +05:30
Deepesh Garg
ef0d26c161
feat: Validity for Item taxes ( #20135 )
...
* feat: Validity for Item taxes
* fix: Trigger for gst hsn code
* fix: Sort taxes based on validity
* fix: Validation for item tax template and filters based on validity
* fix: Add missing semicolon
* fix: Validate tax template only if item code available
* fix: Do not validate or filter item tax template if no item taxes applied
* fix: Consider item group for validating taxes
* fix: Test cases for item tax validation
* fix: Item tax template filtering fixes
* fix: Add missing semicolon
* fix: Remove unnecessary query
2020-01-06 15:34:15 +05:30
rohitwaghchaure
b5f91bea90
Merge pull request #20195 from rohitwaghchaure/fixed_party_type_in_payment_request
...
fix: incorrect party type in payment request
2020-01-06 15:16:42 +05:30
Rohit Waghchaure
8641f9ce77
fix: party type in payment request
2020-01-06 15:07:06 +05:30
Syed Mujeer Hashmi
03bf1a875f
feat: Allow write-off for Fees doctype
...
Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2020-01-04 13:26:42 +05:30
rohitwaghchaure
52c5fb33d7
Merge pull request #20169 from rohitwaghchaure/fix_pricing_rule_issue_for_ignore_pricing_rule_develop
...
fix: ignore pricing rule for other item group
2020-01-02 19:24:37 +05:30
Rohit Waghchaure
660a78b877
fix: ignore pricing rule for other item group
2020-01-02 17:31:09 +05:30
deepeshgarg007
473b478883
fix: Show closing row in general ledger print
2020-01-02 12:22:04 +05:30
Raffael Meyer
5d6fada431
feat: add accounts and account types
2020-01-01 22:55:54 +01:00
Javier Wong
5cc7648e9c
[Fix] Allow Print Before Pay in POS ( #20151 )
...
Print Button does not show even when Print Before Pay is enabled in the POS Profile.
2019-12-31 17:07:37 +05:30
Saqib
cb7043fd9d
fix: party account currency not fetched from account for SO ( #20146 )
2019-12-31 13:55:13 +05:30
Marica
5483f1a27e
fix: Field 'other_charges_calculation' column type changed. ( #20141 )
2019-12-30 22:20:02 +05:30
Rucha Mahabal
3ac39ba28d
fix: format currency field in bank and cash payment voucher print format ( #20137 )
2019-12-30 15:18:07 +05:30
Saqib
7e57ede35b
fix: unpaid invoices are created even if current invoice is paid ( #20081 )
2019-12-27 13:02:13 +05:30
Deepesh Garg
1a2e4fa36d
Merge pull request #20087 from nextchamp-saqib/pay-reco-fix
...
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-27 08:13:09 +05:30
thefalconx33
81d0861506
fix: undefined dr_or_cr_notes in case of party type Employee
2019-12-26 14:42:11 +05:30
thefalconx33
6291ca8e40
fix: only show doctypes which impact accounting in accounting period
2019-12-26 13:55:35 +05:30
Saqib
7519436260
Merge pull request #19876 from rohitwaghchaure/provision_to_select_custom_fields_in_pos
...
feat: provision to select the custom fields in the online POS
2019-12-26 13:40:43 +05:30
Rohit Waghchaure
682273a00b
feat: provision to select the custom fields in the online POS
2019-12-26 11:59:19 +05:30
Mitchy25
fee8340f98
fix: Bank Reconciliation Allows to Over Reconcile ( #19461 )
...
* Update bank_reconciliation.py
* fix: improve error message while over reconciling
* fix: only check over-reconciliation when against payment entry
Co-authored-by: Saqib <thefalconx33@gmail.com>
2019-12-24 18:02:18 +05:30
Don-Leopardo
ec258a43d9
perf: Asset Depreciations and Balances report ( #18022 )
2019-12-24 17:35:53 +05:30
Pranav Nachnekar
b972f763f3
fix: added validation for cost center ( #19932 )
...
* fix: add validation for cost centers in sales invoice
* use `get_cached_value` for getting compnay, formatting of error message
2019-12-24 16:46:46 +05:30
rohitwaghchaure
08433c2919
fix: supplier email id field not showing in the notification for purchase cycle doctypes ( #20071 )
2019-12-24 13:03:47 +05:30
Saqib
977489697d
Merge pull request #19973 from deepeshgarg007/budget_variance_dimension
...
feat: Dynamic filters for dimensions in budget variance report
2019-12-24 12:57:50 +05:30
Deepesh Garg
f5bd920e8f
Merge pull request #19955 from deepeshgarg007/employee_advance_return
...
feat: Capture return amount against Employee Advance via Journal Entry
2019-12-24 11:52:20 +05:30
Deepesh Garg
2b3482d5dd
fix: Do not validate accounting dimensions if from repost ( #20042 )
...
* fix: Do not check for accounting dimensions in case of repost
* fix: Do not validate accounting dimensions if from repost
2019-12-23 17:58:50 +05:30
Saqib
9078607600
fix: paid amount gets overwritten by get_outstanding_invoices ( #20050 )
2019-12-23 16:25:16 +05:30
Saqib
4f18d2548d
fix: none type object updates AR report row ( #19958 )
2019-12-23 16:01:38 +05:30
Saqib
1263515a92
fix: exchange rate not fetching correctly ( #20010 )
2019-12-23 15:51:31 +05:30
Deepesh Garg
06e7cf3caa
Merge pull request #20009 from nextchamp-saqib/pi-payable-filter
...
fix: bad credit to filter in purchase invoice
2019-12-23 14:50:56 +05:30
thefalconx33
ee10f2f50d
fix: bad query for debit_to field in sales invoice
2019-12-23 13:07:00 +05:30
Deepesh Garg
704235565e
Merge pull request #20012 from nextchamp-saqib/share-transfer-perm
...
fix: no role has cancelling permission for share transfer doctype
2019-12-21 17:23:15 +05:30
thefalconx33
7e68f050d9
fix: account manager doesn't have cancel submit perm for share transfer
2019-12-20 14:50:25 +05:30
Deepesh Garg
c408628ef2
Merge pull request #19979 from deepeshgarg007/sales_register_upgrade
...
fix: Update sales register report
2019-12-19 13:53:15 +05:30
thefalconx33
e9cb561d8d
fix: no role has cancelling permission for share transfer doctype
2019-12-19 13:18:46 +05:30
thefalconx33
9d9a78442e
fix: bad filter query
2019-12-19 13:10:57 +05:30
Rohit Waghchaure
2ae79b8ac2
fix: Pricing Rule Discount for Product
2019-12-18 17:53:21 +05:30
deepeshgarg007
be8c406808
fix: Update sales register report
2019-12-17 22:27:23 +05:30
deepeshgarg007
e65ada2807
feat: Dynamic filters for dimensions in budget variance report
2019-12-17 17:54:34 +05:30
rohitwaghchaure
5d0c42e2a1
Merge pull request #19943 from nextchamp-saqib/gl-precision-fix
...
fix: gl entries doesn't filter based on debit precision
2019-12-17 17:23:34 +05:30
rohitwaghchaure
86babbe3ac
Merge pull request #19970 from rohitwaghchaure/fixed_incorrect_outstanding_amount_showing_in_the_ap_ar_report_v13
...
fix: incorrect outstanding amount showing in the AP/AR report
2019-12-17 17:15:45 +05:30
Rohit Waghchaure
0f583b8c5a
fix: incorrect outstanding amount shwoing in the AP/AR report
2019-12-17 12:48:02 +05:30
rohitwaghchaure
86b2956ac0
Merge pull request #19946 from rohitwaghchaure/pricing_rule_not_working_for_product_discount
...
fix: pricing rule not working for product discount
2019-12-16 14:44:22 +05:30
Rohit Waghchaure
8bd84b28ca
fix: schedule date
2019-12-16 12:29:07 +05:30
Rohit Waghchaure
21fe97e723
fix: pricing rule not working for production discount
2019-12-16 11:15:53 +05:30
deepeshgarg007
c05bd1964f
feat: Capture return amount against Employee advance via Journal Entry
2019-12-15 21:22:28 +05:30
Suraj Shetty
586390db81
Merge branch 'develop' into fix-profit-and-loss-statement
2019-12-14 22:49:53 +05:30
rohitwaghchaure
b2f65366cf
Merge pull request #19941 from deepeshgarg007/pricing_rule_fix
...
fix: Price rule filtering fix
2019-12-13 16:01:16 +05:30
thefalconx33
bfc43d3b15
fix: gl entries doesn't filter based on debit precision
2019-12-13 15:41:19 +05:30
deepeshgarg007
8c9c6ec919
fix: Price rule filtering fix
2019-12-13 13:47:15 +05:30
Deepesh Garg
859b464a57
Merge pull request #19904 from prssanna/file-upload-fix
...
fix: Bank statement not getting attached in Bank Reconciliation
2019-12-12 15:19:54 +05:30
Suraj Shetty
f95267041d
fix: Financial statement report
...
- Hidden column should note be considered in the report
- Remove hardcoded currency formatting
- Remove duplicate letterhead in the report
(print_template already adds one)
- Remove extra quotes from Total Amount text
2019-12-12 13:06:17 +05:30
prssanna
2ef26fbb07
fix: empty fname and fcontent of uploaded file
2019-12-11 14:21:04 +05:30
Saqib
664d0d89b5
fix: incorrect account mapping for child companies ( #19887 )
...
* fix: incorrect account mapping for child companies on adding account to parent company
* Update account.py
2019-12-10 21:32:17 +05:30
Deepesh Garg
6e2c13f4c8
feat(regional): Auto state wise taxation for GST India ( #19469 )
...
* feat(regional): Auto state wise taxation for GST India
* fix: Update gst category on addition of GSTIN
* fix: Codacy and travis fixes
* fix: Travis
* fix(test): Update GST category only if GSTIN field available
* fix: Test Cases
* fix: Do not skip accounts if place of supply is not present
* fix: Auto GST taxation for SEZ Party types
* fix: Automatic taxation for multi state
* fix: Codacy and travis fixes
* fix: Auto GST template selection in Sales Order
* fix: Move inter state check and source state to tax category
* fix: Remove unique check from tax template
* fix: Remove unique check from tax template
* fix: Address fetching logic in Sales
* fix: fecth tax template on company address change
* fix: fetch company gstin on address change
* fix: company_gstin set value fix
* fix: Mutiple fixes and code refactor
* fix: Add missing semicolon
* fix: Company address fetching in sales invoice
* fix: Remove print statement
* fix: Import functools
* fix: Naming fixes and code cleanup
* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Deepesh Garg
ce42f48bfb
fix: Append expense account only if expense account exists ( #19880 )
2019-12-10 12:15:33 +05:30
Saqib
7e958da6d6
fix: sales order reqd only checks for stock items ( #19865 )
2019-12-09 17:23:19 +05:30
Saqib
39e4f75a76
fix: get outstanding invoices btn working on submitted payment entry ( #19858 )
2019-12-09 13:16:35 +05:30
Deepesh Garg
b63101250c
fix: Rounding Adjustment GL entry fix ( #19838 )
...
* fix: Rounding Adjustment GL entry fix
* fix: Spacing in tab
* fix: Comment fix
2019-12-09 13:03:24 +05:30
Raffael Meyer
af9c5fda9e
rename CoA
2019-12-07 14:22:51 +01:00
Raffael Meyer
05d708b51c
add some missing accounts
...
Aktive Rechnungsabgrenzung
Passive Rechnungsabgrenzung
Kasse
Verblk. aus Lohn und Gehalt
Erlöse
2019-12-07 14:21:22 +01:00
Raffael Meyer
d86cefe1a5
first draft
2019-12-07 13:10:44 +01:00
Nabin Hait
d285e9b7bd
optimize: Optimization of Receivable report filtered based on sales person ( #19796 )
2019-12-04 15:30:58 +05:30
Nabin Hait
acdd5081da
fix: Service start and end date validation for deferred accounting ( #19805 )
2019-12-04 15:30:01 +05:30
Deepesh Garg
dfd82d22c8
Merge pull request #19792 from nabinhait/ar-summary-based-on-terms
...
feat: Receivable / payable summary based on payment terms
2019-12-04 11:25:28 +05:30
Saqib
d635bda29b
fix selling setting label for sales order reqd ( #19775 )
2019-12-03 17:05:06 +05:30
Khushal Trivedi
73129e6ac8
fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' ( #19774 )
...
* fix: date validation on inpatient record, else condition removing on clinical prcd templ which is not req
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
* fix:Pricing Rule error AttributeError: 'str' object has no attribute 'get' #19770
2019-12-03 17:03:45 +05:30
Nabin Hait
e176c3c1d1
feat: Receivable / payable summary based on payment terms
2019-12-03 16:56:48 +05:30
Deepesh Garg
8d31171ff8
fix: Party name field in trial balacne for party report ( #19789 )
2019-12-03 16:31:07 +05:30
Deepesh Garg
03d1394540
fix: Unable to see parties with negative balance in AR/AP Summary ( #19776 )
2019-12-03 15:12:44 +05:30
Deepesh Garg
06a6fa4cfc
feat: Accounts Payable report based on payment terms ( #19672 )
2019-11-29 16:56:27 +05:30
rohitwaghchaure
d76529e6ca
Merge pull request #19748 from deepeshgarg007/version-12-serial-no-fix
...
fix: Serial no validation against sales invoice
2019-11-29 16:34:58 +05:30
deepeshgarg007
c51dd2989e
fix: Validation msg
2019-11-29 15:56:16 +05:30
deepeshgarg007
45f57f273c
fix: Serial no validation against sales invoice
2019-11-29 15:56:08 +05:30
rohitwaghchaure
b59a25b02b
Merge pull request #19746 from rohitwaghchaure/fixed_customer_selection_issue_in_sales_invoice_healthcare_module
...
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:29:31 +05:30
Mangesh-Khairnar
92b9d7383d
fix: show create payment request for so that are not billed
2019-11-29 14:22:52 +05:30
Rohit Waghchaure
bf8fe06f86
fix: please specify customer error in sales invoice if patient is blank
2019-11-29 14:14:11 +05:30
Marica
8f48896261
fix: Permission issue in Stock Entry ( #19738 )
2019-11-28 19:39:49 +05:30
Anurag Mishra
f3b393f5e0
fix: UOM was not fetching in purchase invoice ( #19732 )
...
* fix: UOM was not fetching in purchase invoice
* fix: Changes requested
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2019-11-28 18:52:16 +05:30
Deepesh Garg
7cdde93645
fix: Validation for parent cost center ( #19664 )
...
* fix: Validation for parent cost center
* fix: Minor modification in condition
* fix: Update test cases for invalid cost center creation
2019-11-28 18:37:51 +05:30
Joseph Marie Alba
5c2ba0ef9c
Fix: Logic bug ( #19692 )
...
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] not in ('', 1)]
- if accounts[d]['is_group'] not in ('', 1) is wrong because it returns false even if the account is a group.
- should be if accounts[d]['is_group'] not in ('', 0)
However, the correction provided here:
account_groups = [accounts[d]["account_type"] for d in accounts if accounts[d]['is_group'] == 1]
is more consistent with the prior statement that extracts ledger (and not group) accounts.
account_types = [accounts[d]["account_type"] for d in accounts if not accounts[d]['is_group'] == 1]
2019-11-28 18:33:20 +05:30
Deepesh Garg
9f3276046f
fix: Account type in Handling Difference in Inventory account ( #19674 )
...
* fix: Account type in Handling Difference in Inventory account
* fix: Add Stock Adjustment account
* fix: Rename account to stock adjustment
2019-11-28 18:29:33 +05:30
Shivam Mishra
2512962f55
fix: handle None case for get_shipping_amount_from_rules ( #19723 )
2019-11-28 16:46:58 +05:30
rohitwaghchaure
1511154aa8
fix: removed stock value and account balance out of sync validation ( #19729 )
...
* fix: revert value out of sync feature
* fix: removed stock value and account balance out of sync validation
2019-11-28 16:43:39 +05:30
Deepesh Garg
31a4fa5dd3
Merge pull request #19606 from deepeshgarg007/shareholder_refactor
...
refactor: Share Transfer code cleanup and refactor
2019-11-26 07:54:57 +05:30
Nabin Hait
a7d168c05f
fix: merge conflict
2019-11-25 18:12:56 +05:30
Nabin Hait
35e8d1e1d7
Stock acc bal sync msg ( #19676 )
...
* fix: Prefilled JV via Account Balance and Stock Value mismatch error message
- Make JV button will route to Journal Entry and add rows in child table
* fix: make journal entry to sync stock and account balance
* fix: translated action label
2019-11-25 14:02:51 +05:30
Nabin Hait
2fd6814cbf
Merge branch 'marination-account_stock_sync_error' into develop
2019-11-25 12:46:45 +05:30
Nabin Hait
1ed1c4e6a4
fix: make journal entry to sync stock and account balance
2019-11-25 12:33:40 +05:30
Saqib
f37a46edea
Fixed Asset Refactor Review fixes ( #19665 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:50 +05:30
Saqib
1919af2ff1
Fixed Asset Refactor Review fixes ( #19666 )
...
* fix: fixed asset item creation ux fixes
* fix: auto creation of asset ux fixes
* fix: [LCV] incorrect condition when checking assets linked with PR
* fix: bulk update assets
* refac: remove company level cwip enabling
* cwip can be enabled only on category level
* fix : #19649
2019-11-22 16:32:34 +05:30
Nabin Hait
aff4a67954
Merge branch 'account_stock_sync_error' of https://github.com/marination/erpnext into marination-account_stock_sync_error
2019-11-22 15:14:32 +05:30
Mangesh-Khairnar
b10526dd86
fix: consider taxes in the grand total ( #19631 )
2019-11-22 12:28:33 +05:30
Nabin Hait
7af153da50
fix: Multiple fixes related to landed cost accounting ( #19656 )
2019-11-22 11:35:14 +05:30
Nabin Hait
046137caa2
fix: Multiple fixes related to landed cost accounting ( #19657 )
2019-11-22 11:34:50 +05:30
Rucha Mahabal
45e9dd9c51
fix(Journal Entry): default Cash Entry account not getting fetched
2019-11-20 11:40:38 +05:30
rohitwaghchaure
26c46282e8
Merge pull request #19618 from nextchamp-saqib/pos_fix
...
fix: stock qty not displayed in pos
2019-11-19 19:41:25 +05:30
rohitwaghchaure
a85ddf2fb4
fix: performance issue of sales invoice while save/submit ( #19598 )
...
* fix: performace issue of sales invoice while save/submit
* Cached price list data, item group child data, added indexing for blanket order
2019-11-19 18:47:48 +05:30
Nabin Hait
9db9edca2c
fix(expense claim): fetch outstanding documents based on party account type
2019-11-19 18:44:54 +05:30
thefalconx33
353f73a153
fix: stock qty not displayed in pos
2019-11-19 18:37:21 +05:30
Deepesh Garg
ee69f707a9
Merge pull request #19600 from rohitwaghchaure/make_email_queue_issue_in_pos
...
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-19 09:47:55 +05:30
deepeshgarg007
0debcf9f2f
fix: Share existing condition logic
2019-11-18 22:12:29 +05:30
deepeshgarg007
9c1c4ef3dd
refactor: Share transfer cancellation and code cleanup
2019-11-18 17:52:19 +05:30
marination
6ef057a2a3
fix: Prefilled JV via Account Balance and Stock Value mismatch error message
...
- Make JV button will route to Journal Entry and add rows in child table
2019-11-18 15:55:32 +05:30
Rohit Waghchaure
466702200f
fix: 'NoneType' object has no attribute 'replace' in POS
2019-11-18 14:57:55 +05:30
Deepesh Garg
87c6718d90
fix: Book valuation expense in specified account rather than expense included in valuation account ( #19590 )
...
* fix: Book valuation expense in specified accout rather than expense included in valuation account
* fix: Remove undefined variable
* fix: Test cases
* fix: Test Case
2019-11-18 12:34:30 +05:30
Saqib
d995609ffa
Fixed asset refactor ( #19369 )
...
* refactor: Asset Movement with multiple assets using table
* refactor: Create Asset Movement from Asset List & Linking PR/PI with Asset
* feat: Auto create asset on Purchase checkbox
* refactor: LCV for asset created via PR/PI
* refactor: get asset category accounts from item master
* refactor: Purchase Receipt for asset purchasing
* refactor: Purchase Invoice for asset purchasing
* fix: post-refactor delete fixes
* refactor: moved asset validation from pr/pi on asset submission
* fix: Asset Category should be defined for auto purchasing assets
* fix: undo serial_no_update removal (for non asset item) from LCV
* fix: remove duplicate calls from item.js
* fix: args position of all occurrence of get_asset_category_account()
* fix: test cases
* fix: landed cost voucher validations
* refactor: test case for auto creation of asset
* fix: removed invalid assertions
* fix: patch errors on travis
* fix: codacy fixes
* fix: PI Items not fetching details from item
* fix: asset movement from list view having default purpose 'Receipt'
* chore: msgprint for selecting item code first while creating asset manually
* fix: alert messages
* minor: asset movement fixes
* fix: lcv was made against submitted assets
* minor: ux fixes
* refac: move specific asset validation to SINV
* chore: remove make_purchase_invoice from asset form
* make asset movement on asset submission
* add PR & PI queries based on item code
* refac: not allow last movement cancellation
* move asset movement creation on asset submission
* asset movement naming series
* add tests
* fix: code review changes
* chore: remove unecessary asset movement updation
* refac: setting latest location while making asset movements
* Added extra validations
* fix: form dashboard make lcv button
* fix: auto asset movement creation validation
* fix: allow lcv against other items after removing submitted assets
* chore: remove unwanted condition
* fix: mismatch debit credit on purchase of asset with valuation tax
* chore: toggle required field based on movement type
* chore: fix lcv error message
* fix: travis failing
* fix: travis failing test
* fix: wrong conditions after merge
* fix: cannot cancel assets
* fix: travis failing* fix change in deletion of assets
* fix: codacy
* fix: process cancellation of assets
* refac: cancellation of pr only deletes auto created assets
* fix: incorrect query
2019-11-18 11:46:55 +05:30
deepeshgarg007
57bd1308eb
fix: Validation messages code cleanup
2019-11-15 08:25:48 +05:30
prssanna
74bbcb539f
fix: Ignore period closing voucher entries in accounts dashboard
2019-11-14 22:47:58 +05:30
Marica
c9e8a1bf96
fix: Account Balance and Stock Value out of sync error message ( #19526 )
...
* fix: Account Balance and Stock Value out of sync error message
Added 'Make Adjustment Entry' button and enhanced message
* fix: Split message and changed routing for translation
2019-11-14 16:13:43 +05:30
Nabin Hait
ec082754b4
fix: One serial no can be tagged in multiple invoices if used against different items ( #19580 )
2019-11-14 13:28:24 +05:30
Nabin Hait
732d6afad5
fix: Show AR summary based on outstanding ( #19573 )
2019-11-13 18:49:23 +05:30
Nabin Hait
3a72cb46bc
fix: Set due date in accounts receivable based on payment terms ( #19563 )
2019-11-13 17:58:10 +05:30
Deepesh Garg
082bfb8cb3
Merge pull request #19567 from deepeshgarg007/balance_sheet_develop
...
fix: Accumulated Values filter disappearing
2019-11-13 17:46:46 +05:30
deepeshgarg007
5ea4328359
fix: Accumulated Values filter disappearing
2019-11-13 13:23:49 +05:30
Marica
d00c59830e
feat: Disable CWIP Accounting checkbox added in Company and Asset Category ( #19262 )
...
* feat: Disable CWIP Accounting checkbox added in Company and Asset Category
Asset Settings is removed completely
Disable CWIP Accounting checkbox will give priority to Asset Category
* fix: Changed checkbox name to 'Enable Capital Work in Progress Accounting'
- checkbox will be disabled by default
- Enabling it in Company will globally enable it
- When globally disabled , it's value on the asset category will be considered
* chore: Added patch to set pre-existing CWIP checkbox value into new checkbox
* fix(test): Asset
* fix: Asset Test and Patch
* fix(test): Opening Invoice Creation Tool
* Update asset.py
* fix: Patch and other fixes
2019-11-12 19:17:43 +05:30
Deepesh Garg
3cc3b57926
fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry ( #19427 )
...
* fix: Expense claim paid through employee advance getting fetched as outstanding in Payment Entry
* fix: Codacy
* fix: Minor UX fixes
* fix: Also credit payable amount in case of advance payment
* fix: Against voucher in GL enrty
2019-11-12 14:32:50 +05:30
deepeshgarg007
929676fceb
fix: Validation logic code cleanup
2019-11-12 12:00:30 +05:30
Mitchy25
a227b9a9a6
Fix Bank Reconcilaition for Payment Entries ( #19190 )
...
* Fix Bank Reconciliation with Payment Entries
* Update bank_reconciliation.js
2019-11-11 17:29:53 +05:30
Nabin Hait
32936024a0
patch: set default for add taxes from item tax template
2019-11-11 15:44:27 +05:30
Nabin Hait
8bd2d4d35e
fix(trial balance): Show opening and closing of group account in single column ( #19509 )
2019-11-11 10:59:20 +05:30
Deepesh Garg
7a23057eab
feat: Enhancement in landed cost voucher ( #19252 )
...
* feat: Enhancement in landed cost voucher
* fix: Make GL entries based on ledgers in Landed cost voucher
* fix: Patch to update expense account in Landed Cost Voucher and Stock Entry
* fix: Ability to select expense account in Stock Entry
* fix: Renaming and test case fixes
* fix: Test Cases
* fix: Additional cost in Stock Entry
* fix: Changed filters and test case fixes
* fix: Upadte filters in stokc entry expense account filter
* fix: company filter
2019-11-08 12:52:54 +05:30
Deepesh Garg
7aef9f3b43
fix: Accounting Dimension custom fields should be admin owned ( #19525 )
...
* fix: Accounting Dimension custom fileds should be admin owned
* fix: Update query
* fix: Travis
2019-11-08 12:42:38 +05:30
Nabin Hait
628701f1a5
fix: Accounts mandatory depending on share transfer type ( #19523 )
2019-11-07 18:05:40 +05:30
Marica
e37a67245e
fix: Sales and Purchase Invoice Status, Payment Reconciliation Credit/Debit Note ( #19388 )
2019-11-07 12:52:23 +05:30
Mitchy25
a5776d16b4
fix: Version 12 Bank Reconciliation fix ( #19182 )
...
* Fix Bank Reconciliation
Change fixes Bank Rec upload as well as the duplicatation of bank_account and company filters
* Update bank_reconciliation.js
Removing incorrect fix to filters.
Filters are loaded from Bank Transaction List.
* Update bank_reconciliation.js
2019-11-06 19:04:54 +05:30
Deepesh Garg
02b9472152
Merge pull request #19490 from prssanna/dashboard-fix
...
fix: fix dashboard with date range
2019-11-06 18:17:08 +05:30
Marica
1beed7db72
fix: Added 'status' field in Payment Entry ( #19507 )
2019-11-06 18:12:29 +05:30
rohitwaghchaure
0c12eded05
Merge pull request #19505 from rohitwaghchaure/credit_limit_not_defined_in_accounts_receivable_report
...
fix: unknown column credit limit in accounts receivable report
2019-11-06 17:26:35 +05:30
Deepesh Garg
f67833f249
Merge pull request #19492 from gavindsouza/invoice-creation-tool-py3
...
fix: invoice creation tool of invoices with no paid and outstanding amounts
2019-11-06 16:40:04 +05:30
rohitwaghchaure
6a50c92087
Update accounts_receivable.js
2019-11-06 16:34:17 +05:30
rohitwaghchaure
e123ec6b45
fix: incorrect number of entries while making deferred revenue entry ( #19473 )
2019-11-06 15:25:00 +05:30
Saqib
01c19d3b93
internal issues ( #19496 )
...
* fix: user remark mandatory in quick entry but not in form
* fix: preview salary slip btn showing in draft and unsaved states
* minor: removed unecessay comma
* fix: department analytics report showing departments of all companies
2019-11-06 14:41:16 +05:30
Rohit Waghchaure
dec5bead9c
fix: unknown column credit limit in accounts receivable report
2019-11-06 13:13:31 +05:30
Gavin D'souza
05710804cf
fix: invoice creation tool of invoices with no paid and outstanding amounts
2019-11-04 14:45:11 +05:30
prssanna
7e2b030052
fix: fix dashboard with date range
2019-11-04 13:07:27 +05:30
Ashish Shah
28710cdf99
fix: coupon code changes suggested by prasad ( #19352 )
...
* changes suggested by prasad
* codacy correction
2019-10-31 16:09:06 +05:30
Suraj Shetty
77e4cf89f8
fix: Pass parent_acc_name ( #19450 )
2019-10-31 15:57:31 +05:30
Anurag Mishra
a11e738801
feat: Stock value and account balance sync. ( #19233 )
...
* feat: Allow user to sync stock_value and account_balance jv if perpetual inventory is checked
* fix(test): Sales Invoice
* fix(test): Purchase Invoice
* fix(test): Delivery Note
* fix: more test_case
* fix(test): Stock Entry
* fix(test): Purchase Receipt
* fix(more-test): Stock Entries
* fix(more-test): Sales Invoice and Delivery Note
* fix: tests for delivery note
* fix: tests for stock reconciliation
* refactor: stock and account balance function
* fix(more-test): Warehouse
* fix(test): Landed Cost Voucher
* fix: changes requested
2019-10-31 15:55:03 +05:30
rohitwaghchaure
3270ba6d8c
Merge pull request #19421 from rohitwaghchaure/account_not_set_for_dasboard_chart_v12
...
fix: 'NoneType' object is not iterable
2019-10-29 11:30:22 +05:30
Anurag Mishra
07b908c0c5
patch: Missing Patch for item Tax template
2019-10-28 16:00:24 +05:30
Rohit Waghchaure
8916916a03
fix: 'NoneType' object is not iterable
2019-10-28 13:00:18 +05:30
Jai Chavan
9f483c1fa9
fix: Spelling of Variance
2019-10-26 18:45:01 +05:30
Pranav Nachnekar
d5166861de
fix:setting incorrect field for party bank account
...
Previously
Corrected
2019-10-23 07:46:00 +00:00
Saurabh
48eff90d1f
fix: Don't show make jv button if equity or liability account and asset account not specified ( #19350 )
2019-10-21 16:03:28 +05:30
Nabin Hait
f2d37a7280
fix: Removed inter-company account filter for inter-company journal entry ( #19308 )
2019-10-21 13:36:47 +05:30
Nabin Hait
8232bd01d6
fix: Positive qty in sales return print ( #19310 )
2019-10-21 13:36:26 +05:30
deepeshgarg007
737ec6b26e
fix: Travis
2019-10-20 17:36:36 +05:30
Rohit Waghchaure
66072fec5a
fixed conflicts
2019-10-15 14:18:59 +05:30
ashish-greycube
cf24191fe5
feat: affiliate sales partner referral code and coupon code
2019-10-15 11:44:45 +05:30
ashish-greycube
74dc3c99de
feat: coupon_code and referral_sales_partner functionality
2019-10-15 11:44:45 +05:30
Saqib
66762380ed
fixes: internal issues ( #19201 )
...
* fix: Delivery Trip now has editable start address.
* fix: default party type not set in Journal Entry
* fix: maintainence visit purpose table not fetching item name
* fix: maintainence visit purpose table not fetching item name
2019-10-11 11:09:10 +05:30
Mangesh-Khairnar
1d781f13b2
fix: fetch allocated amount for individual invoice ( #19259 )
2019-10-11 11:06:11 +05:30
Deepesh Garg
2d064ee67a
fix: Remove bold property from disable checkbox ( #19280 )
2019-10-11 10:43:38 +05:30
Kenneth Sequeira
a54b7542f1
fix: sales invoice labels ( #19267 )
2019-10-10 18:50:39 +05:30
Faris Ansari
38ac7f7350
Enhancements to Supplier Portal ( #19221 )
...
* fix: Add Purchase Order to portal
* fix: Create Customer or Supplier on first login
Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.
* fix: Styling for transaction_row
* fix: Styling for RFQ page
* fix: Add Purchase Invoice route
- Make Purchase Invoice from PO
* fix: minor
- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Deepesh Garg
41a6548acb
fix: Label and dependes on fixes in Bank Account ( #19245 )
2019-10-04 16:22:00 +05:30
Deepesh Garg
894604201b
Merge pull request #19242 from thefalconx33/git-issues
...
fix: ‘EmployeeAdvance’ object has no attribute ‘conversion_rate’
2019-10-03 22:39:04 +05:30
thefalconx33
4723da0251
fix : #19239
2019-10-03 13:06:43 +05:30
Sahil Khan
c5a6e9da15
Merge branch 'develop' into version-12
2019-10-02 16:36:54 +05:30
Deepesh Garg
b54f0fb388
fix: Party column empty in accounts receivable/ payable summary ( #19205 )
2019-09-30 15:19:56 +05:30
Deepesh Garg
91aa671a23
Merge pull request #19137 from marination/invoice-discounting
...
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
2019-09-30 12:43:09 +05:30
Deepesh Garg
296bf9ef42
chore: Add standard chart of accounts template for El Salvador ( #19151 )
...
* chore: Add standard chart of accounts template for El Salvador
* fix: Renane template file
2019-09-30 11:02:49 +05:30
Rohan
e19e16fbf1
fix: remove internal fields from print ( #19101 )
2019-09-30 10:54:01 +05:30
Nabin Hait
2a10b02c68
Merge branch 'develop' into invoice-discounting
2019-09-30 10:10:50 +05:30
Himanshu
25ab1e41df
fix(Contact): mobile_no re-introduced and travis fixes ( #19009 )
...
* fix: mobile_no re-introduced
* fix: test cases
* fix: set email as primary
* fix: add primary email and phone
* fix: utils for contact creation
* chore: remove = from dict
2019-09-30 10:08:15 +05:30
Nabin Hait
001edb4464
refactor: Reposting utility of Stock ledger ( #19155 )
2019-09-26 16:44:35 +05:30
sahil28297
a9ff4f6688
fix(Report): Sales Register
2019-09-26 13:58:00 +05:30
Marica
54becbb33a
fix: Codacy fix(whitespaces)
2019-09-26 11:24:34 +05:30
marination
a877115ff4
fix: Minor changes
...
Added value in fetch from and removed client side code
2019-09-26 11:08:39 +05:30
marination
e7f67592a8
fix: Made outstanding amount field read only and added validation
...
Made the field editable so that outstanding amount can be adjusted
2019-09-26 10:58:02 +05:30
marination
ed004018d6
fix: Outstanding Amount field of Discounted Invoices Table in Invoice Discounting
...
It wrongly fetched grand total from sales invoice instead of outstanding amount.
2019-09-26 10:58:02 +05:30
Rucha Mahabal
132323462c
fix(Report): Sales Register ( #19166 )
2019-09-25 16:03:45 +05:30
Nabin Hait
2064dfc5a9
fix: Handling payments against credit/debit notes and party currency ( #19154 )
2019-09-24 19:52:33 +05:30
Mangesh-Khairnar
1e6e1dd451
enhancement(tds-monthly-payable): remove zero value transaction ( #19141 )
2019-09-24 19:46:06 +05:30
Rucha Mahabal
824376a045
fix(Journal Entry): Opening Entry not fetching accounts ( #19148 )
2019-09-24 19:13:55 +05:30
Deepesh Garg
d9e9d562f8
fix: Travis (develop) ( #19140 )
...
* fix: Travis
* fix: Syntax Error
2019-09-24 11:44:52 +05:30
Mangesh-Khairnar
5dcf2c669f
chore: remove unlinked letter head references ( #19138 )
2019-09-24 09:53:06 +05:30
Anurag Mishra
2c60f6419e
feat: missmatching amount in GST Sales report and itemised sales report ( #19116 )
2019-09-20 23:00:09 +05:30
Mangesh-Khairnar
a44e8afe71
feat: add bank account in payroll entry ( #19021 )
...
* fix(journal-entry): change fieldname from bank account no to bank account
* fix: add payroll entry in bank dashboard
* fix: fetch account from bank account
* fix: minor changes
* patch: check for bank account no column before updating
* fix: use rename field function
2019-09-20 18:19:47 +05:30
rohitwaghchaure
30f3354a7a
Merge pull request #19114 from marination/report-fix
...
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 19:01:05 +05:30
marination
8590112faa
fix: Report 'Payment Period based On Invoice Date'
2019-09-19 17:48:23 +05:30
rohitwaghchaure
d019d28bc9
fix: Customer Ledger Summary report not working on python 3 ( #19092 )
2019-09-17 18:45:59 +05:30
rohitwaghchaure
ad5fc07652
Merge pull request #19084 from rohitwaghchaure/offline_pos_currency_conversion_issue_for_v11
...
fix: plc conversion issue for offline pos
2019-09-17 13:24:41 +05:30
Rohit Waghchaure
094612dc02
fix: plc conversion issue for offline pos
2019-09-17 13:04:28 +05:30
Deepesh Garg
c5c3860c5c
fix: Mandatory accounting dimensions while creating asset depreciation entry ( #19073 )
...
* fix: Mandatory accounting dimensions while creating asset depreciation entry
* fix: Consider account types while assigning accounting dimensions
2019-09-17 12:50:28 +05:30
rohitwaghchaure
6de526ff42
fix: not able to change the account type in parent company account head ( #19083 )
2019-09-17 12:49:52 +05:30
Nabin Hait
b50b5095ad
fix: Added field disabled instead of enabled in cost center ( #19065 )
2019-09-16 19:44:37 +05:30
Mangesh-Khairnar
dce04b7335
fix: filter for payment order ( #19070 )
2019-09-16 19:40:27 +05:30
Sammish Thundiyil
a2a9b39794
modified: erpnext/accounts/doctype/account/account.json ( #19032 )
2019-09-16 13:29:25 +05:30
Nabin Hait
c2a9b14c96
fix: Invalid reference doctypes for accounting dimensions ( #19027 )
...
* fix: Invalid reference doctypes for accounting dimensions
* fix: Add server side validation for accounting doctypes
* fix: set fieldname and label before insert
2019-09-16 13:26:37 +05:30
rohitwaghchaure
87000977d5
Merge pull request #19061 from rohitwaghchaure/user_can_edit_rate_and_discount_in_offline_pos_develop
...
fix: user can able to change rate and discount even if they don't have permissions
2019-09-16 11:50:52 +05:30
Rohit Waghchaure
a9435cc6b0
fix: user can able to change rate and discount even if they don't have permission
2019-09-16 11:15:22 +05:30
rohitwaghchaure
4a323463f7
fix: for pos, paid amount has not considered the tax amount due to which outstanding amount showing for the pos invoices ( #19039 )
2019-09-13 18:36:57 +05:30
Nabin Hait
93a9c08116
fix: Allocate payment amount in reference table on change of payment amount ( #19041 )
2019-09-13 15:48:50 +05:30
Rucha Mahabal
72949e7f73
fix: share transfer validations for journal entry ( #19018 )
...
* fix share transfer validations for journal entry
* fix: share transfer test
* fix: tests
2019-09-13 11:05:40 +05:30
Nabin Hait
a5dfe0725f
fix: payment against shareholder ( #19019 )
2019-09-12 19:17:24 +05:30
Sammish Thundiyil
504e52ff46
refactor: cost center ( #19011 )
...
* modified: erpnext/accounts/doctype/cost_center/cost_center.json
* fix: removed unique property from cost_center_name
2019-09-12 13:48:41 +05:30
Nabin Hait
1d1858a8b0
Show draft future payments as well
2019-09-11 18:39:49 +05:30
Nabin Hait
ff09b412f4
feat: Allowed multiple payment requests against a reference document ( #18988 )
2019-09-11 12:43:27 +05:30
Nabin Hait
a035428d43
fix: handling of key does not exists error
2019-09-10 14:51:02 +05:30
Sahil Khan
d2315e5c5c
Merge branch 'develop' into version-12
2019-09-10 14:38:39 +05:30
Sammish Thundiyil
bcda12f4bb
modified: erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json ( #18829 )
2019-09-10 14:11:02 +05:30
Anurag Mishra
89d3bc0b54
fix: sales invoice return print format overideing the meta default print format
2019-09-09 15:58:25 +05:30
Prssanna Desai
ddfbb07c3b
fix: fix accounts balance timeline dashboard chart source ( #18942 )
...
* fix: fix accounts balance timeline dashboard chart source
* fix: pass chart_name to get function instead of chart object
2019-09-06 15:38:06 +05:30
Nabin Hait
4ce38059ac
feat: Company wise credit limit
2019-09-06 14:33:10 +05:30
Marica
a93b665427
fix: Print Format 'Point of Sale' removed from Sales invoice Print Format List ( #18937 )
...
'Point of Sale' Print Format for offline POS ,now doesn't appear in the Print Format Labels List in Sales Invoice for v12.
2019-09-05 18:26:45 +05:30
Nabin Hait
b847731482
Merge branch 'feat-customer-credit-limit' of https://github.com/Mangesh-Khairnar/erpnext into Mangesh-Khairnar-feat-customer-credit-limit
2019-09-05 16:47:08 +05:30
Nabin Hait
b5bd91417d
fix: Print/PDF of AR/AP report after refactoring ( #18931 )
2019-09-05 16:43:20 +05:30
Raffael Meyer
48d1463825
fix(CoA): SKR04 ( #18820 )
...
- move debitors into receivables
- move creditors into payables
- rename "C - Verb." to "C-Verbindlichkeiten" for consitency
- move "Erlösschmälerungen" into a root of type "Expense"
- move "Erhaltene Boni" and "Erhaltene Rabatte" into a root of type "Income"
2019-09-05 15:15:28 +05:30
hendrik
c257ce82c5
Party accounts if don't have default company ( #18771 )
...
Add check for get_default company
2019-09-05 15:14:09 +05:30
Nabin Hait
16a7ec95dc
fix: tax category is optional argument
2019-09-05 13:01:15 +05:30
Nabin Hait
b03fa8a441
Merge branch 'develop' into feat-customer-credit-limit
2019-09-05 12:34:34 +05:30
Nabin Hait
561a2e966e
Update accounts_receivable.py
2019-09-04 11:02:48 +05:30
rohitwaghchaure
a9b0c55bcb
Merge pull request #18914 from rohitwaghchaure/pos_search_item_not_working
...
fix: offline pos item search not working
2019-09-04 06:02:34 +05:30
Rohit Waghchaure
93bad51659
fix: offline pos item search not working
2019-09-03 23:29:41 +05:30
Rucha Mahabal
1e2dc2c8f1
feat: Employee Incentive and Retention Bonus added in Salary Slip (Additional Salary) ( #18647 )
...
* feat: employee incentive and retention bonus added in additional salary
* fix: added salary component field, logic improved
* fix: codacy review
2019-09-03 20:45:52 +05:30
Nabin Hait
1ab75db0ac
refactor: Accounts Receivable / Payable report ( #18906 )
2019-09-03 16:07:46 +05:30
Nabin Hait
e85c320501
Merge branch 'develop' into feat-customer-credit-limit
2019-09-03 14:20:17 +05:30
Deepesh Garg
c174e4d01a
fix: Default message from Payment Gateway Account not fetching ( #18848 )
2019-09-03 14:17:41 +05:30
Mangesh-Khairnar
4bcc221ee3
Merge branch 'develop' of https://github.com/frappe/erpnext into feat-customer-credit-limit
2019-09-02 23:18:56 +05:30
deepeshgarg007
402d82b4c5
fix: Remove delete_doc from tests
2019-09-02 14:37:18 +05:30
Himanshu Warekar
711d1acffd
fix: remove references of mobile_no
2019-09-02 13:31:10 +05:30
Himanshu Warekar
81472e4c08
Merge branch 'contacts-ref' of https://github.com/hrwx/erpnext into contacts-ref
2019-09-02 13:21:29 +05:30
Himanshu Warekar
b8f23c2657
fix: fix query for contacts
2019-09-02 13:20:27 +05:30
Suraj Shetty
4a8710ef75
Merge pull request #18611 from surajshetty3416/fix-paid-amount
...
fix: Paid amount 0 while creating advanced payment entry
2019-09-02 08:38:34 +05:30
Mangesh-Khairnar
79525327f0
feat: bypass credit limit check
2019-08-29 19:50:23 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings ( #18825 )
2019-08-23 16:32:58 +05:30
Mangesh-Khairnar
fe579c2efd
fix: show a descriptive message on submission of duplicate account ( #18486 )
...
* fix: show a descriptive message on submission of duplicate account
* Update account.py
2019-08-23 16:31:20 +05:30
Mangesh-Khairnar
d94a389dd3
chore: remove unwanted code ( #18645 )
2019-08-23 16:31:09 +05:30
Nabin Hait
6e7b9b5cb7
Update sales_invoice.py
2019-08-23 12:27:05 +05:30
Anurag Mishra
db88476f8b
feat: refactor invoice_discounting ( #18629 )
...
* feat: refactor invoice_discountig
* Update invoice_discounting.py
* Update invoice_discounting.js
2019-08-23 11:27:00 +05:30
rohitwaghchaure
88ee7d8dbe
fix: POS Sync Issue ( #18807 )
2019-08-23 11:13:58 +05:30
Suraj Shetty
6689ed543a
Merge branch 'develop' into fix-paid-amount
2019-08-23 10:42:23 +05:30
rohitwaghchaure
224d857928
Merge pull request #18703 from rohitwaghchaure/reconciled_entry_still_has_no_clearance_date_develop
...
fix: reconciled entry has not clearance date set
2019-08-21 23:36:06 +05:30
rohitwaghchaure
a23fc327df
Merge pull request #18785 from rohitwaghchaure/payment_recon_for_debit_entry_not_working_properly_develop
...
fix: debit note not reconciled with another purchase invoice using pa…
2019-08-21 23:35:35 +05:30
Anastes Mp
a6c6e02c49
Incorrect database table ( #18558 )
...
Fixed Unknow Column tax_type error on offline pos
2019-08-21 16:53:06 +05:30
Nabin Hait
bcb0f6038e
fix: Single gl entry should only be considered once either in opening or closing entry ( #18792 )
2019-08-21 14:47:33 +05:30
Sahil Khan
5f2c030ddc
Merge branch 'version-12-hotfix' into merge_v12_hotfix_1
2019-08-20 16:22:49 +05:30
rohitwaghchaure
16dda1a991
fix: group by voucher consolidated showing incorrect data for deferred entries ( #18779 )
2019-08-20 12:37:32 +05:30
rohitwaghchaure
d5b4b1fdaf
fix: group by voucher consolidated showing incorrect data for deferred entries ( #18777 )
2019-08-20 12:35:15 +05:30
Mangesh-Khairnar
c97a7fb845
fix: restrict the payment order to non received type payment entries
2019-08-20 00:27:43 +05:30
Rohit Waghchaure
1008e6e450
fix: debit note not reconciled with another purchase invoice using payment reconciliation
2019-08-19 20:27:15 +05:30
Mangesh-Khairnar
4645727163
Merge branch 'develop' into fix-payment-order
2019-08-19 16:29:30 +05:30
Deepesh Garg
960a1cbd8f
fix: Party dashboard heatmap not capturing sales, purchase and other activities ( #18753 )
2019-08-19 11:51:16 +05:30
Anurag Mishra
bc5712a1b3
fix: validated cost center in financial_statement ( #18733 )
...
* fix: validated cost center in financial_statement
* Update financial_statements.py
2019-08-19 10:24:44 +05:30
Deepesh Garg
77ec3cf402
Merge pull request #18757 from deepeshgarg007/accounting_dimension_fix
...
fix: Default dimensions in child doctypes
2019-08-16 17:27:14 +05:30
deepeshgarg007
42d9298318
fix: Remove extra space
2019-08-16 13:06:47 +05:30
Mangesh-Khairnar
4b71d9ca9f
Merge branch 'develop' into fix-payment-order
2019-08-16 12:42:26 +05:30
deepeshgarg007
2fb6bc9867
fix: Default dimensions in child doctypes
2019-08-15 17:06:32 +05:30
Deepesh Garg
98a6e5cb6c
Merge pull request #18742 from rohitwaghchaure/incorrect_sequnce_between_name_and_contact
...
fix: sequence of customer name and contact in the AR report
2019-08-14 23:20:55 +05:30
Rohit Waghchaure
c5d41af10f
fix: sequence of customer name and contact in the AR report
2019-08-14 18:49:19 +05:30
Mangesh-Khairnar
dbb44c8950
fix: restrict the payment order to non received type payment entries
2019-08-14 17:38:44 +05:30
Anurag Mishra
78690d7b8b
fix:payment ammount validation for pos invoices ( #18663 )
2019-08-14 15:03:58 +05:30
Deepesh Garg
2c5dcbe819
fix: Error handling in payment entry ( #18720 )
2019-08-14 14:26:37 +05:30
rohitwaghchaure
4d7a0aaee1
Merge pull request #18705 from surajshetty3416/fix-payment-entry-account-permission
...
fix: Check if account passed is accessible under Payment Entry
2019-08-13 18:37:17 +05:30
Anurag Mishra
d2f13fe0a6
fix: query ( #18709 )
2019-08-13 13:19:24 +05:30
Suraj Shetty
469e430d38
Merge branch 'fix-payment-entry-account-permission' of github.com:surajshetty3416/erpnext into fix-payment-entry-account-permission
2019-08-13 12:12:03 +05:30
Suraj Shetty
64a962ce97
fix: Re-organise code
2019-08-13 12:10:00 +05:30
Suraj Shetty
1a2600c9ea
fix: Ignore account permission check
2019-08-13 12:09:06 +05:30
Suraj Shetty
bd2e7c0e53
fix: Comment description
2019-08-12 16:32:14 +05:30
Suraj Shetty
3234f0d299
fix: Check if account passed is accessible under Payment Entry
2019-08-12 16:18:36 +05:30
Rohit Waghchaure
fb23773935
fix: reconciled entry has not clearance date set
2019-08-12 15:35:19 +05:30
Deepesh Garg
0b711d1f8a
Merge pull request #18684 from marination/fixes_v12
...
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-10 17:26:54 +05:30
marination
9839a9afb0
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-09 15:54:18 +05:30
marination
4583100537
fix: Fixed error message in Payment Entry for outstanding invoices not found via filters
2019-08-09 15:30:05 +05:30
rohitwaghchaure
536e6bf57c
fix: group by condition in the payment reconciliation ( #18657 )
2019-08-08 17:40:57 +05:30
Mangesh-Khairnar
f3a5188bec
fix: accounting period ( #18477 )
...
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
2019-08-08 17:39:13 +05:30
Deepesh Garg
f2bf76a2ef
fix: Show Cr or Dr symbol in chart of accounts based on balance ( #18653 )
...
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
2019-08-08 15:52:39 +05:30
Deepesh Garg
f729eed035
fix: Show Cr or Dr symbol in chart of accounts based on balance ( #18654 )
...
* fix: Show Cr or Dr symbol in chart of accounts based on balance
* fix: Typo fix in comment
2019-08-08 15:52:25 +05:30
Deepesh Garg
065e8f3650
fix: Changes in print format due to attribute name changes in frappe ( #18639 )
2019-08-08 15:51:56 +05:30
Deepesh Garg
04b42600b0
fix: Changes in print format due to attribute name changes in frappe ( #18641 )
2019-08-08 15:51:50 +05:30
Mangesh-Khairnar
e5c733bdb3
fix: Accounting period ( #18630 )
...
* fix: accounting period
* test: accounting period
* fix: account period creation
* fix: remove status field from accounting period
2019-08-08 15:44:11 +05:30
Suraj Shetty
0c699f0726
fix: Paid amount 0 while creating advanced payment entry
...
Paid amount is set 0 while creating advanced payment entry
against multi-currency purchase order.
Solution: Populate paid amount value after applying conversion rate
2019-08-07 10:17:05 +05:30
Deepesh Garg
235166ec41
Merge pull request #18592 from deepeshgarg007/utils_fix_v12
...
fix: Ambigious column in query
2019-08-05 22:38:45 +05:30
Deepesh Garg
e4abaa7cdd
Merge pull request #18591 from deepeshgarg007/utils_fix_develop
...
fix: Ambigious column in query
2019-08-05 14:45:30 +05:30
deepeshgarg007
23f30cdb8b
fix: Aambigious column in query
2019-08-05 12:42:35 +05:30
deepeshgarg007
043f70e9a6
fix: Aambigious column in query
2019-08-05 12:40:50 +05:30
Anurag Mishra
08df6bda41
fix: query ( #18468 )
2019-08-05 10:27:25 +05:30
Anurag Mishra
7e1987ed48
feat: validate cwip accounts for journal Entry ( #18518 )
2019-08-05 10:18:57 +05:30
Anurag Mishra
f9fb92ebb0
feat: validate cwip accoutns in journal entry ( #18519 )
2019-08-05 10:18:37 +05:30
deepeshgarg007
a499079250
fix: Remove non standard fieldname
2019-08-03 10:27:33 +05:30
deepeshgarg007
75465775b4
Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into error_report_v12
2019-08-03 10:26:46 +05:30
deepeshgarg007
b0916a35dc
fix: Remove payment order from bank dashboard
2019-08-03 10:24:04 +05:30
deepeshgarg007
93e46310b8
fix: Remove payment order from bank dashboard
2019-08-03 10:17:44 +05:30
Sahil Khan
8426ff726a
Merge branch 'version-12-hotfix' into version-12
2019-08-02 14:27:59 +05:30
deepeshgarg007
c16ef32b6b
fix: Payment Order link fix in bank dashboard
2019-08-01 14:10:03 +05:30
deepeshgarg007
8704bc6f39
fix: Payment Order link fix in bank dashboard
2019-08-01 13:24:48 +05:30
Deepesh Garg
d301d26fda
fix: Enhancement in credit note ( #18511 )
...
* fix: Credit note enhancement
* Fix: Print format for Sales Invoice Return
* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:19 +05:30
Deepesh Garg
b65c761b16
fix: Enhancement in credit note ( #18510 )
...
* fix: Credit note enhancement
* Fix: Print format for Sales Invoice Return
* fix: Zero quantity validation fix for credit note
2019-07-31 15:58:01 +05:30
deepeshgarg007
107c07e5cb
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 15:01:22 +05:30
deepeshgarg007
4c652396d0
fix: Opening balance not getting calculated in trail_balance_report
2019-07-29 14:57:33 +05:30
deepeshgarg007
f37fb82069
fix: Code cleanup
2019-07-29 12:14:49 +05:30
deepeshgarg007
724be6eca2
fix: GL entry validation fix
2019-07-29 12:14:49 +05:30
deepeshgarg007
82661372f7
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-29 12:14:49 +05:30
deepeshgarg007
3d15128b91
fix: Test cases for accounting dimensions
2019-07-29 12:14:49 +05:30
deepeshgarg007
1c1f6f90bb
fix: Test Cases for accounting dimensions
2019-07-29 12:14:49 +05:30
deepeshgarg007
5dfe4df23b
fix: Set query fix
2019-07-29 12:14:49 +05:30
deepeshgarg007
22a4857a3c
fix: Codacy Fixes
2019-07-29 12:14:49 +05:30
deepeshgarg007
f1f79ff1e1
fix: Remove dimensions from boot
2019-07-29 12:14:49 +05:30
deepeshgarg007
7d270edf79
fix: Added default dimension and filter in bootinfo
2019-07-29 12:14:49 +05:30
deepeshgarg007
b590f89310
fix: Default Accounting Dimensions in doctypes
2019-07-29 12:14:49 +05:30
rohitwaghchaure
8c8b1f2da6
Merge pull request #18463 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field_v12
...
fix: multi currency bank reconciliation issue
2019-07-29 11:40:40 +05:30
deepeshgarg007
ec421df4e4
fix: Code cleanup
2019-07-29 08:58:56 +05:30
deepeshgarg007
a65ad10c62
fix: GL entry validation fix
2019-07-27 19:06:36 +05:30
deepeshgarg007
4fce891241
Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension
2019-07-27 18:11:34 +05:30
Aditya Hase
dc4452ffe3
perf(travis): Faster builds ( #18491 )
...
perf(travis): Faster builds
2019-07-26 13:44:05 +05:30
Deepesh Garg
c391d65dc3
Merge pull request #18488 from adityahase/faster
...
perf(travis): Faster builds
2019-07-26 12:41:01 +05:30
rohitwaghchaure
ad89b029c2
Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:13:27 +05:30
rohitwaghchaure
a312f19fab
Merge pull request #18493 from netchampfaris/parent-account-child-account-currency
...
fix(Account): Pass parent currency to child currency
2019-07-26 12:12:15 +05:30
deepeshgarg007
dda6b5cd53
fix: Add accounting dimensions to subscription and opening invoice tool
2019-07-26 09:14:42 +05:30
deepeshgarg007
aa92df4ddc
fix: Test cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
0ce2afc9bc
fix: Test Cases for accounting dimensions
2019-07-26 09:14:42 +05:30
deepeshgarg007
41a1cd954c
fix: Set query fix
2019-07-26 09:14:42 +05:30
deepeshgarg007
b124aff0bb
fix: Codacy Fixes
2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671
fix: Remove dimensions from boot
2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013
fix: Added default dimension and filter in bootinfo
2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4
fix: Default Accounting Dimensions in doctypes
2019-07-26 09:14:42 +05:30
Faris Ansari
0ec747f57c
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:55:34 +05:30
Faris Ansari
6998412990
fix(Account): Pass parent currency to child currency
...
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
2019-07-26 08:15:45 +05:30
Aditya Hase
0d333894c9
perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown
2019-07-26 05:54:04 +05:30
Aditya Hase
6a5b7f751c
perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown
2019-07-26 00:23:13 +05:30
deepeshgarg007
f56284b0c1
Dynamic link issue fix in Bank reconciliation statement
2019-07-25 12:47:32 +05:30
deepeshgarg007
53dc0c52ca
Dynamic link issue fix in Bank reconciliation statement
2019-07-25 12:44:50 +05:30
Rohit Waghchaure
6d0c6a17d9
fix: multi currency bank reco issue
2019-07-24 12:48:06 +05:30
Rushin Parikh
40240b7d96
fix: filter reference name by cost center in journal entry account ( #17948 )
...
* fix: filter reference name by cost center in journal entry account if reference_type is Sales Invoice or Purchase Invoice
* Update journal_entry.js
2019-07-22 11:54:26 +05:30
Mangesh-Khairnar
0bbfca8142
fix: payment document link fix ( #18301 )
2019-07-22 11:49:18 +05:30
Mangesh-Khairnar
64c780e8c7
fix: update percentage on creation of invoice for zero amt transaction ( #18382 )
2019-07-22 11:28:58 +05:30
Saurabh
90d7a8888f
fix: pass missing argument while generating consolidated financial statement for cash flow type ( #18398 )
2019-07-22 11:22:34 +05:30
Aditya Hase
dc42cc3998
fix(sales-invoice): Use orm instead of frappe.db.sql ( #18434 )
2019-07-22 11:19:07 +05:30
crescent28
b978c9173d
fix: added null check for filters ( #18416 )
...
filters when None, at `filters.get("outstanding_amt_greater_than")` would result in an Attribute Error. This PR just adds a simple null-check in the if conditions. I'm awesome!
Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>
2019-07-22 11:13:27 +05:30
Rohit Waghchaure
93b7ece8b0
fix: disable field's fieldtype changed from data to check
2019-07-21 00:02:09 +05:30
deepeshgarg007
2ddbebfae0
fix: Condition fix
2019-07-20 14:52:59 +05:30
deepeshgarg007
e097d4f470
fix: Assignment fix
2019-07-20 14:49:32 +05:30
deepeshgarg007
1ee3d040a1
fix: Condition fix in get_balance_on function
2019-07-20 14:46:59 +05:30
rohitwaghchaure
8fedf53304
Merge pull request #18379 from rohitwaghchaure/pos_fixed_address_and_taxes_and_charges_not_set_as_per_profile
...
fix: address and taxes not set as per pos profile in the pos invoice
2019-07-19 08:00:33 +05:30
Anurag Mishra
0e23307dbf
fix: handled value Error ( #18361 )
2019-07-18 12:43:18 +05:30
rohitwaghchaure
6349f61882
Merge pull request #18385 from rohitwaghchaure/offline_pos_syncing_issue_for_customer_develop
...
fix: offline pos syncing issue for customer
2019-07-17 21:37:55 +05:30
Rohit Waghchaure
438efb4008
fix: cost center not able to access
2019-07-17 21:21:58 +05:30
Rohit Waghchaure
0851c94e9b
fix: offline pos syncing issue for customer
2019-07-17 20:36:33 +05:30
Rohit Waghchaure
dcf2d3532e
fix: address and taxes not set as per pos profile in the pos invoice
2019-07-17 19:28:36 +05:30
Deepesh Garg
902e5ab744
Merge branch 'develop' into ac_dim_usability_fixes
2019-07-16 16:17:07 +05:30
Mangesh-Khairnar
b560050334
fix(payment-entry):remove unused argument
2019-07-16 12:11:44 +05:30
Deepesh Garg
8c21703959
fix: Fixes in get_balance_on function ( #18324 )
2019-07-16 09:41:01 +05:30
Deepesh Garg
8fcd426dab
Merge pull request #18350 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary_develop
...
feat: added payment terms filter in the accounts payable summary
2019-07-16 08:39:30 +05:30
deepeshgarg007
af6c09ae09
fix: Codacy
2019-07-16 08:33:13 +05:30
Rohit Waghchaure
4c0dffe687
feat: added payment terms filter in the accounts payable summary
2019-07-16 02:00:41 +05:30
Deepesh Garg
322053ee1b
Merge pull request #18136 from nabinhait/inv-disc-improvements
...
fix: set invoice status considering invoice discounting
2019-07-15 18:53:30 +05:30
deepeshgarg007
84d1e12f34
fix: Typo
2019-07-15 18:42:22 +05:30
deepeshgarg007
2093ffc15b
fix: Usability fixes in accountng dimensions
2019-07-15 18:21:05 +05:30
Nabin Hait
868766ddf0
refactor: Refactored over delivery/receipt/billing fields ( #17788 )
...
* refact: Refactored over delivery/receipt/billing fields
* fix: test case
2019-07-15 18:02:58 +05:30
deepeshgarg007
1cc46c06b0
Merge branch develop into ac_dim_usability_fixes
2019-07-15 15:34:40 +05:30
Nabin Hait
d83e39d0ac
Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements
2019-07-15 13:56:29 +05:30
Nabin Hait
5435b7e9eb
fix: Null issue
2019-07-15 13:56:09 +05:30
deepeshgarg007
a85db66146
fix: Usability fixes in accounting dimensions
2019-07-14 18:15:19 +05:30
rohitwaghchaure
3643d67249
Merge pull request #18023 from fproldan/fix_by_voucher_order_develop
...
fix: General Ledger Group by Voucher not ordering by posting_date for develop
2019-07-14 17:23:54 +05:30
rohitwaghchaure
f414c8945f
Merge pull request #18295 from rohitwaghchaure/fixed_dr_cr_issue_account_tree
...
fix: Dr / Cr label for balance of the ledgers in the account tree
2019-07-14 17:00:58 +05:30
deepeshgarg007
5ea542b08b
fix: Do not show Project, Cost Center and Accounting Dimension in ref doc
2019-07-13 11:39:32 +05:30
Rohit Waghchaure
8412f847d4
fix: dr / cr label for balance of the ledgers in the account tree
2019-07-12 15:44:58 +05:30
Deepesh Garg
ed9ac14f70
fix: Usability fixes for chart of Accounts Importer ( #18285 )
...
* fix: Usablity fixes for chart of Accounts Importer
* fix: Provide Row no with error messages
2019-07-12 14:47:00 +05:30
Deepesh Garg
91417646b1
Fix: Add fieldtype as currency
2019-07-12 12:24:05 +05:30
Shivam Mishra
020f405367
Merge branch 'develop' into cash-flow-chart
2019-07-11 10:12:45 +05:30
Mangesh-Khairnar
bfcc84789f
fix(sales-invoice): get items from quotation ( #18237 )
2019-07-11 10:04:46 +05:30
deepeshgarg007
285701d9f1
fix: Add missing Cost Center filter in cash flow statement
2019-07-10 22:22:14 +05:30
Shivam Mishra
f2f1e81a3f
feat: added chart to cash-flow report
2019-07-10 20:28:52 +05:30
Don-Leopardo
365a572073
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-10 10:52:59 -03:00
Suraj Shetty
61d8088be4
fix: Return fieldtype so that the client-side can format chart values ( #18211 )
2019-07-10 17:05:25 +05:30
Mangesh-Khairnar
3d28c065db
fix(exchange-rate-revaluation): change create to view button on creation of journal entry ( #18201 )
2019-07-10 17:03:23 +05:30
Suraj Shetty
bef897602d
fix: Use db_set since it triggers on_update event ( #18175 )
2019-07-08 10:30:26 +05:30
Deepesh Garg
6252c0490a
Merge pull request #18194 from deepeshgarg007/dimensions_reports
...
fix: Add accounting dimensions to various reports and fixes
2019-07-07 22:40:57 +05:30
deepeshgarg007
6bb5ade667
fix: Add accounting dimensions to various reports and fixes
2019-07-07 21:24:45 +05:30
Mangesh-Khairnar
48d61fb072
Merge branch 'develop' into handle_large_outstanding_invoices_code_refactored
2019-07-07 20:17:07 +05:30
rohitwaghchaure
8a054e4b36
Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry
...
feat: provision to make debit / credit note against the stock returned entry
2019-07-07 00:51:46 +05:30
rohitwaghchaure
d8196ced76
Merge pull request #18179 from rohitwaghchaure/income_booked_for_deferred_debit_and_credit_note_develop
...
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 17:28:50 +05:30
Rohit Waghchaure
5d4d70b75f
feat: provision to make debit / credit note against the stock returned entry
2019-07-05 17:06:25 +05:30
Rohit Waghchaure
909d773462
fix: on credit note / debit note deferred reversed instead of income
2019-07-05 15:12:14 +05:30
Rohit Waghchaure
0f065d5de1
Added due date in the gl entry
2019-07-05 14:54:15 +05:30
Rohit Waghchaure
2f3f7507c4
fix: browser hangs while making payment entry for large number of outstaning invoices
2019-07-05 14:38:46 +05:30
karthikeyan5
7fc6021ca5
feat(setup): adding selling buying filter in terms and conditions
2019-07-04 22:46:16 +05:30
Nabin Hait
7b684a01d3
fix: merge conflict
2019-07-04 12:06:50 +05:30
Deepesh Garg
a37c51f93e
Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions
...
fix: Add filters for accounting dimensions in trial balance report
2019-07-03 22:00:25 +05:30
rohitwaghchaure
465196b0c7
Merge pull request #18155 from scmmishra/accounts-rec-report
...
fix: format values for charts
2019-07-03 19:26:08 +05:30
Shivam Mishra
bb02c5105e
fix: format values for charts
2019-07-03 19:22:21 +05:30
deepeshgarg007
58b4644c1a
fix: Add filtesr for accounting dimensions in trial balance report
2019-07-03 18:08:41 +05:30
Don-Leopardo
85e2fd965a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-03 08:15:08 -03:00
Deepesh Garg
af4f7b4ea1
Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
2019-07-03 16:31:48 +05:30
Deepesh Garg
55fbddbee6
Add missing semicolon
2019-07-03 16:31:06 +05:30
Anurag Mishra
841d852f41
refactor: added missing translation functions ( #18143 )
...
* fix: Translating Error and Messages
* Update erpnext/controllers/item_variant.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
* Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>
2019-07-03 15:15:08 +05:30
Deepesh Garg
824ad34270
Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss
2019-07-03 13:28:49 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch ( #17997 )
...
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
2019-07-03 10:34:31 +05:30
Don-Leopardo
46b21f88e1
Merge branch 'develop' into fix_by_voucher_order_develop
2019-07-02 14:03:45 -03:00
Nabin Hait
05fee62314
fix: inv status
2019-07-02 17:55:26 +05:30
Nabin Hait
126a02e208
fix: set invoice status considering invoice discounting
2019-07-02 15:28:57 +05:30
rohitwaghchaure
f949c5ddf7
Merge pull request #18104 from rohitwaghchaure/incorrect_value_of_accumualated_depreciation_in_the_sales_invoice_develop
...
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-02 01:23:56 +05:30
Rohit Waghchaure
8847ecfe25
fix: incorrect value booked in the accumulated depreciation account on sell of the asset
2019-07-01 20:47:35 +05:30
Rohit Waghchaure
2fa6224f8f
fix: accounts receivable / payable not working if the company is not seletced in filter
2019-07-01 11:55:12 +05:30
rohitwaghchaure
4c2eb0f13b
Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop
...
fix: finance book filters includes the gl data which don't have finance book
2019-06-29 15:06:34 +05:30
Don-Leopardo
b2b5c3ac0a
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-28 19:36:25 -03:00
Mangesh-Khairnar
4000fb5bb8
fix: add a more descriptive message when no records are found ( #18082 )
...
* fix: add a more descriptive message when no records are found
* fix: translation by passing string to translation function
2019-06-28 12:38:40 +05:30
Don-Leopardo
c3f6bed650
Merge branch 'develop' into fix_by_voucher_order_develop
2019-06-27 18:09:19 -03:00
Faris Ansari
fbc861320f
fix: Don't append None values in against_account ( #18031 )
2019-06-26 13:31:31 +05:30
Nabin Hait
40d25f4010
fix: Show close button if per_ordered is less than 99.999999 ( #18067 )
2019-06-26 10:57:45 +05:30
Rohit Waghchaure
a2408a63da
feat: payment reconciliation enhancements
2019-06-24 02:11:51 +05:30
NahuelOperto
4448e2d66b
fix order in general ledger
2019-06-21 08:50:37 -03:00
Aditya Hase
bb5ca5a01f
fix(py3): Convert filter to list
2019-06-20 20:10:53 +05:30
Faris Ansari
2632107129
fix: User MultiSelectList control for Party filter ( #17943 )
...
* fix: User MultiSelectList control for Party filter
The comma based filter wouldn't work for values that had comma in them
* fix: Replace with MultiSelectList in reports
* fix: Parse json instead of string split
2019-06-19 12:15:37 +05:30
Rohit Waghchaure
5f9793e081
fix: finance book filters includes the gl data which don't have finance book
2019-06-18 21:09:52 +05:30
rohitwaghchaure
226ff5a797
Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop
...
fix: bank guarantee, not able to select the purchase order
2019-06-18 11:31:01 +05:30
Rohit Waghchaure
4803e817e9
fix: bank guarantee, not able to select the purchase order
2019-06-17 17:40:40 +05:30
Rushabh Mehta
803f784351
fix(minor): format date in user format for accounting dashboard
2019-06-17 17:33:24 +05:30
Rohit Waghchaure
b821af44b6
fix: revert group by voucher general ledger changes
2019-06-17 07:42:53 +05:30
rohitwaghchaure
a030138df8
fix: trial balance opening balance not showing in the debit side for the liability account ( #17944 )
2019-06-14 11:57:14 +05:30
Anurag Mishra
122cdaf87b
fix: column width ( #17935 )
2019-06-14 11:29:18 +05:30
rohitwaghchaure
da0d056a06
Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation
...
feat: added cost center in the opening invoice creation tool
2019-06-13 16:27:18 +05:30
Rohit Waghchaure
033ed93586
fix: taxes are not overriding after changing the taxes template
2019-06-13 15:47:42 +05:30
Rohit Waghchaure
02ae934d5c
feat: added cost center in the opening invoice creation tool
2019-06-13 12:00:30 +05:30
Rushabh Mehta
26dba8bb89
Merge pull request #17801 from deepeshgarg007/dashboards
...
fix: Dashboards for doctypes in accounts module
2019-06-12 17:15:58 +05:30
Anurag Mishra
ff99cea1c4
Merge branch 'develop' into report_trial_balance_fix
2019-06-11 14:17:54 +05:30
rohitwaghchaure
ba715feb7f
Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop
...
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-11 11:39:48 +05:30
Anurag Mishra
0ef811d92d
Merge branch 'develop' into report_trial_balance_fix
2019-06-11 11:14:02 +05:30
Anurag Mishra
acae7a903b
fix: requested changes
2019-06-11 11:12:28 +05:30
Rohit Waghchaure
ef5dd87928
fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)
2019-06-10 18:34:18 +05:30
rohitwaghchaure
3199f695aa
Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop
...
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:16:59 +05:30
Rohit Waghchaure
5f41a3333b
fix: accounts receivable for PDC not showing 120 days column
2019-06-10 18:15:43 +05:30
Deepesh Garg
ebeafa55ca
fix: Total Amount fix in journal entry ( #17880 )
2019-06-10 17:42:52 +05:30
Rohit Waghchaure
3cf24366a9
feat: provision to set multiple manufacturer in the item master
2019-06-06 19:53:32 +05:30
Anurag Mishra
fd19678bc7
fix: show cost center in print fromat of report trial balance
2019-06-06 18:37:10 +05:30
Prasann Shah
829172c267
[Add] GSTIN filters in hsn wise summary and itemised reports
2019-06-06 12:08:09 +05:30
Nabin Hait
68eaaa068b
fix: Removed unwanted total row from financial statement and general ledger print ( #17860 )
2019-06-05 20:29:24 +05:30
Aditya Hase
811bed32c1
fix(naming): Limit number of docs to be renamed to 50000 per doctype ( #17827 )
...
If total docs to be renamed goes over 100000 then the total number of
writes exceed 200000 and check_transaction_status (database.py)
raises a Validation Error
This causes failure in the job being executed currently and every single job
triggered afterwards.
2019-06-05 10:26:26 +05:30
Mangesh-Khairnar
da2e009990
fix(payment-order): filter already created payment entries ( #17843 )
2019-06-05 10:22:05 +05:30
deepeshgarg007
1831844fcf
fix: Dashboard for cost center
2019-06-03 21:53:58 +05:30
Rohit Waghchaure
8309582cca
fix: report Payment Period Based On Invoice Date not working
2019-06-03 18:23:54 +05:30
deepeshgarg007
290847df46
fix: Fixes in accounting doctype dashboards
2019-06-02 19:35:18 +05:30
deepeshgarg007
6d313c72e1
fix: Remove diemnsion from value list if present
2019-06-01 23:26:42 +05:30
deepeshgarg007
55b894bfef
Merge branch develop into dimensions
2019-06-01 23:13:36 +05:30
deepeshgarg007
223225e785
fix: Update function name
2019-06-01 23:09:04 +05:30
deepeshgarg007
ce15591872
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-06-01 22:57:51 +05:30
Deepesh Garg
25857d6ee3
Merge pull request #17816 from deepeshgarg007/ar_translations_develop
...
fix: Add translations for missing labels in AR report
2019-05-31 12:37:36 +05:30
Rohit Waghchaure
840244c562
fix: pricing rule is applying on the incorrect item
2019-05-31 12:16:35 +05:30
deepeshgarg007
480586152b
fix: Label translations
2019-05-30 22:34:00 +05:30
deepeshgarg007
da2e456f70
fix: Add translations for missing labels in AR report
2019-05-30 22:30:32 +05:30
Rohit Waghchaure
ac8f4b449d
fix: pricing rule not exists issue
2019-05-30 22:24:24 +05:30
deepeshgarg007
52ea2874ec
fix: Multiple fixes in accounting dimensions
2019-05-30 22:09:36 +05:30
deepeshgarg007
a9b2e4e4a8
fix: White space in subscription plan dashboard
2019-05-30 12:18:10 +05:30
deepeshgarg007
e233708754
fix: Tax category dashboard
2019-05-30 12:14:16 +05:30
deepeshgarg007
4baf69656d
Merge branch 'develop' of https://github.com/frappe/erpnext into dashboards
2019-05-30 11:54:31 +05:30
deepeshgarg007
8f3a6c1596
fix: Dashboards for doctypes in accounting modules
2019-05-30 11:53:12 +05:30
deepeshgarg007
c97c7c51a9
fix: Test cases for accounting dimension
2019-05-28 18:51:10 +05:30
deepeshgarg007
233b88dc52
fix: Test case fixes
2019-05-28 17:58:22 +05:30
deepeshgarg007
ffec8be85f
fix: Styling and test case fixes
2019-05-28 17:56:07 +05:30
deepeshgarg007
a8cb00f31f
fix: Styling and test case fixes
2019-05-28 16:03:08 +05:30
deepeshgarg007
adccb2c3a4
fix: Remove print statements
2019-05-28 12:24:28 +05:30
deepeshgarg007
acc2422167
Merge branch develop into dimensions
2019-05-28 12:18:32 +05:30
deepeshgarg007
f5b6ee9ae7
fix: Multiple fixes in accounting doctype
2019-05-28 12:15:56 +05:30
deepeshgarg007
7dfffb5f73
fix: Updated test cases for accounting dimensions
2019-05-28 12:09:45 +05:30
Nabin Hait
60f04d181d
Merge pull request #17756 from nabinhait/property-decorator
...
fix(subscription): Remove property decorator (#17395 )
2019-05-27 19:11:17 +05:30
Joe Paul
4a8ed90255
fix(subscription): Remove property decorator ( #17395 )
2019-05-27 14:14:26 +05:30
Kenneth Sequeira
a29ed40ad3
fix: Improve error message ( #17747 )
...
Change ```Allocated amount can not greater than unadjusted amount``` to ```Allocated amount cannot be greater than unadjusted amount```
```Allocated amount can not be negative``` to ```Allocated amount cannot be negative```
2019-05-27 11:47:07 +05:30
Nabin Hait
5cd04a6d30
fix: payment reconciliation against expense claim ( #17729 )
...
* fix: payment reconciliation against expense claim
* feat: Added dashboard for expense claim
2019-05-27 11:44:06 +05:30
deepeshgarg007
e9c6e644f7
fix: Multiple changes in dimension creation logic
2019-05-26 12:34:13 +05:30
deepeshgarg007
6f6636abfe
fix: Add dimension section in multiple doctypes
2019-05-26 12:31:01 +05:30
deepeshgarg007
d330519f7c
fix: Merge branch develop into dimensions
2019-05-25 18:18:08 +05:30
Rushabh Mehta
2d7993592f
Merge pull request #17703 from rmehta/yeah-form-js
...
refactor: deprecate old API as per https://github.com/frappe/frappe/pull/7537
2019-05-24 11:36:16 +05:30
rohitwaghchaure
0c2e3c77a3
fix: range 4 for ageing filter added in the AP/AR report ( #17715 )
2019-05-23 15:27:47 +05:30
Saurabh
ba04c3e5bb
fix: table name alias ( #17706 )
2019-05-23 14:16:56 +05:30
deepeshgarg007
7de05ae8f3
fix: Dashboards for doctypes in accounting module
2019-05-23 11:29:39 +05:30
Rushabh Mehta
04e89ce808
refactor: deprecate old API
2019-05-22 16:52:36 +05:30
deepeshgarg007
ff717a7c16
fix: List view button for dimensions
2019-05-20 18:35:38 +05:30
Deepesh Garg
9982576ea6
Merge pull request #17678 from rohitwaghchaure/show_opening_entries_gl_report_v12
...
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 15:20:53 +05:30
Himanshu
29d4ae6716
feat(Communication): Move Timeline DocType and Name to Dynamic Links ( #17593 )
...
* fix: ambigious error
2019-05-20 15:14:07 +05:30
Faris Ansari
a1f31e8444
feat(regional): Bank remittance report ( #17524 )
...
feat(regional): Bank remittance report
2019-05-20 15:00:48 +05:30
Rohit Waghchaure
97d2a46052
feat: added checkbox in the filter of general ledger to show opening entries
2019-05-20 12:28:57 +05:30
deepeshgarg007
4541605e27
fix: Test Case for accounting dimension
2019-05-19 11:13:42 +05:30
deepeshgarg007
a285e4c73e
fix: Rename function in accounting dimension
2019-05-19 11:13:21 +05:30
deepeshgarg007
3d11ac0e75
fix: Accounting dimensions for child tables
2019-05-19 00:02:01 +05:30
deepeshgarg007
d0a1ed9017
fix: Ability to disable dimensions
2019-05-18 23:47:42 +05:30
Anurag Mishra
fc86df6453
fix: Allow return if delivery note or sales order is required in selling settings(v12) ( #17631 )
...
* fix: Allow retrun if delivery note or sales order is required in selling settings
* fix: combined condition
* style: refactor
2019-05-18 13:03:08 +05:30
deepeshgarg007
a4c9134d33
fix: Inactive Sales Item report fixes
2019-05-17 16:19:15 +05:30
deepeshgarg007
705c03c093
fix: Added dashboard and module links for accounting dimensions
2019-05-17 10:23:00 +05:30
Saurabh
1bcdb094ea
Merge pull request #17630 from nabinhait/multi-fixes-dev
...
fix: Multiple small fixes
2019-05-16 15:21:15 +05:30
Nabin Hait
ab1c43dbee
fix: To allow creation of sales invoice without customer
2019-05-16 13:45:36 +05:30
Nabin Hait
6b9d64ce1d
refator: Payroll processing and tax calculation ( #17617 )
...
* refactor: Payroll processing and tax calculation
* fix: payroll test cases
* fix: Codacy fixes
* fix: payroll test cases
* fix: removed unwanted code
2019-05-16 11:23:04 +05:30
Mangesh-Khairnar
6e3586423f
fix: multiple changes
2019-05-15 15:50:50 +05:30
Deepesh Garg
0ae1c293d3
fix: Status updater fixes in PO and SO and test coverage for return ( #17491 )
...
* fix: Status updator fixes in sales and purchase cycle
* fix: Test cases for return in so and po
* fix: Resolve conflicts
2019-05-15 12:23:24 +05:30
deepeshgarg007
073f36b766
fix: Create property setter for budget if dimension is created
2019-05-15 12:20:37 +05:30
Mohamed Al Zubaidi
4c0f754a96
Fix typos ( #17601 )
2019-05-15 11:38:56 +05:30
rohitwaghchaure
32d91b2c00
fix: not able to create the sales invoice without item code ( #17612 )
2019-05-15 07:41:44 +05:30
Mangesh-Khairnar
cf71a84976
style: formatting changes
2019-05-14 18:50:40 +05:30
Mangesh-Khairnar
cd59263736
fix: reload doc on generation of text file
2019-05-14 18:34:14 +05:30
Mangesh-Khairnar
c68ee1fcc6
feat: add account field in payment order
2019-05-14 18:31:14 +05:30
Mangesh-Khairnar
d9140dc772
feat: add party bank account field
2019-05-14 18:28:24 +05:30
deepeshgarg007
60f4dd0736
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-14 15:51:12 +05:30
deepeshgarg007
d9a22726f1
fix: Make territory filter mandatory
2019-05-14 14:36:40 +05:30
Deepesh Garg
571c5c8bf1
Merge branch 'develop' into inactive_items_row_develop
2019-05-14 11:54:08 +05:30
rohitwaghchaure
39be1d43bc
Merge pull request #17546 from rohitwaghchaure/incorrect_payment_amount_if_advance_amount_in_si_develop
...
fix: incorrect payment amount in the payment terms if the sales invoice has the advance amount
2019-05-14 11:15:14 +05:30
deepeshgarg007
4dcba49b5f
fix: Do not append row if item is sold within days since last order
2019-05-14 08:53:24 +05:30
deepeshgarg007
e64c357216
fix: Commified function to get dimensions
2019-05-14 08:50:45 +05:30
Suraj Shetty
c24ace48a6
Merge pull request #17554 from surajshetty3416/fix-rename-account-develop
...
fix: Show "Merge Account" button only to users with write access
2019-05-13 10:04:01 +05:30
deepeshgarg007
0c874d915b
fix: Indentation fixes
2019-05-12 18:38:57 +05:30
deepeshgarg007
7c12cfcb63
fix: Show all territories and items in inactive sales item report
2019-05-12 18:38:49 +05:30
deepeshgarg007
d83cf65be1
fix: Added dimensions in financial reports and general ledger
2019-05-12 18:34:23 +05:30
Mangesh-Khairnar
cd4289e10e
feat: remove button on import of an order
2019-05-11 20:04:03 +05:30
Suraj Shetty
b68ae15dec
fix: Check permissions before renaming the account
2019-05-10 14:42:07 +05:30
Suraj Shetty
699f132d05
fix: Show "Merge Account" button only to users with write access
2019-05-10 14:41:40 +05:30
Rohit Waghchaure
5c27791382
fix: test cases
2019-05-10 14:31:07 +05:30
deepeshgarg007
9a05ce10d9
Merge branch 'develop' of https://github.com/frappe/erpnext into dimensions
2019-05-09 14:43:45 +05:30
Mangesh-Khairnar
644e181729
feat: remove first row if empty
2019-05-08 16:17:31 +05:30
Mangesh-Khairnar
3ca8976037
feat: add validation for fetching doc status
2019-05-08 16:06:26 +05:30
Mangesh-Khairnar
f353f1d805
feat: add status field to create payment order
2019-05-08 16:04:48 +05:30
Mangesh-Khairnar
a4d55c9858
feat: assign pe status on creation of payment order
2019-05-08 16:04:18 +05:30
Mangesh-Khairnar
8aa9589aaf
fix: display generate txt on submission
2019-05-08 15:58:26 +05:30
Rohit Waghchaure
7bee502d72
fix: get totals of gross profit amount on call of the method get_invoiced_item_gross_margin
2019-05-08 15:38:34 +05:30
Rohit Waghchaure
1d6f2c3b5d
feat: Get invoiced item's gross margin using API
2019-05-08 15:38:05 +05:30
Mangesh-Khairnar
b8d0dec7f5
feat: filter bank from company account
2019-05-07 11:29:20 +05:30
Mangesh-Khairnar
e8bea2e936
feat: set payment order type on mapping
2019-05-06 19:54:11 +05:30
Mangesh-Khairnar
f709f330ce
feat: show generate txt button for payment entry
2019-05-06 19:50:17 +05:30
Mangesh-Khairnar
525d8cefc1
fix: post process mapping
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
c448664e6b
feat: generate file name
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
0fac6f1c4b
feat: check bulk update option
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
08a375beb8
feat: add advice row
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
6bc48b8bfb
fix: pass account paid information to postprocess
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
07a5471dd2
feat: add payment entry field
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
e56eaf6364
perf: improve mapping function speed
2019-05-05 22:37:21 +05:30
Mangesh-Khairnar
48d88b0478
feat: add generate txt file button for india region
2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
0faf9f5f8c
feat: add mapping logic for creating payment order
2019-05-05 22:37:20 +05:30
Mangesh-Khairnar
f5a1bea189
feat: create payment order from payment entry
2019-05-05 22:37:20 +05:30
Himanshu
5cf12a4640
fix(Purchase Order): fetch payment terms ( #17121 )
...
* fix: fetch payment terms
* fix: test fixes
* fix: test cases
* fix: test case
* fix: check for payment terms fetching
* fix: test cases
* refactor: fetch payment terms in account settings
* fix: add fetch terms to account settings
2019-05-04 22:37:35 +05:30
deepeshgarg007
b4ad5c0158
feat: Ability to add custom dimensions
2019-05-04 20:29:21 +05:30
deepeshgarg007
6c6b24011f
Merge branch 'develop' of https://github.com/frappe/erpnext into inactive-items-fix-develop
2019-05-02 23:03:59 +05:30
Saurabh
7c5d3873fe
Merge branch 'develop' into auto-account-creation-company-tree-dev
2019-05-02 12:01:46 +05:30
Rushabh Mehta
27a30c842d
fix: simplify sort condition
2019-05-02 09:23:56 +05:30
Nabin Hait
7ca243094e
Merge branch 'develop' into coa-sorting
2019-05-02 00:58:56 +05:30
Nabin Hait
9d04b67f46
fix: Validate parent account of child company while creating new account based on parent company
2019-05-01 20:26:36 +05:30
Nabin Hait
9ccdf594c3
Merge pull request #17445 from rmehta/refactor-child-tables
...
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 19:31:00 +05:30
deepeshgarg007
1cfe96193f
Merge branch 'develop' of https://github.com/frappe/erpnext into rename_report_develop
2019-05-01 18:14:07 +05:30
Rushabh Mehta
c3aecb1fbd
fix(item-tables): add missing "item_tax_template" in purchase order detail and reorganize sequence of all child table
2019-05-01 18:04:22 +05:30
Nabin Hait
dc86bc756e
Merge pull request #17441 from nabinhait/pe-ref-exchange-rate-dev
...
fix: Always fetch exchange rate from ref document
2019-05-01 17:18:35 +05:30
Aditya Hase
8b8e3e7890
Merge pull request #17424 from adityahase/fix-py3-misc
...
fix: Python 3 compatibility fixes
2019-05-01 16:45:11 +05:30
Nabin Hait
6d9334810e
fix: reverted fetch from as the field does not exists for some ref doctypes
2019-05-01 15:40:00 +05:30
Nabin Hait
3191d072f0
fix: Always fetch exchange rate from ref document
2019-05-01 15:37:03 +05:30
deepeshgarg007
db999e293b
fix: Rename Inactive Items report to Inactive Sales Item
2019-05-01 14:06:06 +05:30
Rushabh Mehta
43958dcd11
fix(minor): chart of accounts sorting and message
2019-05-01 13:53:05 +05:30
Nabin Hait
316c3b3f9d
fix: Fetch exchange rate from invoice on server side
2019-05-01 13:34:17 +05:30
Aditya Hase
ee0093c593
Merge branch 'develop' into fix-py3-misc
2019-05-01 11:55:28 +05:30
Aditya Hase
234d35781c
fix: Python 3 compatibility fixes
...
import reduce from functools
Undefined variable
2019-05-01 11:52:37 +05:30
Nabin Hait
39f58ae92b
Merge pull request #17392 from ashish-greycube/develop_allow_bank_account_import
...
fix: allow_import_of_bank_account_by_account_manager
2019-05-01 11:16:33 +05:30
Nabin Hait
8dc7401ddf
Merge pull request #17388 from ashish-greycube/correct_party_type_values
...
fix: show only party_type doctypes in Party Type field of bank account
2019-05-01 11:15:02 +05:30
Faris Ansari
1e55c2e713
Remove old style custom scripts ( #17077 )
...
* fix: Move Newsletter script from frappe to erpnext
* fix: Remove old style client scripts
* C-Form
* fix: Cost Center
* fix: Fiscal Year
* fix: Monthly Distribution
* fix: Payment Gateway Account
* fix: Pricing Rule
* fix: Missing semicolon
2019-04-30 10:18:09 +05:30
ashish-greycube
e4e8197f46
codacy review
2019-04-26 14:06:21 +05:30
ashish-greycube
0ed9ec9a03
fix : allow_import_of_bank_account_by_account_manager
2019-04-26 12:42:14 +05:30
ashish-greycube
467609b193
show only party_type doctypes in Party Type field of bank account
2019-04-26 11:35:04 +05:30
Nabin Hait
4fcefda6c7
Merge pull request #17332 from deepeshgarg007/automatic_so_po
...
feat: Automatic inter company Sales and Purchase order
2019-04-26 00:24:08 +05:30
Nabin Hait
1d21d89d2f
Merge pull request #17378 from rohitwaghchaure/trial_balance_error_finance_book_develop
...
fix: Trial balance finance book issue
2019-04-25 20:34:38 +05:30
Rohit Waghchaure
c181064782
fix: Trial balance finance book issue
2019-04-25 17:51:09 +05:30
Nabin Hait
4a994d4eb8
fix: Don't allocate advance if pos
2019-04-25 17:49:38 +05:30
deepeshgarg007
f34e4f0e36
fix: Test case for inter-company-transaction
2019-04-25 14:28:57 +05:30
deepeshgarg007
4a4ce12eb4
fix: Commonfied code for inter-company-transaction
2019-04-25 14:28:19 +05:30
Nabin Hait
aa028d7856
fix: don't allocate advances if POS
2019-04-23 21:44:21 +05:30
Nabin Hait
8624957cbc
Merge pull request #17291 from prasadarr/listing-fixes
...
fix: Allow system manager to access share ledger
2019-04-22 15:35:35 +05:30
Saif Ur Rehman
a216844d2c
fix: Set Allocate Advance Automatically disabled by default
2019-04-22 12:10:40 +05:00
Faris Ansari
733ff48d51
fix: Refactor for Print Format changes ( #17242 )
...
- Rename Server to Jinja
- Rename Js to JS
2019-04-22 12:08:18 +05:30
Nabin Hait
d21bacfc21
fix: Total row alignment in AR report
2019-04-20 10:58:58 +05:30
Nabin Hait
c8b1351e87
fix: fetch party account as discounted receivable account in payment entry
2019-04-19 21:33:29 +05:30
Nabin Hait
4a5bed5c07
fix: fetch party account as discounted receivable account in payment entry
2019-04-19 21:33:29 +05:30
Nabin Hait
06f992f850
Merge pull request #17299 from nabinhait/inv-disc-fixes
...
fix: Close loan considering latest invoice outstanding balance
2019-04-19 21:27:02 +05:30
Nabin Hait
375f051b24
Merge pull request #17277 from nabinhait/invoice-discounting-fixes
...
Invoice discounting fixes
2019-04-19 20:00:18 +05:30
Nabin Hait
d2797be1cd
fix: Close loan considering latest inv outstanding balance
2019-04-19 15:33:05 +05:30
Nabin Hait
8da71cebb7
fix: test cases
2019-04-19 15:10:02 +05:30
Prasad R
e1a6022c8c
fix: Allow system manager to access share ledger
2019-04-19 10:57:21 +05:30
Rohit Waghchaure
376db4f6b7
fix: credit amount in account's currency not be consider if debit amount is present in the general ledger
2019-04-18 22:06:22 +05:30
Nabin Hait
c99c712913
fix: Validate and update invoice discounting status on JE submit/cancel
2019-04-18 15:52:50 +05:30
Nabin Hait
8170585faf
fix: Don't fetch already discounted invoice
2019-04-18 15:13:18 +05:30
Nabin Hait
36bb3f55f2
fix: Added invoice discounting dashboard
2019-04-18 14:47:44 +05:30
Rohit Waghchaure
7aee809571
fix: If finance book filter is not set then show all the entries
2019-04-16 19:35:18 +05:30
Rushabh Mehta
59c5a16037
fix(account_balance_timeline): remove unused import
2019-04-16 15:11:45 +05:30
Rushabh Mehta
1c2eb51a91
fix(api)
2019-04-16 11:12:34 +05:30
Rushabh Mehta
6dff8038e6
fix(account_balance_timeline)
2019-04-16 09:35:46 +05:30
Rushabh Mehta
7efe01578d
fix(account_balance_timeline)
2019-04-16 09:33:21 +05:30
Nabin Hait
e9d9576cd7
Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting
...
Invoice Discounting
2019-04-15 21:14:19 +05:30
Nabin Hait
076cc38c29
fix: Outstanding amount on making payment against discounted invoice
2019-04-15 18:42:10 +05:30
Rushabh Mehta
44b0cb6383
Merge pull request #17194 from rmehta/dashboard-refactor
...
fix(dashboard): as per new features
2019-04-15 16:52:54 +05:30
Nabin Hait
d584cfbf43
Fixed merge conflict
2019-04-15 16:16:25 +05:30
Nabin Hait
9fd3f10b67
Merge pull request #17220 from Anurag810/payment-entry-fix
...
fix: handle for party type member in payment entry (v12)
2019-04-15 10:06:08 +05:30
rohitwaghchaure
033b1babe8
Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation
...
feat: Added bank account no in bank reconcilliation
2019-04-14 16:10:19 +05:30
Anurag Mishra
95714297a4
fix: handle for party type member in payment entry
2019-04-12 15:03:46 +05:30
Nabin Hait
165e92ad5b
Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times
...
fix: Taxes and charges table not clear the existing rows if the template is changed
2019-04-12 11:02:37 +05:30
Rohit Waghchaure
72cc37e8da
fix: Taxes and charges table not clear the existing rows if the template is changed
2019-04-11 18:35:15 +05:30
Rushabh Mehta
d625c32ab1
fix(dashboard): for frappe updates, and a new splash logo
2019-04-11 16:13:58 +05:30
Mangesh-Khairnar
3ab2a18088
Merge branch 'develop' into so-on-hold
2019-04-11 15:49:06 +05:30
Faris Ansari
6472ed2c1e
Merge pull request #16941 from Mangesh-Khairnar/po-on-hold
...
Feature: Purchase order on hold
2019-04-11 15:36:54 +05:30
Nabin Hait
89206e74d0
fixed merge conflict
2019-04-11 12:31:14 +05:30
Anurag Mishra
4c29d80cf1
fix: minor fixes
2019-04-11 11:14:32 +05:30
Anurag Mishra
accf310aa3
fix: start date and loan period should be mandatory
2019-04-11 11:08:07 +05:30
rohitwaghchaure
6cd114b467
Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice
...
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-11 09:57:45 +05:30
Rohit Waghchaure
49907e746b
fix: test cases
2019-04-10 17:33:32 +05:30
Rohit Waghchaure
b286fc99b8
fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled
2019-04-10 16:16:30 +05:30
Rohit Waghchaure
30fda3ee54
feat: Added bank account no in bank reconcilliation
2019-04-09 18:58:23 +05:30
Rushabh Mehta
bead5b33f4
fix(dashboard): as per new features
2019-04-09 18:38:03 +05:30
Nabin Hait
1245139c51
Merge branch 'develop' into invoice-d
2019-04-09 15:27:13 +05:30
Anurag Mishra
67e6da2086
fix: Removed Extra page on generating pdf in print formats
2019-04-09 15:19:05 +05:30
Anurag Mishra
ef11d378d4
fix: UI on generating pdf in print format
2019-04-09 15:19:05 +05:30
Anurag Mishra
ed82e8ba3b
fix: removed before from accounts_controlle.pyr and fetch the gl from frontend
2019-04-09 15:19:05 +05:30
