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

5280 Commits

Author SHA1 Message Date
Rucha Mahabal
59e6c7730b
Merge branch 'develop' into healthcare_refactor 2020-04-10 20:32:37 +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
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
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
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
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
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