Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,078 Commits 3 Branches 0 Tags 1 GiB
6e170e16e2
Commit Graph

3665 Commits

Author SHA1 Message Date
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
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
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
thefalconx33
23e728612f fix: disabled mode of payments fetches in sales invoices 2020-02-17 14:15:20 +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
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
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
cce3ac9f79 fix: Move E-Way bill button under create 2020-02-02 21:25:58 +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
Saqib
9cb02bf2e1 fix: incorrect status for fraction of outstanding amount (#20369) 2020-01-27 14:22:43 +05:30
Rohit Waghchaure
8996b7d8a4 delete the auto created batch 2020-01-23 17:44:19 +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
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
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
Rohit Waghchaure
660a78b877 fix: ignore pricing rule for other item group 2020-01-02 17:31:09 +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