Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,702 Commits 3 Branches 0 Tags 1 GiB
8370d9b997
Commit Graph

4014 Commits

Author SHA1 Message Date
marination
8370d9b997 fix: Check Company in Payment Entry before selecting values 2020-09-24 11:51:03 +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
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
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
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
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
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
9b681770d0 fix: Account filter in Process Deferred Accounting doctype 2020-09-03 18:09:02 +05:30
Anurag Mishra
41f421d400 feat: added option to add custom remarks in payment entry 2020-09-02 13:47:18 +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
michellealva
c71e37c988 feat: Allow Rename for Tax Category 2020-08-30 19:42:24 +05:30
Rucha Mahabal
8cdc3b5d91
Merge branch 'develop' into patch-9 2020-08-28 10:41:02 +05:30
michellealva
ead2f6abf0 fix: Chage fiedtype of Customer's PO in Sales Invoice 2020-08-27 13:57:15 +05:30
bhavesh95863
bb5d886930
fix: account & cost center filter by company 2020-08-26 18:23:21 +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
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
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
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
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
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
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
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
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