Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,368 Commits 3 Branches 0 Tags 1 GiB
856484aeb0
Commit Graph

6444 Commits

Author SHA1 Message Date
Deepesh Garg
ea18230274 fix: Update GL Entry ordering 2021-05-27 16:40:37 +05:30
Deepesh Garg
be3671fe7b fix: Create new supplier for test case 2021-05-27 13:27:17 +05:30
Marica
477a90e2ac
Merge pull request #25833 from ankush/translation_fixes 
fix(ux): fix unstranslated text in msgprint/throw
 2021-05-26 14:12:36 +05:30
Deepesh Garg
5e27c7dae2 fix: Add non group filter for account 2021-05-25 22:34:58 +05:30
Deepesh Garg
8fddd0f0c1 fix: Update TDS rate for test 2021-05-25 22:03:50 +05:30
Ankush Menat
ff96bdf0c1
fix(ux): fix unstranslated text in msgprint/throw 2021-05-25 20:59:20 +05:30
Deepesh Garg
81376ea44f
feat: Show net values in Party Accounts (#25714) 2021-05-25 20:39:17 +05:30
Afshan
4d61fa2497
fix: incorrect cr/dr shown in general ledger for multi-currency transactions (#25654) 2021-05-25 19:16:02 +05:30
Deepesh Garg
55a3fb57dd fix: Linting Issues 2021-05-25 17:40:06 +05:30
Deepesh Garg
6f84cee6fe fix: Uncommentt test 2021-05-25 17:39:06 +05:30
Deepesh Garg
b07f7d1b70 fix: Linting and other fixes 2021-05-25 17:39:04 +05:30
Deepesh Garg
c9da1fc568 chore: Test case for adance TDS allocation 2021-05-25 17:37:17 +05:30
Deepesh Garg
a23aaf43f4 fix: Allocate advance taxes only for payment entry 2021-05-25 17:36:06 +05:30
Deepesh Garg
e2f83ffaa4 fix: Linting fixes and other checks 2021-05-25 17:35:41 +05:30
Deepesh Garg
77dcee9d67 fix: Test Cases 2021-05-25 17:35:15 +05:30
Deepesh Garg
fd380d34f9 fix: Linting errors 2021-05-25 17:35:05 +05:30
Deepesh Garg
a87e3fcb7c fix: TDS report cleanup 2021-05-25 17:34:45 +05:30
Deepesh Garg
79b422c0a9 fix: Advance TDS in TDS payable monthly report 2021-05-25 17:33:59 +05:30
Deepesh Garg
d18dde7757 fix: Add tds in PO and code cleanup 2021-05-25 17:32:28 +05:30
Deepesh Garg
c26de28613 fix: TDS against Purhase Orders 2021-05-25 17:25:13 +05:30
Deepesh Garg
61c5e478af feat: Tax deduction against advance payments 2021-05-25 17:20:52 +05:30
Deepesh Garg
c9aa726818 feat: Tax deduction against advance payments 2021-05-25 17:17:40 +05:30
Deepesh Garg
09d9bd19ac
Merge pull request #25816 from deepeshgarg007/jv_diff_ignore_v13 
fix: Ignore rounding diff while importing JV using data import
 2021-05-25 10:59:50 +05:30
rohitwaghchaure
bc7c5bfbe2
Merge pull request #25817 from rohitwaghchaure/fix-removed-serial-no-validate-for-sales-invoice 
fix: removed serial no validation for sales invoice
 2021-05-25 10:40:46 +05:30
Rohit Waghchaure
b4f0347c02 fix: removed serial no validation for sales invoice 2021-05-24 23:39:25 +05:30
Deepesh Garg
7c0383a9a6
Merge pull request #25815 from deepeshgarg007/cash_flow_mapper_v13 
fix: Cashflow mapper not showing data
 2021-05-24 20:40:07 +05:30
Deepesh Garg
25112244ed fix: Ignore rounding diff while importig JV using data import 2021-05-24 20:01:21 +05:30
Deepesh Garg
c348215f61 fix: Cashlfow mapper not showing data 2021-05-24 19:57:53 +05:30
Deepesh Garg
63e4ab4f2d
Merge pull request #25777 from Anuja-pawar/fix-process-SOA-format 
fix: Process Statement of Accounts formatting
 2021-05-24 19:55:21 +05:30
Saqib
b6d061fa8c
fix(pos): handle db lock timeout error while pos closing (#25813) 2021-05-24 18:22:03 +05:30
Saqib
0b5e340b6e
fix(pos): return case for item with available qty equal to one (#25760) 2021-05-21 16:32:56 +05:30
Anuja P
605ea044f3 fix: update process SOA format 2021-05-21 11:24:33 +05:30
Rucha Mahabal
722cfdb7e5
Merge pull request #25701 from anupamvs/timesheet-refactor 
refactor: timesheet
 2021-05-20 23:43:19 +05:30
Rucha Mahabal
a7d0dbb085 fix: calculate total billing amount on fetching timesheets 
- show timesheet billing amounts in doc currency
 2021-05-20 23:02:11 +05:30
Saqib Ansari
f79ef5d8cf fix: missing cost center message on creating gl entries 2021-05-19 13:04:44 +05:30
Saqib
8d7d4b0ba7
fix: expected amount in pos closing payments table (#25737) 2021-05-18 18:39:35 +05:30
Marica
5da34bddd6
Merge pull request #25731 from ankush/escaping_company_name 
fix: escape company name
 2021-05-18 16:35:19 +05:30
Ankush Menat
b6783b158f
chore: translation fixes 2021-05-17 17:06:41 +05:30
Ankush Menat
f3b3d81e0b
fix: escape company name in deferred_revenue 2021-05-17 17:06:41 +05:30
Deepesh Garg
87baa646e7
Merge pull request #25260 from AfshanKhan/dimension-wise-accounts-balance-reports 
feat: Dimension-wise Accounts Balance Report
 2021-05-16 18:04:01 +05:30
Anupam
35137ba9e0 removing currency filter and added rate conversion while fetching timesheets in SI 2021-05-16 14:17:56 +05:30
Anupam
fd4743cc31 refactor: timesheet 2021-05-15 20:01:17 +05:30
Deepesh Garg
55fe85d850
feat(India): Multiple GST enhancement and fixes (#25249) 
* fix: RCM tax calculation

* feat(India): ITC Reversal via Journal Entry

* fix: Reverse Charge booking logic and validation

* fix: Addd patch for availed ITC fields

* fix: Hooks method to update availed ITC field

* fix: Cleanup and fixes in GSTR3B report

* fix: Update params in GSTR-1 report

* fix: Debit note using Sales Invoice

* fix: Setup and patch

* fix: GSTR 3B report cleanup and updates

* fix: Add method to get invoices liable to reverse charge

* fix: Add taxable value in Purchase Invoice Item

* fix: Inward supplies liable to reverse charge

* fix: Linting issues

* fix: GSTR3B report test
 2021-05-14 12:17:41 +05:30
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
Deepesh Garg
95e05fbdac fix: Parameter for get_filtered_list_for_consolidated_report in consolidated balance sheet 2021-05-13 14:59:28 +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
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
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
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
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
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
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
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
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
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