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

35939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
pateljannat
3b54b1e975 fix: report name and columns 2021-04-19 16:49:28 +05:30
Rucha Mahabal
5d7f7094d6
Merge branch 'develop' into employee-util-report 2021-04-19 16:24:55 +05:30
Hussain Nagaria
1f8326bb1f chore: Add Report to Dashboard 2021-04-19 16:19:13 +05:30
Nabin Hait
840c921229
Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop 2021-04-19 13:30:19 +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
Deepesh Garg
bb746fcbe4 fix: Updated filters for process statement of accounts 2021-04-19 12:19:31 +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
Saqib
75e13f7bb6
fix(e-invoicing): add company validation for e-invoicing (#25348) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2021-04-17 15:38:47 +05:30
Saqib
18c7815a1b
fix: presentation currency in statement of accounts (#25367) 2021-04-17 15:37:40 +05:30
rohitwaghchaure
fbc0d16d8b
Merge pull request #25372 from ankush/eq_assignment_fix 
fix: equality check instead of assignment in cart
 2021-04-17 13:43:54 +05:30
rohitwaghchaure
1254af502b
Merge pull request #25362 from anupamvs/disable_rounded_total 
feat: added Disable Rounded Total in sales transactions
 2021-04-17 13:30:24 +05:30
Ankush Menat
d6be154ac2
fix: implicit string concatenation (#25371) 
* fix: implicit string concatenations

* chore: rerun healthcare patch for company fields
 2021-04-16 22:08:44 +05:30
Ankush Menat
67e647232c
ci(semgrep): Add semgrep testing (#24871) 
Adds semgrep testing in CI.

Refer to:
- https://github.com/frappe/frappe/pull/12524
- https://github.com/frappe/frappe/pull/12577
 2021-04-16 21:44:49 +05:30
Ankush Menat
adf974810d
fix: equality check instead of assignment in cart 2021-04-16 21:15:50 +05:30
Saqib
36247faf1a
fix(e-invoicing): add company validation for e-invoicing (#25349) 
* fix(e-invoicing): add company validation for e-invoicing

* fix: test
 2021-04-16 18:45:19 +05:30
Nabin Hait
eeece59a17
Merge branch 'develop' into disable_rounded_total 2021-04-16 18:44:17 +05:30
Marica
ede339f80b
fix: Serial No not updated correctly via Inter Company Stock Transfer (#25006) 
* fix: Serial No not updated correctly via Inter Company Stock Transfer

* chore: Added More Test Cases for inter company Serial Transfer

* fix: Test for serial no duplication

- fixed serial no test
- made errors more meaningful on serial no validation

* fix: Stock Reco Test

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
 2021-04-16 18:42:54 +05:30
Jannat Patel
b1aad63a99
fix: leave policy in leave allocation (#25334) 
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-04-16 16:08:22 +05:30
Hussain Nagaria
2399e84052 Merge branch 'employee-util-report' of https://github.com/NagariaHussain/erpnext into employee-util-report 2021-04-16 15:41:25 +05:30
Hussain Nagaria
f1b4ce7430 feat: Add filtering by department 
Also:

- Add department filter to js
- Add department column to report
- Fetch only those timesheets which have an Employee Linked
- Update unit tests
 2021-04-16 15:36:43 +05:30
Anupam
9d9c256e70 feat: added Disable Rounded Total in sales transactions 2021-04-16 00:11:40 +05:30
Afshan
4b496b65b7
fix: filter for employees in salary slip (#25361) 2021-04-15 23:53:12 +05:30
Afshan
c0db286dc1
fix: filter for employees in salary slip (#25360) 2021-04-15 23:48:25 +05:30
Ankush Menat
799b3c26a4
Merge pull request #25359 from 18alantom/fix_shipment_pickup_to 
fix: shipment pickup_to, pickup_from functionality.
 2021-04-15 21:16:24 +05:30
Ankush Menat
5207edc188
Merge branch 'develop' into fix_shipment_pickup_to 2021-04-15 21:01:52 +05:30
18alantom
6179cc1311 fix: make pickup_to and pickup_from mandatory fields 2021-04-15 20:36:28 +05:30