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

35733 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuja P
f74d8d2e16 fix: suggested changes 2021-04-26 11:31:51 +05:30
Anuja P
dc599e0164 fix: to update Allocated amount after Paid Amount is changed 2021-04-23 19:24:53 +05:30
Anoop
c21ce42559
fix(patch): lab module patch fix (#25447) 
* fix(patch): lab module patch fix

* fix: param

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-22 22:44:44 +05:30
Saqib
3d4acf9e5c
fix: permission error after submitting exchange rate revaluation (#25432) 2021-04-22 16:16:03 +05:30
Rucha Mahabal
e3b8057eb4
fix: Laboratory Module patch (#25431) 2021-04-22 16:11:17 +05:30
Saqib
19b73968d7
fix(pos): validations & minor ui issues (#25351) 
* fix: pos print format

* fix: stock validation on pos invoice creation
 2021-04-22 13:38:20 +05:30
Mohammad Hasnain Mohsin Rajan
7f932cfb30
fix: display reconcile tool when closing balance 0 (#25417) 
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-04-22 04:53:09 +05:30
Alan
157b388209
fix: change subcontracted item display (#25425) 2021-04-21 21:00:22 +05:30
Nabin Hait
29d4ac13ac Merge branch 'version-13' into develop 2021-04-21 12:34:49 +05:30
Nabin Hait
db76612462 Merge branch 'version-13-pre-release' into version-13 2021-04-21 12:34:49 +05:30
Nabin Hait
c3b7c1b998 bumped to version 13.1.0 2021-04-21 12:54:49 +05:50
Nabin Hait
cb92ead061 fix: Added Change Log 2021-04-21 11:22:35 +05:30
Deepesh Garg
e7895cea71
Merge pull request #25393 from deepeshgarg007/loan_manager_amend 
fix: Add amend perm for loan and system manager for loan doctypes
 2021-04-20 22:21:52 +05:30
Deepesh Garg
6d88cf9ede
Merge branch 'develop' into loan_manager_amend 2021-04-20 19:08:31 +05:30
Syed Mujeer Hashmi
704ec132b7
feat:Inpatient Occupancy Table Editable for Healthcare Admin (#24989) 
Make Admitted datetime and  Discharge Datetime editable along with
Inaptient Occupancy Service Unit, Check_In and Check_out time.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-20 16:39:46 +05:30
gavin
59a2ebd2f4
Merge pull request #25156 from Alchez/feat-py3-dependencies 
feat: manage Python 3 compatiblity with dependencies
 2021-04-20 15:38:29 +05:30
Rohan Bansal
524b81abd9 feat: manage Python 3 compatiblity with dependencies 2021-04-20 14:13:55 +05:30
Marica
0278646fd8
fix: Cashier query in POS Opening/Closing Entry (#25399) 2021-04-20 12:53:33 +05:30
Marica
125c3d64a9
fix: Cashier query in POS Opening/Closing Entry (#25398) 2021-04-20 12:53:22 +05:30
Marica
b91fcbd70e
fix: Ignore Customer Group Perm on AlL Products page (#25396) 2021-04-19 22:21:07 +05:30
Marica
846200d069
fix: Ignore Customer Group Perm on AlL Products page (#25397) 2021-04-19 22:20:01 +05:30
Rucha Mahabal
c221682373
fix: Bulk Salary Structure Assignment (#25389) 2021-04-19 21:11:27 +05:30
Rucha Mahabal
923fb008c7
fix: remove non-standard module cards from Home Workspace (#25391) 2021-04-19 21:09:47 +05:30
Deepesh Garg
047044f975 fix: Add amend perm for loan and system manager for loan doctypes 2021-04-19 18:27:37 +05:30
Deepesh Garg
cb718fce88
feat: Role to allow over billing, delivery, receipt (#24854) 
* feat: Role to allow  over billing, delivery, receipt

* fix: Typo
 2021-04-19 13:25:15 +05:30
Rakshith N
ceba5774be
fix(pos): special character scanning in point of sale (#25353) 
Co-authored-by: rakshith.n <rakshith.n@promantia.com>
Co-authored-by: Saqib <nextchamp.saqib@gmail.com>
 2021-04-19 13:21:49 +05:30
Afshan
632166a933
fix: make filters for payroll entry (#25386) 2021-04-19 12:58:27 +05:30
Ankush Menat
edf3dfa5a4
fix: commit leave_allocation change to db (#25382) (#25383) 2021-04-19 12:47:41 +05:30
Jannat Patel
119b27b97f
feat: Delayed Tasks Summary (#25024) 
* feat: delayed deliverables summary

* fix: sider

* fix: renamed to delayed tasks

* fix: renamed test

* fix: test

* fix: sider

* fix: dates, validations and chart

* fix: space and column width

* feat: Sort tasks by descending order of delay

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-19 12:46:14 +05:30
Alan
ac8a467b0a
fix: exclude spurious Stock Entry Types from 'consumed' calculation (#25352) 
* fix: exclude spurious 'Stock Entry Type's from 'consumed' calculation

* fix: filter using purpose, make requested changes

Co-authored-by: Ankush Menat <ankush@iwebnotes.com>
 2021-04-19 12:38:25 +05:30
Ankush Menat
6c88ab07c7
fix: commit leave_allocation change to db (#25382) 2021-04-19 11:51:46 +05:30
Afshan
b6d2106184
fix: available employee for selection (#25378) 
* fix: available employee for selection

* fix: available employee for selection

fix: available employee for selection
 2021-04-19 11:48:43 +05:30
Afshan
9c9907cf8e
fix: available employee for selection (#25377) 
* fix: available employee for selection

* fix: available employee for selection

fix: available employee for selection
 2021-04-19 11:48:28 +05:30
Marica
e8bc912ffc
perf: Fetching exchange rate on every line item slows down PO (#25345) 
* fix: Dont fetch exchange rates for each line item once fetched at parent
`

* perf: Use price list conversion rate from parent

- If price list conversion rate exists in args already from earlier call, use that
- `get_price_list_currency_and_exchange_rate` wont be called for each child row

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-19 11:05:21 +05:30
Jannat Patel
dcdd3bebbe
feat: Timer in LMS Quiz (#24246) 
* feat: new fields in quiz doctypes

* feat: timer in lms quiz

* fix: variable initialisation

* fix: context, exception fix

* fix:sider

* fix:sider

* fix: indentation

* fix: timer

* fix: sider

* fix: return value and format

* fix: show time taken only after all attempts are over

* fix: sider

Co-authored-by: pateljannat <jannatpatel@MacBook-Air.local>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2021-04-19 10:36:40 +05:30
Ankush Menat
7eac4a250d
fix: functions using mutable defaults (#25370) 2021-04-19 10:33:39 +05:30
Saqib
e782531529
fix: Apply single transaction threshold on net_total instead of supplier credit amount (#25243) 
* fix: Apply single transaction threshold on net_total instead of supplier credit amount

* fix: Apply single transaction threshold on net_total instead of supplier credit amount

* fix: test

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-19 10:15:51 +05:30
Deepesh Garg
1e0d22a38f
Merge pull request #24805 from alyf-de/improve_taxes_setup 
refactor: Setup Taxes and Charges
 2021-04-19 09:12:47 +05:30
Raffael Meyer
9ee6e4feb8
Merge branch 'develop' into improve_taxes_setup 2021-04-18 18:34:41 +02:00
barredterra
d397bb1b74 Merge branch 'improve_taxes_setup' of https://github.com/alyf-de/erpnext into improve_taxes_setup 2021-04-18 18:34:02 +02:00
barredterra
80d44cada4 fix: remove is_default from country wise tax 2021-04-18 18:33:34 +02:00
rohitwaghchaure
4ed5d994a4
Merge pull request #25374 from ankush/shipment_status_update 
fix: commit  changes to shipment status in database
 2021-04-18 17:56:22 +05:30
Ankush Menat
c28fcba779
ci(semgrep): add correctness rule for on_cancel 
Changes done to doctype object in `on_submit` are not commited to
database. Add rule to catch similar bugs.
 2021-04-18 13:22:19 +05:30
Ankush Menat
e972ceb798
fix: patch for updating shipment status 2021-04-18 13:22:19 +05:30
Ankush Menat
9229ee1745
fix: update shipment status in database 
Caught by semgrep rule:
https://github.com/frappe/erpnext/blob/develop/.github/helper/semgrep_rules/frappe_correctness.yml#L4
 2021-04-18 13:22:19 +05:30
rohitwaghchaure
72e3a81878
Merge pull request #25375 from ankush/minor_semgrep_fixes 
fix: remove duplicate keys from dictionaries
 2021-04-18 13:04:00 +05:30
Raffael Meyer
ef4c494b2b
Merge branch 'develop' into improve_taxes_setup 2021-04-17 19:38:36 +02:00
barredterra
476fff149b Merge branch 'develop' into improve_taxes_setup 2021-04-17 18:41:31 +02:00
Ankush Menat
ad6a2657ae
chore: minor translation fixes 2021-04-17 16:56:09 +05:30
Ankush Menat
dedf2c1b61
fix: remove duplicate keys from dictionaries 2021-04-17 16:56:08 +05:30