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

2169 Commits

Author SHA1 Message Date
s-aga-r
ac24d778e8 refactor: add Docstrings for functions 2023-04-05 19:48:15 +05:30
s-aga-r
ef34f703d4 fix(ux): don't show Stock Reservation btn if Stock Reservation is disabled 2023-03-31 22:08:12 +05:30
s-aga-r
632f27b10d fix(ux): Reserve Stock and Reserved Stock Qty in SO Item 2023-03-31 21:58:21 +05:30
s-aga-r
de1492759d feat: add option to reserve stock in SO 2023-03-31 21:42:13 +05:30
s-aga-r
0ae400c986 feat: add option to unreserve stock in SO 2023-03-31 15:38:16 +05:30
s-aga-r
81fe5cfd72 chore: update Reserve Stock label to Reserve Stock on Submit in SO 2023-03-31 13:06:30 +05:30
s-aga-r
2d3997b2d7 refactor: remove Against Stock Reservation Entry field from DN Item 2023-03-31 12:16:59 +05:30
s-aga-r
e286d05904 fix: SRE Available Qty to Reserve for Group Warehouse 2023-03-30 16:26:42 +05:30
s-aga-r
7d0bc0914d Merge branch 'develop' into stock-reservation 2023-03-28 12:25:17 +05:30
s-aga-r
00ac49f81b refactor(minor): SRE functions 2023-03-27 12:18:40 +05:30
s-aga-r
3602d1909e fix: map DN items based on SRE 2023-03-26 17:33:01 +05:30
s-aga-r
744166da73 fix(ux): unable to uncheck Reserve Stock button in SO 2023-03-26 12:14:00 +05:30
s-aga-r
9652cb8de5 chore: create SRE on SO submission 2023-03-25 15:50:00 +05:30
Raffael Meyer
8c7fa5712b
feat: deprecate get_customer_list (#34563) 2023-03-24 12:13:53 +05:30
s-aga-r
1ccdf588e2 fix(ux): Reserve Stock button behaviour in SO 2023-03-23 13:34:40 +05:30
Raffael Meyer
f7bf1b8a0c
fix: unset address and contact on trash (#34495) 
* fix(Customer): unset address and contact on trash

* fix(Supplier): unset address and contact on trash

---------

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
 2023-03-23 11:52:32 +05:30
Raffael Meyer
79911734e9
fix: translations and UX in alternative item mapping (#34433) 
* fix: disable deletion in alternative item mapping

* feat: german translations

* fix: make string translatable

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-03-21 16:20:11 +05:30
s-aga-r
f858f657a0 feat: add Stock Reservation Entry ref in SO connections 2023-03-21 13:28:31 +05:30
s-aga-r
50de868285 chore: add Stock Reserved Qty field in SO Item 2023-03-21 13:17:58 +05:30
s-aga-r
0700063379 chore: add Reserve Stock check field in Sales Order 2023-03-20 23:55:33 +05:30
s-aga-r
53701c37b1 feat: consider over_order_allowance while validating sales order qty 2023-03-03 22:03:54 +05:30
s-aga-r
d7da8928ac feat: add field Over Order Allowance (%) in Selling Settings 2023-03-03 11:19:28 +05:30
Deepesh Garg
6a89cb98ce
Merge pull request #33874 from frappe/alternative-items-quotation 
feat: Support for Alternative Items in Quotation
 2023-03-01 17:41:24 +05:30
ruthra kumar
a11d3327df fix(test): use standalone method to fetch work orders from SO 2023-02-24 21:07:49 +05:30
ruthra kumar
b6bad728cd fix: permission error while calling get_work_order_items 2023-02-24 21:07:46 +05:30
Marica
47ab26dedf
Merge branch 'develop' into alternative-items-quotation 2023-02-23 13:20:28 +05:30
marination
6b789e2f04 fix: Map only non alternative items from Quotation in Sales Invoice 
- Since there's no item selection, only Quotation selection :/
 2023-02-20 21:17:43 +05:30
marination
19456127cf fix: Handle Get Items From in Sales Order 
- Map all non alternatives from Quotation to SO if no selected items
- Show disclaimer mentioning that Qtns with alternatives must be mapped to SO from the Qtn form
 2023-02-20 20:52:14 +05:30
Marica
3c96791d52
fix: Use block variable 
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-20 12:04:14 +05:30
Devin Slauenwhite
c76352340d
fix(ux): customer/supplier docfield layout (#34125) 2023-02-19 11:37:32 +05:30
Tej Pochiraju
3f44ef8790
Allow bulk import of party specific item (#34083) 
Co-authored-by: Tej Pochiraju <tej@iotready.co>
 2023-02-16 10:11:25 +05:30
marination
74fab53e28 test: Alternative items in Quotation 
- Taxes and totals, mapping, back updation
 2023-02-15 15:04:00 +05:30
Marica
22010b745c
Merge branch 'develop' into alternative-items-quotation 2023-02-15 13:05:33 +05:30
Raffael Meyer
770369e5c1
feat: translate fixtures during runtime, not installation (#33996) 
feat: install untranslated fixtures from files

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-02-14 09:29:27 +05:30
Deepesh Garg
148703bfc2
feat: Setting to allow Sales Order creation against expired quotation (#33952) 
* feat: Setting to allow Sales Order creation against expired quotation

* chore: linting issues
 2023-02-13 10:27:55 +05:30
marination
db2076db69 refactor: Order based alternative items mapping 
- Alternatives must be followed by a non-alternative item row
- On submit, store non-alternative rows in hidden checkbox to avoid recomputation
- Check for valid/mappable rows by row name
- UI: Select from table rows.Add single row for original/alternative item in dialog
- UI: Indicator for alternative items in dialog grid
- UI: Indicator legend and description of table
- DB: Added check field 'Has Alternative Item' not to be confused with 'Has Alternative' in Mfg
 2023-02-06 16:25:38 +05:30
marination
03321f5f13 chore: Code simplification 
- Map is not required, avoid filter multiple times, use single loop instead
- Better variable name
- Reduce LOC
 2023-02-02 17:28:03 +05:30
marination
b3fe7c6dad fix: Consider only ordered alternative/original item for Quotation status 
- The original and its alternatives make a set of items where one is chosen
- While setting order status of Quotation, check if the chosen item from the set is fully ordered or not
- Filter out unselected items from the set
- Create a map containing the set of items and if they were ordered or not for ease of grouping
- The simple items will work as it used to
 2023-02-01 19:10:32 +05:30
marination
ece6358e60 fix: Iterate over list instead of map's output and formatting 2023-01-31 17:13:05 +05:30
marination
fa9b327501 chore: Validate 'alternative_to' field values, must be a valid non-alterntaive item from table 2023-01-30 16:27:01 +05:30
marination
94cacb60de feat: Filter rows to be mapped on server side mapping function 
- Pass dialog selections to `make_sales_order`
- Map either original item or its alternative depending on mapping
- Only qty check for simple rows (without alternatives and not an alternative itself)
 2023-01-30 13:54:30 +05:30
marination
cef7dfd0b4 feat: Dialog to select alternative item before creating Sales order 
- Users can leave the row blank in the dialog if original item is to be used
- Else users can select an alternative item against an original item
- In the document, users must check `Is Alternative Item` if needed and also specify which item it is an altenrative to since there are no documented mappings
 2023-01-26 14:36:25 +05:30
marination
91982d1e4f feat: Filter out alternative item rows in taxes and totals for Quotation 
- Added a Quotation Item field `is_alternative_item`
- Use filtered rows for taxes and totals computation
 2023-01-24 18:03:53 +05:30
Sagar Sharma
7a8e89e2fe
fix: incorrect rate and amount in MR Item (#33547) 
* fix: incorrect `rate` and `amount` in MR Item
 2023-01-22 18:04:13 +05:30
Rohit Waghchaure
02566a02a8 fix: incorrect actual qty for the packed item 2023-01-20 22:38:56 +05:30
Florian HENRY
e19161a8ee fix: Sales ORder Connections on Material Request 2023-01-16 21:03:18 +01:00
Raffael Meyer
dceef0397a
fix: allow to create sales order from expired quotation (#33582) 2023-01-16 08:53:37 +05:30
ruthra kumar
333907b7a5
Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (#33646) 2023-01-16 08:49:35 +05:30
Raffael Meyer
67cf7e1728
refactor: use DocStatus (#33594) 2023-01-15 17:34:16 +05:30
ruthra kumar
391f42db04 fix: Updating SO throws ordered_qty not allowed to change after submission 2023-01-12 13:18:03 +05:30