Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,337 Commits 3 Branches 0 Tags 1 GiB
48ed6381b3
Commit Graph

3010 Commits

Author SHA1 Message Date
Ernesto Ruiz
083a78135c
fix: add translate function to period in sales_analytics.py 2022-10-25 22:17:06 -06:00
Rohit Waghchaure
5f84993bae test: added test case to validate seachfields for customer, supplier 2022-10-24 16:10:47 +05:30
Raffael Meyer
4ad3002861
fix: allow to create Sales Order from expired Quotation (#32641) 2022-10-19 22:07:02 +05:30
Deepesh Garg
fd49503ba2 fix: Party account for multi-order invoices 2022-10-13 15:08:34 +05:30
Nabin Hait
e71c417f7e fix: minor cleanup 2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798 fix: more fields reordering related to Tab Break 2022-10-11 13:21:07 +05:30
Nabin Hait
7546562139 feat: Tab Break in Quotation 2022-10-11 13:18:21 +05:30
Nabin Hait
f6613e1e4c feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order 2022-10-11 13:18:21 +05:30
Maharshi Patel
e392ea1104 fix: POS properly validate stock for bundle products 
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.
 2022-09-27 23:44:56 +05:30
Deepesh Garg
d4b01f6ffd Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule 2022-09-20 14:58:48 +05:30
ruthra kumar
77fdc37cb7 fix: use default supplier currency if default supplier is enabled 2022-09-17 16:34:33 +05:30
Maharshi Patel
8c5b420aea fix: remove no_copy for ignore_pricing_rule 2022-09-16 18:26:00 +05:30
Rohit Waghchaure
b4a102d119 fix: internal transfer flow 2022-09-07 12:48:18 +05:30
MOHAMMED NIYAS
69ffef8c0e
fix: lost quotation not to expired 2022-08-29 14:47:43 +05:30
Solufyin
bd4b4ddd8b
fix: Purchase Order creation from Sales Order 2022-08-26 11:18:56 +05:30
Deepesh Garg
5187a9a5ad
Merge pull request #31776 from HarryPaulo/fix-net-amout-sales-analytics 
fix: for Tree Type item and item group show net amout
 2022-08-25 11:05:18 +05:30
ruthra kumar
3b4c0a3fc0
fix(minor): don't print tax rate if its '0' (#31838) 2022-08-16 16:35:46 +05:30
ruthra kumar
bb40e38451 fix: limit pos recent order page result 2022-08-09 19:35:43 +05:30
hrzzz
91762097a5 fix: for Tree Type item and item group show net amout 2022-08-03 13:09:23 -03:00
ruthra kumar
9439a7fd30
Merge pull request #31576 from ruthra-kumar/return_not_updating_so_billed_percentage 
fix: credite note for returned delivery note updates SO's billed percentage
 2022-07-25 11:24:00 +05:30
Deepesh Garg
538f5a9964
Merge pull request #31497 from HarryPaulo/develop 
fix: translated message for credit limit blocking
 2022-07-22 14:22:58 +05:30
Deepesh Garg
80b354f1c7
Merge pull request #31656 from ruthra-kumar/use_current_profile_in_pos_return 
fix: use current pos profile on sales return
 2022-07-22 13:10:53 +05:30
ruthra kumar
243f66fcd3 test: SO percentage billed when cr_note made against delivery return 2022-07-21 13:05:34 +05:30
Saqib Ansari
2eaa8b17bd
fix(pos): validate product bundles while submitting pos invoice (#31615) 2022-07-21 12:17:58 +05:30
ruthra kumar
5b85af5f1a fix: use current pos profile on sales return 2022-07-21 12:16:16 +05:30
Ankush Menat
67a74a4d14 fix: dont check first row on report load 
- This doesn't actually load the chart but leaves UI and data in
  inconsistent state
- On refresh it randomly keeps toggling the first row - confusing
  behaviour.
 2022-07-15 14:09:58 +05:30
Ankush Menat
ceeea6180e fix: dont override default report options in charts 
Sales analytics and purchase analytics reports are clearing the default
options which includes number shortening, axis options etc. This makes
report unreadable when dealing with large numbers.
 2022-07-15 14:09:58 +05:30
Ankush Menat
3031592368 chore: form tour location 
closes https://github.com/frappe/frappe/issues/17247

[skip ci]
 2022-07-11 11:50:57 +05:30
Deepesh Garg
f73408bfd6 fix: Unable to open quotation 2022-07-07 10:47:48 +05:30
hrzzz
8cd3eb5286 fix: translation / linters 2022-07-04 08:02:02 -03:00
Sagar Vora
05351bee8b Merge remote-tracking branch 'upstream/develop' into remove-india 2022-07-03 18:07:44 +05:30
hrzzz
fbb71a2611 fix: translated message for credit limit blocking 2022-06-30 16:14:51 -03:00
Ankush Menat
20dac08f5f
refactor: clean up product bundle client side code (#31455) 
refactor: clean up product bundle cient side code

- Remove deprecated CUR_FRM scripts
- Remove client side fetches and move it to doctype schema
 2022-06-27 15:54:54 +05:30
Sagar Vora
7f390fb755 Merge branch 'develop' into remove-india 2022-06-26 18:10:44 +05:30
Deepesh Garg
904e69e541
Merge branch 'develop' into quotation_order_item_syn 2022-06-25 19:46:20 +05:30
Nabin Hait
f904ac599e fix: merge conflicts and sider issues 2022-06-25 11:40:23 +05:30
Deepesh Garg
58fe220479 fix: Quotation and Sales Order item sync 2022-06-24 19:43:50 +05:30
Sagar Vora
0810674c8a Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-24 13:08:40 +05:30
hrzzz
8b1ff96e30 fix: translation for filter status on report 2022-06-21 15:10:19 -03:00
Deepesh Garg
f572c20009
Merge branch 'develop' into internal_trasfer_precision_loss 2022-06-21 10:45:02 +05:30
Sagar Vora
ec9861266e Merge remote-tracking branch 'upstream/develop' into remove-india 2022-06-19 22:57:22 +05:30
Deepesh Garg
e457288dba chore: fix condition 2022-06-17 18:56:53 +05:30
Deepesh Garg
02f9441e1a fix: Quotation lost update 2022-06-17 18:54:42 +05:30
Conor
74a782d81d
refactor: DB independent quoting and truthy/falsy values (#31358) 
* refactor: DB independent quoting and truthy/falsy values

* style: reformat to black spec

* fix: ifnull -> coalesce

* fix: coalesce -> Coalesce

* fix: revert pypika comparison

* refactor: convert queries to QB

* fix: incorrect value types for query

`=` query makes no sense with list of values

* fix: remove warehouse docstatus condition

* fix: keep using base rate as rate

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-17 17:01:27 +05:30
Ankush Menat
74007c8e91
fix(UX): hide irrelevant UOM fields (#31392) 
fix(UX): hide UOM-related fields if they are inconsequential
 2022-06-17 15:10:21 +05:30
Marica
fafdaff4d4
Merge branch 'develop' into so-to-wo-bom 2022-06-15 12:58:13 +05:30
Conor
b8f728a40a
refactor: use CURRENT_DATE instead of CURDATE() (#31356) 
* refactor: use CURRENT_DATE instead of CURDATE()

* style: reformat to black spec

* refactor: use QB for auto_close queries

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-15 12:07:33 +05:30
Nihantra C. Patel
37e9622426
fix: Spelling mistake in quotation depend on (#31362) 
Update quotation.json
 2022-06-15 12:02:57 +05:30
marination
9f2d325e67 fix: Pick Template BOM if variant BOM absent in WO popup from SO 
- Use `get_default_bom` in sales_order.py (reduce duplicate utility functions)
- Remove redundant if else in `get_work_order_items`
- `get_default_bom`: If no BOM and template exists try to fetch template BOM
- test: `get_work_order_items` via SO and if right BOM is picked
 2022-06-14 17:20:44 +05:30
Deepesh Garg
5b2ba087a3 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues 2022-06-14 10:50:47 +05:30