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

4194 Commits

Author SHA1 Message Date
Ankush Menat
6c5b01c60d
perf: index barcode for faster scans (#30543) 2022-04-01 15:27:46 +05:30
Rohit Waghchaure
2f51011f91 test: test case to check pick list name has mapped or not 2022-03-31 18:47:09 +05:30
Rohit Waghchaure
2f63ae2ee9 feat: minor, pick list item reference on delivery note item table 2022-03-31 18:43:42 +05:30
Ankush Menat
b981fae5a4
fix: remove naming series from bin, repost queue (#30497) 
Removing naming series from:
1. Bin
2. Repost queue

These doctypes are not user facing and dont really need naming series.
Current implementation of naming makes stock transaction sequential if
these documents are to be created during submission.
 2022-03-30 21:46:15 +05:30
Marica
7e719a12f1
Merge pull request #30377 from marination/stock-entry-items-idx 
fix: Dont set `idx` while adding WO items to Stock Entry
 2022-03-30 11:14:18 +05:30
Saqib Ansari
87dc9c6331
Merge pull request #30470 from nextchamp-saqib/fix-dn-credit-limit-validation 
fix: credit limit validation in delivery note
 2022-03-30 11:08:25 +05:30
Ankush Menat
b80fac03af
fix: validate 0 transfer qty in stock entry (#30476) 2022-03-29 17:19:22 +05:30
Saqib Ansari
c122882884 fix: credit limit validation in delivery note 2022-03-29 13:36:00 +05:30
marination
639d380c1f chore: Remove redundant idx query and value setting 
- idx can be removed from `select_columns` as it is already in the main query
- setting idx to '' is not required as it is not used further
 2022-03-28 21:00:00 +05:30
Ankush Menat
40d7418dca Merge branch 'develop' into stock-entry-items-idx 2022-03-28 20:21:21 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Ankush Menat
c34847e801 refactor: dont hardcode child table "items" 2022-03-28 12:07:00 +05:30
Ankush Menat
69ae2661d2 fix: update picked qty on cancellation 2022-03-28 10:43:32 +05:30
Ankush Menat
f06ef17b5d fix: copy has_batch_no and has_serial_no while duplicating 2022-03-25 16:18:58 +05:30
Ankush Menat
f4b39b87e3 fix(UX): use autocomplete for variant fields 2022-03-25 16:18:58 +05:30
Saqib Ansari
9a0f5bff65
Merge branch 'develop' into fix-pos-issues-again 2022-03-25 10:52:08 +05:30
Ankush Menat
788d492757 test: basic item and wh capacity dashboard tests 2022-03-25 10:51:19 +05:30
Saqib Ansari
cb4873c019 fix: sider issues 2022-03-24 17:56:27 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again 2022-03-24 11:18:13 +05:30
marination
a787ebb732 fix: Dont set idx while adding WO items to Stock Entry 
- `idx` must be computed by base document's `self.append()` function, so do not set it
 2022-03-23 14:59:27 +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
Saqib Ansari
f2ae63cbfd fix(pos): remove returned sr. nos. from pos reserved sr. nos. list 2022-03-22 17:41:49 +05:30
Ankush Menat
41db43cdc5 fix: consider full integer batch nos 2022-03-22 16:40:17 +05:30
Ankush Menat
a18c687844 fix: ignore already fetched serial no 
exclude_sr_nos is sent as JSON string of list, so load it before
operating on it.
 2022-03-22 16:40:17 +05:30
Ankush Menat
d3be84bfe8 test: correct use of test decorator 2022-03-21 15:40:34 +05:30
Ankush Menat
c2aad115c1
fix: disable deferred naming on SLE/GLE if hash method is used. (#30286) 
* fix: dont rename GLE/SLE that dont have naming series

* test: tests for deferred naming of ledgers
 2022-03-20 19:26:34 +05:30
HENRY Florian
ca8d757691
fix: clear "Retain Sample" and "Max Sample Quantity" in Item card if Has Batch No is uncheck (#30307) 2022-03-20 15:27:00 +05:30
Ankush Menat
4859574233 perf: Single query to delete bins instead of N 2022-03-19 20:55:27 +05:30
Ankush Menat
684d9d66d1 test: warehouse conversion and treeview test 2022-03-19 20:55:27 +05:30
Ankush Menat
953afda01b refactor(warehouse): raw query to ORM 2022-03-19 20:55:27 +05:30
Ankush Menat
4b695915f4 refactor: Use QB for serial fetching query 2022-03-19 20:55:27 +05:30
Ankush Menat
a585dff6fd refactor: batch no filter handling 2022-03-19 20:55:27 +05:30
Ankush Menat
b9eec331e3 test: auto serial fetching 2022-03-19 20:55:27 +05:30
Ankush Menat
4f8bb91eae fix: sort serial nos before sending 2022-03-19 20:55:27 +05:30
Ankush Menat
0a533d6ccc fix: skip already selected serials in sr selector 2022-03-19 20:55:27 +05:30
mergify[bot]
c2cbd407c1
fix: Allow on Submit for Material Request Item Required Date (#30174) (#30308) 
* fix: Allow on Submit for Material Request Item Required Date

* chore: whitespace

(cherry picked from commit cca9668309711bf3ca517726a94df547c5a16bbb)

Co-authored-by: Devarsh Bhatt <58166671+bhattdevarsh@users.noreply.github.com>
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
 2022-03-19 20:31:06 +05:30
rohitwaghchaure
da16ee159a
Merge pull request #30238 from KrithiRamani/bulk_create_PL_and_DN 
feat: Create single PL/DN from several SO.
 2022-03-17 15:39:45 +05:30
Ankush Menat
76187d175f
refactor: call repost directly during tests (#30277) 
enqueue(now=frappe.flags.in_test) is always true in test, this change avoids
confusion.
 2022-03-16 19:50:56 +05:30
Noah Jacob
2a0ca7c91a
refactor: removed unrequired code and test for standalone delivery note serial return (#30276) 2022-03-16 19:27:47 +05:30
Krithi Ramani
a12895ec03 corrected spacing 2022-03-16 13:56:54 +05:30
Ankush Menat
b46d6e3c05 test: packed item return scenarios 2022-03-16 13:36:53 +05:30
Ankush Menat
b781e8b7d1 revert: "fix: updated packed_items getting fetched on Sales Return / Credit Note (#28607)" 
This reverts commit 20216fa9f1.
 2022-03-16 13:36:53 +05:30
Krithi Ramani
0211f27e83 as per review comments - changed for loop 2022-03-16 12:28:30 +05:30
Krithi Ramani
e970616b51 removed semicolon for break statement 2022-03-15 21:52:34 +05:30
Krithi Ramani
f33a725a9e fixed spacings 2022-03-15 15:35:51 +05:30
Deepesh Garg
07715118cf
Merge pull request #30206 from deepeshgarg007/implicit_pricing_rule_enable 
fix: Do not update ignore prcing rule check implicitly
 2022-03-14 21:46:24 +05:30
Ankush Menat
8e559f01c8 test: refactor BOM quality template test 2022-03-14 18:28:08 +05:30
Florian HENRY
9415229e8d fix: BOM - clear Quality Inspection Template according to Inspection Quality Required 
Squashed commit of the following:

commit b73fa210b234d2c8067db2c32f94f362b89afe5a
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Mon Mar 14 08:30:24 2022 +0100

    add json tes

commit 984d015a7d9aceb6ea64be7ed9f1cc0caa356714
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Mon Mar 14 08:30:06 2022 +0100

    better test

commit 42061146658598da02eda7cb781bd2cf44c8ca34
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 16:12:57 2022 +0100

    update test

commit 6259c0957566600b044fcd4a5e14e69cdff71020
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 13:59:13 2022 +0100

    update test

commit cbc4ad9566f6f7f01dd622651458fea309d80954
Merge: faa44b3fdd 94d0f8d4e7
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 12:46:48 2022 +0100

    Merge branch 'develop' of https://github.com/frappe/erpnext into dev_fix_30190

commit faa44b3fdd983adfc04bbf04a7ebfef114501bb3
Author: Florian HENRY <florian.henry@open-concept.pro>
Date:   Fri Mar 11 12:03:35 2022 +0100

    fix: clear Quality Inspection Template according to Inspection Quality Required
 2022-03-14 18:25:00 +05:30
Krithi Ramani
466df6bdb7 to enable selection of SO irrespective of customer,removed validation for customer 2022-03-14 17:29:02 +05:30