nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-09 00:01:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,100 Commits 459 Branches 1,746 Tags
f4a4efb510eef24a072011b30ee5052df9e5e998
Commit Graph

34100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuja Pawar
8a8a91c6b9 Merge branch 'develop' into issue_customer_filter 2020-12-04 15:26:40 +05:30
Anuja P
2e48cf7308 Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter 
Merge branch 'issue_customer_filter' of https://github.com/Anuja-pawar/erpnext into issue_customer_filter
 2020-12-04 15:19:06 +05:30
Kenneth Sequeira
c4eb41c92b fix; styling for sider 2020-12-04 15:00:22 +05:30
Anuja P
931f2e73a7 fix: sider changes 2020-12-04 14:57:23 +05:30
rohitwaghchaure
c4d9bb21d1 Merge pull request #24053 from rohitwaghchaure/additional-product-incorrect-rate 
fix: pricing rule with transaction not working for additional product
 2020-12-04 14:14:55 +05:30
Anuja Pawar
84166a931e Merge branch 'develop' into issue_customer_filter 2020-12-04 13:33:18 +05:30
marination
6a2431586e fix: Make new Customers for account missing test and set company 2020-12-04 13:31:36 +05:30
Rucha Mahabal
edee530d4c fix: paid amount in Sales Invoice POS return resets to 0 2020-12-04 12:13:26 +05:30
Rohit Waghchaure
28e86cf183 fix: pricing rule with transaction not working for additional product 2020-12-04 11:57:56 +05:30
Deepesh Garg
610eb508bf fix: Add test for internal transfer 2020-12-04 11:32:28 +05:30
Deepesh Garg
047bf3833e fix: Account naming changes and other fixes 2020-12-04 11:32:19 +05:30
Deepesh Garg
e4554f690c fix: Dimension filters in accounting reports 2020-12-04 11:31:41 +05:30
Anuja P
0139109de2 fix: consistency check 2020-12-04 11:28:13 +05:30
Marica
4bf951a85b Merge branch 'develop' into v13-patch-fixes-1 2020-12-03 19:55:03 +05:30
Anuja P
25e058833a fix: sider changes 2020-12-03 18:13:24 +05:30
Anuja P
26cc662a78 feat: added filter for customer field 2020-12-03 17:45:34 +05:30
Abhishek Balam
a31731e73d Merge pull request #24050 from Anuja-pawar/fiscal_year_filter_fix 
refactor(Fiscal Year): to avoid using SQL query to get fiscal year filters
 2020-12-03 17:37:29 +05:30
Anuja P
69c5d49b25 refactor: to avoid using SQL query to get fiscal year filters 2020-12-03 15:14:54 +05:30
rohitwaghchaure
f851eed7b4 Merge pull request #24048 from rohitwaghchaure/fixed-incorrect-balance-value-in-stock-balance-develop 
fix: incorrect balance value in stock balance report
 2020-12-03 13:45:07 +05:30
Rohit Waghchaure
8474476316 fix: incorrect balance value in stock balance report 2020-12-03 13:43:11 +05:30
Kenneth Sequeira
131e46bab7 chore: add help section for Jinja 2020-12-02 21:37:55 +05:30
Kenneth Sequeira
9abc685504 feat: add jinja templating in contract template 2020-12-02 21:13:50 +05:30
Deepesh Garg
57d79a8149 fix: GL entry fixes and validation for intercompany account 2020-12-02 20:51:36 +05:30
Deepesh Garg
65fb0729d2 fix: Linting issues 2020-12-02 20:49:05 +05:30
Deepesh Garg
692c617cb2 fix: warehouse fetching 2020-12-02 20:48:50 +05:30
Deepesh Garg
614c04e357 fix: Accounting for internal transfer invoices within same company 2020-12-02 20:48:36 +05:30
Marica
376c1eaa48 Merge pull request #22914 from newmatik/shipment_with_integration 
feat: Shipment Doctype
 2020-12-02 17:37:41 +05:30
Joshua Angelo Bienes
324622bd2a Merge branch 'develop' into shipment_with_integration 2020-12-02 19:21:32 +08:00
Marica
cf44f1c9d3 Merge pull request #24044 from marination/gross-pay-based-on-present-days-test 
fix: Test Payment Based on Leave Application (Travis)
 2020-12-02 16:42:47 +05:30
marination
523c464a92 fix: Test Payment Based on Leave Application (Travis) 2020-12-02 16:01:35 +05:30
jbienesdev
8e68f128c1 fix: travis build error 
- Removed shipment notification and subscription files
- Minor changes on shipment field configuration
- Add shipment to desk
 2020-12-02 08:56:49 +00:00
Deepesh Garg
07e86e0c3d fix: Move filter setup to doctype controllers 2020-12-02 13:54:26 +05:30
Deepesh Garg
da9418b378 fix: Exception naming 2020-12-02 13:05:20 +05:30
Deepesh Garg
8e641d353c fix: Accounting dimension import in PCV 2020-12-02 13:05:08 +05:30
jbienesdev
b4b542d1c3 chore: linter issues and sider checks 2020-12-02 07:15:16 +00:00
jbienesdev
99361b4a9e chore: remove notification details section 2020-12-02 07:15:14 +00:00
jbienesdev
28055f483d fix(shipment): change shipment test and refactor shipment.js 2020-12-02 07:15:13 +00:00
jbienesdev
ac3c1f1493 chore: remove packlink, letmeship, and sendcloud files 2020-12-02 07:15:11 +00:00
jbienesdev
000494f548 fix(shipment): apply code review 2020-12-02 07:15:05 +00:00
jbienesdev
1c9410e5e8 feat(shipment): Shipment Doctype with Integrations 2020-12-02 07:14:58 +00:00
Deepesh Garg
e00f52c455 fix: Move filter setup to doctype controllers 2020-12-01 21:11:19 +05:30
Deepesh Garg
c4bdbe1046 fix: Label changes 2020-12-01 21:10:32 +05:30
Deepesh Garg
4d6c53f7b2 fix: Define specific exceptions and fix tests 2020-12-01 21:10:21 +05:30
Deepesh Garg
94aad17fd5 fix: form layout and naming fixes 2020-12-01 21:10:10 +05:30
Deepesh Garg
08d562a5bb fix: Replace raw query with ORM 2020-12-01 21:09:53 +05:30
Deepesh Garg
d8aeaed6ab Merge pull request #24039 from rohitwaghchaure/fixed-incorrect-gstr-report-issue 
fix: GSTR B2C report
 2020-12-01 20:44:33 +05:30
Saurabh
2e27f074c3 feat: reload doctype number card link 2020-12-01 18:08:04 +05:30
Rohit Waghchaure
1ac040a418 fix: GSTR report 2020-12-01 13:50:01 +05:30
Anurag Mishra
0fb05d1ba4 Merge pull request #24038 from Anurag810/bom-fix 
fix:  keyerror 'sourced_by_supplier'
 2020-12-01 13:47:06 +05:30
Anurag Mishra
0e9eb95b22 Merge branch 'develop' into bom-fix 2020-12-01 13:18:00 +05:30