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

2416 Commits

Author SHA1 Message Date
Sagar Sharma
d074c93ac7 refactor!: change "is_subcontracted" field type from "Select" to "Check" 2022-04-01 13:22:44 +05:30
Ankush Menat
3821a97a75 Merge branch 'develop' into mergify/bp/develop/pr-30395 2022-03-28 20:14:19 +05:30
Ankush Menat
b58b1343bb refactor: dont harcode "serial_no" field 2022-03-28 12:07:00 +05:30
Ankush Menat
98468fab18 fix: ignore circular dependencies on barcode scan 2022-03-28 12:07:00 +05:30
Ankush Menat
806f420ddd fix: revert global flag added for erasing barcode 
This looked like a hack and doesn't even work anyway! how can row level
barcode-item relation be maitnained on entire form?
 2022-03-28 12:07:00 +05:30
Ankush Menat
17a2ceb5d1 style: prettier js 2022-03-28 12:07:00 +05:30
Ankush Menat
9f0e7949aa fix: clean up if item is not found 2022-03-28 12:07:00 +05:30
Ankush Menat
32e44f5121 fix: correctly capture first serial no 2022-03-28 12:07:00 +05:30
Ankush Menat
b3c604d679 refactor: dont hardcode child table name 2022-03-28 12:07:00 +05:30
Ankush Menat
3a8656b3c8 refactor: split data update responsibilty to multiple functions 
Apply "single responsibilty principle"
 2022-03-28 12:07:00 +05:30
Ankush Menat
c34847e801 refactor: dont hardcode child table "items" 2022-03-28 12:07:00 +05:30
Ankush Menat
893139f963 refactor: dont hardcode "scan_barcode" field 2022-03-28 12:07:00 +05:30
Ankush Menat
bd06ffab00 refactor: store scannned field as attr 2022-03-28 12:07:00 +05:30
Ankush Menat
2d15413c9e refactor: transaction.js -> barcode_scanner.js 2022-03-28 12:07:00 +05:30
Ankush Menat
18abb28744 fix(barcode_scan): dont add duplicate serial nos 2022-03-28 12:07:00 +05:30
Ankush Menat
b06123bc65 fix: trigger table_add on new row 2022-03-28 12:07:00 +05:30
Ankush Menat
a270f12855 fix(UX): reduce duration of barcode scan toasts 
default is 7 which is bit too much when you're scanning lots of items,
switched to 5 sec delay
 2022-03-28 12:07:00 +05:30
Deepesh Garg
18c5b24ac1 fix: Update condition 2022-03-27 19:20:37 +05:30
Deepesh Garg
fc09377de2 fix: Resolve conflicts 2022-03-27 19:18:32 +05:30
Deepesh Garg
2e9648538e fix: Check for onload property 
(cherry picked from commit 71402b43a776d4af98912223c8299c4fd8bfbbfe)
 2022-03-25 16:23:44 +00:00
