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

28312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shivam Mishra
0aeccbf4b2
feat: added dashboard fixtures (#18812) 
* feat: add dashboard charts fixture

* fix: remove return statement

* feat: added patch for creating default dashboards

* chore: renamed dashboard charts

* feat: add add_dashboard function to install fixtures

* fix: reload doctype issue in patches

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard chart source

* fix (travis): reloaded dashboard doctype

* fix (travis): reloaded dashboard chart link doctype
 2019-08-28 11:39:45 +05:30
Shivam Mishra
db3bb793e9 feat: added domain info on footer (#18839) 2019-08-26 11:29:18 +05:30
Mangesh-Khairnar
5dd1b50802 fix: update show in website on disabling item (#18831) 2019-08-26 10:27:25 +05:30
Nabin Hait
d8c262fd5c
fix: Translations of strings (#18825) 2019-08-23 16:32:58 +05:30
Mangesh-Khairnar
fe579c2efd fix: show a descriptive message on submission of duplicate account (#18486) 
* fix: show a descriptive message on submission of duplicate account

* Update account.py
 2019-08-23 16:31:20 +05:30
Mangesh-Khairnar
d94a389dd3 chore: remove unwanted code (#18645) 2019-08-23 16:31:09 +05:30
Tufan Kaynak
a7ab51c5ba Update vehicle_expenses.py (#18768) 2019-08-23 12:50:52 +05:30
Nabin Hait
6e7b9b5cb7
Update sales_invoice.py 2019-08-23 12:27:05 +05:30
Michelle Alva
c890401fec fix: added payroll period in HR module (#18543) 2019-08-23 11:50:48 +05:30
Deepesh Garg
f3d78dd29c fix: Duplicate items check in Sales Invoice (#18660) 
* fix: Duplicate items check in sales Invoice

* fix: Commonified function for duplicate items check in selling controller

* fix: Set valuation rate and transaction date in child tabel
 2019-08-23 11:42:35 +05:30
KanchanChauhan
23b5f4ec99 fix: Leave Application status filter (#18770) 
When we click on Status Open in list view it throws an error.


After fix, it filters the results on Open status
 2019-08-23 11:40:09 +05:30
Harshit
56d03a456b fix: add contract to CRM module (#18817) 2019-08-23 11:34:25 +05:30
Michelle Alva
680e098b87 fix(dash): Added Tax exemption category and sub category in Employee Tax and Benefits (#18545) 
section
 2019-08-23 11:32:43 +05:30
Anurag Mishra
db88476f8b feat: refactor invoice_discounting (#18629) 
* feat: refactor invoice_discountig

* Update invoice_discounting.py

* Update invoice_discounting.js
 2019-08-23 11:27:00 +05:30
rohitwaghchaure
88ee7d8dbe fix: POS Sync Issue (#18807) 2019-08-23 11:13:58 +05:30
Anurag Mishra
210317c0b5
fix: division by zero in asset Depereciation (#18637) 
* fix: division by zero in asset Depereciation

* fix: requested changes
 2019-08-23 00:21:26 +05:30
Sahil Khan
7ff82fccf3 Merge branch 'develop' into version-12 2019-08-22 13:10:17 +05:30
Sahil Khan
cd25d6dc7f bumped to version 12.0.8 2019-08-22 13:30:17 +05:50
rohitwaghchaure
224d857928
Merge pull request #18703 from rohitwaghchaure/reconciled_entry_still_has_no_clearance_date_develop 
fix: reconciled entry has not clearance date set
 2019-08-21 23:36:06 +05:30
rohitwaghchaure
a23fc327df
Merge pull request #18785 from rohitwaghchaure/payment_recon_for_debit_entry_not_working_properly_develop 
fix: debit note not reconciled with another purchase invoice using pa…
 2019-08-21 23:35:35 +05:30
Anastes Mp
a6c6e02c49 Incorrect database table (#18558) 
Fixed Unknow Column tax_type error on offline pos
 2019-08-21 16:53:06 +05:30
Suraj Shetty
109a07b834
fix: Fix get_employees_with_number query 
if the passed number is 7039392929 then it should match 
with the employee cell_number set as `7039392929, 0288382222`
 2019-08-21 15:19:08 +05:30
Mangesh-Khairnar
5619db28cb fix: fetch capital work in progress as expense account (#18780) 2019-08-21 14:49:24 +05:30
Nabin Hait
bcb0f6038e
fix: Single gl entry should only be considered once either in opening or closing entry (#18792) 2019-08-21 14:47:33 +05:30
Deepesh Garg
e9e0c0e7d4 fix: Minor fix in GSTR-1 report (#18797) 2019-08-21 14:40:35 +05:30
Suraj Shetty
e84de50147
fix: check if number exists after striping '0' (#18805) 
fix: check if number exists after striping '0'
 2019-08-21 14:22:59 +05:30
Suraj Shetty
6affeaa9c1 fix: check if number exists after striping '0' 
- Absract number striping logic to separate method
- Rename a confusing variable name
- Remove leftout print statement
 2019-08-21 09:14:56 +05:30
rohitwaghchaure
d36ff39498
Merge pull request #18799 from scmmishra/cart-fix 
fix: shopping cart item availability
 2019-08-21 08:58:47 +05:30
Mangesh-Khairnar
576f51d89e
Merge pull request #18791 from Mangesh-Khairnar/fix-ledger-entry 
fix: ledger entries
 2019-08-20 19:57:50 +05:30
Shivam Mishra
eab5be1110 fix: shopping cart item availability 2019-08-20 19:31:54 +05:30
Mangesh-Khairnar
c9b6c9bb61 fix: calculate opening leave balance 2019-08-20 19:18:45 +05:30
Mangesh-Khairnar
6d549b03f1
Merge branch 'develop' into fix-ledger-entry 2019-08-20 17:58:44 +05:30
Saurabh
128db172f0
Merge pull request #18796 from sahil28297/merge_v12_hotfix_1 
Merge version-12-hotfix into develop
 2019-08-20 17:49:24 +05:30
Sahil Khan
5f2c030ddc Merge branch 'version-12-hotfix' into merge_v12_hotfix_1 2019-08-20 16:22:49 +05:30
Sahil Khan
bf2b712f4b Merge branch 'version-12-hotfix' into version-12 2019-08-20 16:00:26 +05:30
Sahil Khan
a8403cde16 bumped to version 12.0.7 2019-08-20 16:20:26 +05:50
Mangesh-Khairnar
79414a8d36 fix: fetch employee name on leave ledger creation 2019-08-20 14:45:57 +05:30
Mangesh-Khairnar
5cdda19494 fix: ledger entries after expiry 2019-08-20 14:45:57 +05:30
rohitwaghchaure
16dda1a991 fix: group by voucher consolidated showing incorrect data for deferred entries (#18779) 2019-08-20 12:37:32 +05:30
rohitwaghchaure
d5b4b1fdaf fix: group by voucher consolidated showing incorrect data for deferred entries (#18777) 2019-08-20 12:35:15 +05:30
Mangesh-Khairnar
b69595904a
Merge pull request #18786 from Mangesh-Khairnar/payment-order-fetch-fix 
fix: restrict the payment order to non received type payment entries
 2019-08-20 12:21:24 +05:30
rohitwaghchaure
9ef7d5edaf
Merge pull request #18789 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_develop 
Asset pro rata cal for wdv remaining amt develop
 2019-08-20 10:33:15 +05:30
Rohit Waghchaure
5d3dee206f fixed test cases and the logic for pro rata calculation 2019-08-20 10:30:56 +05:30
Rohit Waghchaure
1583925080 fix: Pro rata calculation is not working for WDV depreciation method 2019-08-20 10:30:38 +05:30
Mangesh-Khairnar
c97a7fb845 fix: restrict the payment order to non received type payment entries 2019-08-20 00:27:43 +05:30
Mangesh-Khairnar
becb89213f
Merge pull request #18737 from Mangesh-Khairnar/fix-payment-order 
fix: restrict the payment order to non received type payment entries
 2019-08-20 00:13:32 +05:30
Rohit Waghchaure
1008e6e450 fix: debit note not reconciled with another purchase invoice using payment reconciliation 2019-08-19 20:27:15 +05:30
Mangesh-Khairnar
09ddc84c3a
Merge pull request #18774 from deepeshgarg007/test_case_fix 
fix: Failing sales and purchase return test cases
 2019-08-19 19:20:52 +05:30
Deepesh Garg
33b392ac2b
Update erpnext/controllers/sales_and_purchase_return.py 
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2019-08-19 17:43:10 +05:30
Deepesh Garg
3965451c7a
Update erpnext/controllers/sales_and_purchase_return.py 
Co-Authored-By: Mangesh-Khairnar <mkhairnar10@gmail.com>
 2019-08-19 17:40:29 +05:30