GangaManoj
6bfd5daba0
fix: Create separate section for Bundle Items
2021-09-02 20:02:35 +05:30
GangaManoj
2d9138ab64
feat: Populate Bundle Items table
2021-09-02 20:02:35 +05:30
GangaManoj
f10fdb4eeb
feat: Add Bundle Items table
2021-09-02 20:02:35 +05:30
GangaManoj
ba73df161d
fix: Make Sales Order field editable so the PO can be linked with an SO later
2021-09-02 20:02:35 +05:30
GangaManoj
bb7ad885da
fix: Hide Rate of Bundle Items while printing
2021-09-02 20:02:35 +05:30
GangaManoj
288d0191ab
fix: Make Rate column read only by default
2021-09-02 20:02:35 +05:30
GangaManoj
b9a33eca97
fix: Display Bundle Items right below the Items table
2021-09-02 20:02:35 +05:30
GangaManoj
1ecec7154b
fix: Enable Fetch If Empty for Rate
2021-09-02 20:02:35 +05:30
GangaManoj
2b56e62805
fix: Calculate Product Bundle price based on the prices of its child items
2021-09-02 20:02:35 +05:30
GangaManoj
084b27bb34
fix: Return if there are no Items
2021-09-02 20:02:35 +05:30
GangaManoj
9039effd69
fix: Get Bundle Items
2021-09-02 20:02:33 +05:30
GangaManoj
3e177ede13
fix: Remove comments
2021-09-02 20:01:06 +05:30
GangaManoj
fd8657d2f7
fix: Get data when grouped by invoice and otherwise
2021-09-02 20:00:49 +05:30
GangaManoj
498377fbbc
fix: Display only the Invoice rows in bold
2021-09-02 19:59:44 +05:30
GangaManoj
7ef5952176
fix: Remove base_rate and buying_rate for Invoice rows
2021-09-02 19:58:47 +05:30
GangaManoj
8478a83148
fix: Only update Product Bundle prices if 'Calculate Product Bundle Price based on Child Items' Rates' is enabled
2021-09-02 19:58:47 +05:30
GangaManoj
fc9557bbb6
fix: Calculate total buying_amount for each invoice
2021-09-02 19:58:47 +05:30
GangaManoj
b14a87eb2b
fix: Fetch bundle item details
2021-09-02 19:58:44 +05:30
GangaManoj
e52b0612fc
fix: Fetch base_net_total for each Invoice
2021-09-02 19:58:17 +05:30
GangaManoj
ae40c2ad34
fix: Remove qty from Sales Invoice rows
2021-09-02 19:58:15 +05:30
GangaManoj
d730f0e092
fix: Make Rate editable if editable_bundle_item_rates is checked
2021-09-02 19:56:55 +05:30
GangaManoj
39a3ffcb56
fix: Make fieldname more concise
2021-09-02 19:56:53 +05:30
GangaManoj
80b3a032fb
fix: Add checkbox to enable calculation of Product Bundle price based on child Items' rates
2021-09-02 19:52:18 +05:30
GangaManoj
58ef1e30a5
fix: Update Product Bundle rate based on its updated amount
2021-09-02 19:51:16 +05:30
GangaManoj
c37dc7ca33
fix: Update Product Bundle price based on the rates of its child Items
2021-09-02 19:51:16 +05:30
GangaManoj
0967d226ed
fix: Add editable Rate column
2021-09-02 19:51:16 +05:30
GangaManoj
272ca96d2c
fix: Populate Bundle Items table
2021-09-02 19:51:16 +05:30
GangaManoj
3b23341d35
fix: Add Bundle Items table
2021-09-02 19:51:16 +05:30
GangaManoj
316b65face
fix: Calculate total buying_amount and gross profit for each invoice
2021-09-02 19:51:16 +05:30
GangaManoj
0fa13fb3f1
fix: Remove Item Code and Item Name columns
2021-09-02 19:51:15 +05:30
GangaManoj
55781171cc
fix: Display Items in the format Item Code: Item Name
2021-09-02 19:51:14 +05:30
GangaManoj
6ab58c7faf
fix: Add items belonging to Product Bundles as children
2021-09-02 19:50:20 +05:30
GangaManoj
cacecbbaa5
fix: Set initial_depth to 3
2021-09-02 19:50:19 +05:30
GangaManoj
d2d9f7e758
fix: Assign indent and parent_invoice
2021-09-02 19:50:19 +05:30
GangaManoj
416d1ceb6f
fix: Make Invoice row bold
2021-09-02 19:50:19 +05:30
GangaManoj
fdfae33ff4
fix: Display items as descendants of invoices
2021-09-02 19:50:19 +05:30
GangaManoj
1f147e5b9e
fix: Display data in tree form
2021-09-02 19:50:19 +05:30
GangaManoj
7a7665d1d0
fix: Return data as dict if the report is grouped by Invoice
2021-09-02 19:50:16 +05:30
Deepesh Garg
20f1b74024
Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into gstr_1_cdnr_unregistered_json
2021-09-02 19:09:48 +05:30
Deepesh Garg
f9a1b6682c
fix: Linting issues
2021-09-02 19:08:48 +05:30
Frappe PR Bot
0fd037eb6a
fix: minor linting issues ( #27314 ) ( #27315 )
...
* fix: syntax error in gratuity
* fix: unpacking None into three variables
* fix: unexpected kwarg for delete_accounting_dimensions
(cherry picked from commit eec40513beankush@iwebnotes.com >
2021-09-02 18:28:41 +05:30
marination
10a450cb2c
fix: Failing search util import and patch
...
- Use simple function import instead of global variable to check if field is valid to index
- Commit after every 20 items in patch to create web items from items
2021-09-02 14:30:37 +05:30
marination
c5efb6dc35
feat: (minor) Backorder indicator and fixed inconsistencies
...
- Checkbox in website item to indicate if item is on backorder
- Indicator on listing on full page if availbale on backorder.
- fix: Allow provision to add any valid field from Website Item in Search Index
- fix: Settings filter fields are as per Item, make as per Website Item
- "Add to quote/ Go to Quote" if cart checkout is disabled
2021-09-02 14:07:59 +05:30
Suraj Shetty
258efd5949
Merge pull request #27311 from surajshetty3416/fix-remove-all-import-version-13-hotfix
2021-09-02 13:22:14 +05:30
Suraj Shetty
6751290988
fix: Use remove_all from file_manager
2021-09-02 13:20:34 +05:30
Marica
7c09a79dd4
Merge branch 'version-13-hotfix' into e-commerce-refactor
2021-09-02 10:25:14 +05:30
Devin Slauenwhite
e10fede1ae
fix: track salary slip ytd gross salary. ( #27215 )
...
* fix: track salary slip ytd gross salary.
* fix: ytd gross salary unique label
Co-authored-by: Ankush Menat <ankush@iwebnotes.com >
Co-authored-by: Jannat Patel <31363128+pateljannat@users.noreply.github.com >
2021-09-02 09:40:28 +05:30
Anupam Kumar
6d7ecb9290
Merge pull request #27291 from anupamvs/comany-name-field-issue
...
fix: mapping for company name lead->contact
2021-09-02 09:33:00 +05:30
Frappe PR Bot
cf4ff46c1e
fix: Org Chart fixes ( #27290 ) ( #27305 )
...
* fix(org chart): multiple root nodes not expanding on clicking Expand All
* fix: unstable filter inserts duplicate nodes
(cherry picked from commit f828d853e3ruchamahabal2@gmail.com >
2021-09-01 23:53:23 +05:30
Rohit Waghchaure
6440e4f970
Merge branch 'version-13-pre-release' into version-13
2021-09-01 22:33:12 +05:30