Deepesh Garg
19b1b1f4ba test: test for auto write-off amount 
(cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:12 +00:00
Deepesh Garg
8cfa3a9ece fix: Ignore for Purchase Invoices 
(cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:11 +00:00
Deepesh Garg
d04d3038f5 fix: Client side changes for POS Write off amount 
(cherry picked from commit 2e33e748ea248acface128f759d3982635024399)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:10 +00:00
Deepesh Garg
54cdff7947 fix: Add back calculation for discount 
(cherry picked from commit 067564bd260437290b7cb190fb1cdc02eb658d0a)
 2022-03-25 07:30:40 +00:00
Deepesh Garg
174a6ec398 fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)
 2022-03-25 07:30:40 +00:00
Ankush Menat
4aa74af90d fix: ignore items without info for pending qty computation 2022-03-23 15:46:40 +05:30
Ankush Menat
be16fb9dbb chore(DX): add sourceURL for debugging 2022-03-23 15:46:40 +05:30
Deepesh Garg
78ca88d227 fix: Check if onload property exists in the form object 2022-03-23 13:55:05 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list 2022-03-23 09:27:44 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
marination
f6e64c2cac fix: Product Filters Lookup 
- bind the right classes to the filter lookup field
- make class names more descriptive
- make filter lookup field more visible with white bg and border
- bind lookup input field js in `views.js`
- make filter lookup field functioning for atribute filters too
- added placeholder to lookup field
 2022-03-21 17:58:39 +05:30
Ankush Menat
0a533d6ccc fix: skip already selected serials in sr selector 2022-03-19 20:55:27 +05:30
Ankush Menat
5ec27c9055 fix: filter serial nos by selected batch number 2022-03-19 20:55:27 +05:30
Ankush Menat
f4c213379e fix: set current qty as default qty for stock entry 2022-03-19 20:55:27 +05:30
marination
8264d6b0bc fix: Sub-Categpry Routing in Item Group Page Listing pills 
- Use absolute route even 3-4 sub-category levels down
- Remove scroll from category pills due to accessibility issues
- Arrange sub-category pills alphabetically
 2022-03-15 16:53:46 +05:30
Deepesh Garg
d596e0e4df fix: Shipping rule application fixes 2022-03-10 20:56:36 +05:30
Rushabh Mehta
1e7df5d0c2 fix(minor): student attendance tool query fix 2022-02-26 11:07:44 +05:30
Rucha Mahabal
71d33081aa
fix: org chart connectors not rendered when Employee Naming is set to Full Name (#29997) 2022-02-25 23:01:32 +05:30
Deepesh Garg
25edc700bd
Merge pull request #29974 from deepeshgarg007/abbr_check 
fix: Make abbreviation limit to 10
 2022-02-25 15:52:51 +05:30
Saqib Ansari
81514516f3 fix(pos): coupon code is applied even if ignore pricing rule is check 2022-02-25 15:18:06 +05:30
Deepesh Garg
239733acd1 fix: Make abbreviation limit to 10 2022-02-23 20:41:49 +05:30
Marica
856d3f63b5
Merge pull request #29953 from marination/heart-icon-and-shop-by-category 
chore: Adjust heart icon to v14 icons in frappe (make consistent with v13) & misc fix
 2022-02-23 13:01:30 +05:30
marination
b0a1cd6a7b chore: Change heart icon to icon-heart and change var icon-stroke to accomodate changes in frappe icon 
- `icon-heart` got a stroke colour that needs to be overriden via var `icon-stroke
- Use `icon-heart` instead of `icon-heart-active` as the latter has a color fill now
 2022-02-23 00:13:44 +05:30
Deepesh Garg
bd80e04aa7
Merge pull request #29865 from deepeshgarg007/loan_bank_reco 
feat: Bank Reconciliation for loan documents
 2022-02-22 20:43:00 +05:30
Marica
235fc127b3
fix: Fetch conversion factor even if it already existed in row, on item change (#29917) 
* fix: Fetch conversion factor even if it already existed in row, on item change

* fix: Retain manually changed conversion factor

- If item code changes, reset conversion factor on client side
- Keep API behavious consistent, if conversion factor is sent, same must come back
- API should not ideally reset values in most cases
 2022-02-22 12:53:46 +05:30
Deepesh Garg
0d8c24f488 Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 22:22:02 +05:30
Ankush Menat
342d09a671 feat: get_valuation_rate batch wise 
This function is used to show valuation rate on frontend and also as
fallback in case values aren't available. Add "batch_no" param to get
batch specific valuation rates.

Co-Authored-By: Alan Tom <2.alan.tom@gmail.com>
 2022-02-21 18:02:40 +05:30
Deepesh Garg
b7c388976d Merge branch 'develop' of https://github.com/frappe/erpnext into loan_bank_reco 2022-02-21 16:58:52 +05:30
Deepesh Garg
555b1335f6 feat: Bank Reconciliation for loan documents 2022-02-17 19:15:30 +05:30
Saqib Ansari
2743999785 fix: coupon code is applied even if ignore_pricing_rule is enabled 2022-02-17 16:03:43 +05:30