Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
33,709 Commits 3 Branches 0 Tags 1 GiB
0c883853b3
Commit Graph

33709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuja Pawar
d369710c65
fix: fixed home desk page (#24075) 
* fix: fixed home desk page

* fix: suggested changes

Co-authored-by: Marica <maricadsouza221197@gmail.com>

* fix: suggested changes

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-12-08 09:40:08 +05:30
Jannat Patel
797f0cfa61
fix: sales invoice add button from sales order dashboard (#24077) 
Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
 2020-12-08 09:33:13 +05:30
Afshan
749d36a4dd
fix: double exception in payroll (#24078) 2020-12-08 09:32:04 +05:30
Afshan
01eca12fa7
fix: overriding po (#24022) 
* fix: overriding po

* fix: po

* fix: refactor condition

* fix: condition

* fix: missing code
 2020-12-08 09:27:56 +05:30
Marica
654a71e35a
Merge pull request #24065 from Anuja-pawar/company_fiscal_year_fix 
fix: Added TDS Payable account number and an error message
 2020-12-07 13:21:18 +05:30
Marica
34e142ec72
Merge pull request #24057 from ruchamahabal/fix-si-pos-return 
fix: paid amount in Sales Invoice POS return resets to 0
 2020-12-07 13:20:43 +05:30
Marica
724d03ec68
Merge branch 'develop' into fix-si-pos-return 2020-12-07 12:01:19 +05:30
Kenneth Sequeira
85af44b7ed fix: client side UX fixes 2020-12-07 11:18:20 +05:30
Anuja P
276a729b84 Merge branch 'company_fiscal_year_fix' of https://github.com/Anuja-pawar/erpnext into company_fiscal_year_fix 2020-12-07 11:13:23 +05:30
Anuja P
550cb9c78f fix: suggested changes 2020-12-07 11:11:00 +05:30
Kenneth Sequeira
00510e7f12 Merge branch 'cont-temp' of https://github.com/kennethsequeira/erpnext into cont-temp 
pull latest
 2020-12-07 10:56:30 +05:30
Anuja P
47b4b7009d Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix 
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
 2020-12-07 10:55:44 +05:30
Kenneth Sequeira
5f95ba57a8 fix: py code clean up and doc help 2020-12-07 10:45:13 +05:30
Rucha Mahabal
063be69b58
fix(patch): set update_modified to False while setting issue/opportunity metrics (#24073) 2020-12-07 10:41:05 +05:30
Marica
13dcd18ede
Merge branch 'develop' into cont-temp 2020-12-07 09:53:23 +05:30
Deepesh Garg
6c35767995
Merge pull request #24069 from deepeshgarg007/gstr_3b_report_ims 
fix: Show tax amount in base currencies
 2020-12-06 23:24:24 +05:30
rohitwaghchaure
0a672b69e6
Merge pull request #22859 from marination/pr-dn-return 
feat: Return tracking in PR/DN
 2020-12-06 22:43:34 +05:30
Deepesh Garg
cfeca0dc87 fix: Show tax amount in base currencies 2020-12-06 18:28:30 +05:30
Deepesh Garg
44276b4650
Merge pull request #24067 from frappe/michellealva-patch-1 
fix: Change validation message
 2020-12-06 17:13:19 +05:30
Michelle Alva
c9067e40cb
fix: Change validation message 
grammatical fix
 2020-12-06 10:48:32 +05:30
Anuja Pawar
6227c1e526
Merge branch 'develop' into company_fiscal_year_fix 2020-12-06 00:29:03 +05:30
Deepesh Garg
2d1cfae596 fix: fieldname 2020-12-05 22:44:45 +05:30
Deepesh Garg
ceefd66090
Merge pull request #24041 from saurabh6790/v13-patch-fixes-1 
fix: reload doctype number card link
 2020-12-05 22:43:46 +05:30
Anuja P
b6cf75d2a8 fix: error messsage indent fix 2020-12-05 22:25:17 +05:30
Anuja P
d3157c9347 Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix 
Merge branch 'develop' of https://github.com/frappe/erpnext into company_fiscal_year_fix
 2020-12-05 22:21:03 +05:30
Marica
2d255c02a6
Merge pull request #23559 from marination/debit-credit-opening-invoice-tool 
fix: Handle Account and Item None not found in Opening Invoice Creation Tool
 2020-12-05 17:56:13 +05:30
Marica
3b2da41f84
Merge branch 'develop' into debit-credit-opening-invoice-tool 2020-12-05 17:04:26 +05:30
Anuja P
2e4faf96f2 fix: Added TDS Payable account number and an error message 2020-12-05 13:36:43 +05:30
Deepesh Garg
eb951f3996
Merge pull request #24060 from deepeshgarg007/template_update 
fix(India): Tax template update on supplier change
 2020-12-05 12:38:10 +05:30
Marica
067f35df26
Merge branch 'develop' into debit-credit-opening-invoice-tool 2020-12-04 21:13:23 +05:30
marination
c866abca56 fix: (travis) Disable update stock for deferred accounting item's Sales Invoice 2020-12-04 20:12:52 +05:30
Anurag Mishra
26b3328af7
fix: leave policy assignment patch (#24061) 2020-12-04 19:50:24 +05:30
Deepesh Garg
a767085276 fix: Tax template update on supplier 2020-12-04 18:07:46 +05:30
Marica
ab510d2417
Merge pull request #23429 from marination/link-to-mr 
feat: (RFQ/SQ) Link to Material Requests in Tools section
 2020-12-04 17:58:17 +05:30
Marica
afc517b8bf
Merge branch 'develop' into link-to-mr 2020-12-04 16:30:40 +05:30
Marica
c1885046d3
Merge pull request #24051 from Anuja-pawar/issue_customer_filter 
feat(Issue): Added filter for customer field
 2020-12-04 16:21:16 +05:30
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
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