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

5579 Commits

Author SHA1 Message Date
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