Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,811 Commits 3 Branches 0 Tags 1 GiB
645869e6ff
Commit Graph

2311 Commits

Author SHA1 Message Date
sonali
645869e6ff feat: added arguments of posting date and reference date 2022-12-21 12:58:30 +05:30
sonali
05b6fce03d feat:filters on bank reconciliation 
Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.
 2022-12-17 17:15:28 +05:30
sonali
447272aa4d Filters on Bank Reconciliation 
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
 2022-12-08 16:11:53 +05:30
sonali
e5a1189bec Update bank_reconciliation_tool.py 
Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order.
Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.
 2022-12-08 13:29:28 +05:30
Sabu Siyad
c5edbe2e2f
fix(lint): trailing whitespace 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-30 17:12:06 +05:30
Sabu Siyad
a378619c9a
fix(pos): partial return amount update 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-23 17:52:12 +05:30
Deepesh Garg
64802d1220 fix: Timesheet timer button 2022-11-20 19:45:51 +05:30
Ernesto Ruiz
1f13bc906b
fix: add translation functuinon to doctype name on message in bulk_transaction_processing 2022-11-07 09:43:28 -06:00
Deepesh Garg
be0f6b3e6e Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice 2022-11-05 16:35:55 +05:30
Deepesh Garg
cbf82872fb
Merge pull request #32646 from niralisatapara/tds_purchase_invoice 
feat: Item Wise TDS Calculation
 2022-11-04 13:08:10 +05:30
rohitwaghchaure
441f082fcb
Merge pull request #32799 from rohitwaghchaure/fix-scan-qrcode-functionality 
fix: Scan Barcode UX
 2022-11-04 11:04:40 +05:30
Ernesto Ruiz
ad0dd693ac
chore: add translation function to Bank Reconciliation Tool related files 
chore: add translation  function to Bank Reconciliation Tool related files
 2022-11-04 01:06:01 +05:30
Rohit Waghchaure
e5b19e3f70 fix: auto increment qty if item table has no items 2022-11-03 14:57:36 +05:30
Rohit Waghchaure
e1f9ba78e5 fix: Scan Barcode UX 2022-11-02 15:37:46 +05:30
niralisatapara
2ca0cf6fc4 feat: item wise tds calculation 2022-11-02 12:19:51 +05:30
Dany Robert
1d83fb20d6
feat(pricing rule): free qty rounding and recursion qty (#32577) 
Option to specify recursion start qty and repeating qty

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-11-01 16:39:32 +05:30
Deepesh Garg
50652be6e3 Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice 2022-10-28 20:48:26 +05:30
Deepesh Garg
77d509eb9a
Merge pull request #32650 from barredterra/unset-contact-details 
fix: unset contact details
 2022-10-23 18:21:01 +05:30
FinByz Tech Pvt. Ltd
c52b41d311
feat(report): added account wise redirection 
* feat(report):added account wise redirection

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2022-10-19 23:14:10 +05:30
barredterra
23f0bb45b0 fix: unset contact details 2022-10-19 12:26:56 +02:00
Maharshi Patel
96b4211ea1
fix: pricing rule for non stock UOM and conversions 
* fix: pricing rule for non stock UOM and conversions
 2022-10-18 22:26:11 +05:30
Deepesh Garg
e626107d3d chore: Update allow on submit for Sales Invoice fields 2022-10-17 16:48:13 +05:30
Deepesh Garg
d84fd6c925
Merge pull request #32245 from pps190/feat_scan_sound 
feat(stock): Audible indication of barcode scan status.
 2022-09-26 17:02:37 +05:30
Shashank Shirke
785eaf8e8f
fix: broken link for item valuation updated 
Old URL (404 Not Found): https://docs.erpnext.com/docs/v13/user/manual/en/stock/item/item-valuation-fifo-and-moving-average

Updated URL: https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/calculation-of-valuation-rate-in-fifo-and-moving-average
 2022-09-18 05:42:47 -07:00
Devin Slauenwhite
32e75ff808 feat: audible indication of scan status. 2022-09-16 17:58:01 -04:00
Devin Slauenwhite
613c8158a8 fix: actually reject process_scan when update_table fails. 2022-09-16 17:49:00 -04:00
Rohit Waghchaure
f5bd3fa952 fix: suggestion threshold label and rule was not working for other items with min and max amount 2022-09-16 16:03:08 +05:30
Rohit Waghchaure
ef7def8f1d fix: inventory dimension filter's label not showing in the reort 2022-09-07 14:43:12 +05:30
Deepesh Garg
1cb7ae16ab chore: Linting issues 2022-08-23 09:12:20 +05:30
Deepesh Garg
3b15966cc9 fix: Cash and non trade discount calculation 2022-08-21 17:51:05 +05:30
Sagar Vora
d05082987f fix: set company_address for purchases in party.js 2022-08-08 06:04:10 +00:00
Sagar Vora
a3625b3817 fix: set billing_address for purchases in get_party_details 2022-08-08 06:04:10 +00:00
Nabin Hait
29b8715205 fix: mentions in notes, workspace links, no-of-employees field type and report fixes 2022-07-22 15:33:39 +05:30
Marc de Lima Lucio
048c037842
FIX: quality inspection quick creation from purchase receipt: pre-fill sample size if available (#31544) 
FIX: quality inspection quick creation from transaction documents: pre-fill sample size if available

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2022-07-21 13:46:59 +05:30
rohitwaghchaure
5a3999e236
Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension 
feat: Inventory Dimension
 2022-07-20 19:47:14 +05:30
Rohit Waghchaure
dbec5cff00 feat: Inventory Dimension 2022-07-20 16:02:13 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation 2022-07-12 19:27:19 +05:30
Rucha Mahabal
ef02e58859 Merge branch 'develop' into hr-separation 2022-07-07 13:46:54 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting 2022-07-05 11:25:08 +05:30
Deepesh Garg
6bb203d1f5
Merge pull request #31410 from alyf-de/apply-price-list 
fix: apply price list rate
 2022-07-02 22:47:55 +05:30
Ankush Menat
7e40c86c56
fix(UX): dont apply price list when changing batch on mapped docs (#31503) 
fix(UX): dont apply price list batch change on mapped docs
 2022-07-01 20:08:16 +05:30
Rucha Mahabal
466bf99835 fix: Remove Expense Claim from Bank Reconciliation 
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
 2022-07-01 19:01:17 +05:30
Rucha Mahabal
ef7299470b Merge branch 'develop' into hr-separation 2022-07-01 11:30:25 +05:30
Sagar Sharma
6589c5f5e9
Merge branch 'develop' into subcontracting 2022-06-29 17:29:24 +05:30
gn306029
2a619fd789
fix: Modify opts parameter misspell (#31476) 
Modify opts parameter misspell 

closes #31474
 2022-06-29 14:45:21 +05:30
Sagar Sharma
78ff1783b1 Merge branch 'develop' into subcontracting 2022-06-28 22:20:32 +05:30
Rucha Mahabal
6a65c8aff4 Merge branch 'develop' into hr-separation 2022-06-28 11:51:59 +05:30
Rucha Mahabal
ba8ea0f4fb chore: Remove HR templates and references from other workspaces 
- Removed template `employees_to_mark_attendance.html`

- Removed HR references from ERPNext Settings and Home workspaces
 2022-06-27 16:56:24 +05:30
Rucha Mahabal
1d5c8660bb chore: Remove regional HR reports, custom field setups 
- Removed reports Provident Fund Deductions, Professional Tax Deductions, helper js file `salary_slip_deductions_report_filters.js`

- Removed Gratuity rules setup for India and UAE

- Removed custom field setup for India

- Moved all setups to the HRMS app
 2022-06-27 15:12:05 +05:30
Nabin Hait
2d226be3c4 fix: Made no of employees a select field 2022-06-25 11:40:23 +05:30