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

3091 Commits

Author SHA1 Message Date
Raffael Meyer
905a50cbb2
Merge branch 'develop' into incoterms 2022-11-25 16:50:55 +01:00
s-aga-r
12d7b7e9c2 chore: linters 2022-11-18 11:42:44 +05:30
Sagar Sharma
cbfd8da848
Merge branch 'develop' into internal_transfer 2022-11-18 10:38:37 +05:30
barredterra
029f22c549 feat: add incoterm to sales transactions 2022-11-17 22:17:59 +01:00
Sabu Siyad
2f4940cc26
fix(pos): item selector image border radius 
Signed-off-by: Sabu Siyad <hello@ssiyad.com>
 2022-11-17 13:21:47 +05:30
Vishal
71412f6877 fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt 2022-11-16 13:53:21 +05:30
Ankush Menat
c013db6ea1
fix: cast POS query inputs to integers (#32975) 
fix: cast POS query inputs to integers
 2022-11-15 18:10:45 +05:30
Deepesh Garg
06a42caa5b
Merge pull request #32923 from deepeshgarg007/rate_quotation 
fix: Maintain same rate between Quotation and Sales Order
 2022-11-10 19:52:27 +05:30
Deepesh Garg
8f65677cb4
Merge pull request #32912 from nabinhait/customer-supplier-tab-break 
fix(ux): Tab break in Customer and Supplier form
 2022-11-10 18:30:14 +05:30
Deepesh Garg
362ec7b673 fix: Maintain same rate between Quotation and Sales Order 2022-11-10 18:28:08 +05:30
Ankush Menat
7e1742956c
refactor: Remove usage of deprecated methods (#32914) 
Warn: Just used regex to replace all usage.
```regex
s/frappe.db.set(\(.*\),\(.*\),\(.*\))/\1.db_set(\2, \3)/g
```

Required after: https://github.com/frappe/frappe/pull/18815
 2022-11-09 20:09:06 +05:30
Nabin Hait
fb7ee301b5 fix(ux): Tab break in Customer and Supplier form 2022-11-09 18:03:23 +05:30
Deepesh Garg
90fbab4b1e
Merge pull request #32847 from maharshivpatel/fix-pos-opening-entry-profile-filter 
fix: Create POS Opening Entry POS Profile filter.
 2022-11-05 16:44:39 +05:30
Deepesh Garg
4ff06a9d79
Merge pull request #32844 from deepeshgarg007/auto_allocate_advances 
fix: Auto advance allocation against partial invoices
 2022-11-05 16:27:59 +05:30
Deepesh Garg
428971f127 test: Check parital payment allocation 2022-11-04 15:50:39 +05:30
Maharshi Patel
1328a45f2a fix: Create POS Opening Entry POS Profile filter. 
pos_profile_query was variable instead of function.
 2022-11-04 15:29:17 +05:30
Rohit Waghchaure
b0fc568c80 fix: not able to select customer / supplier 2022-11-03 11:24:58 +05:30
Deepesh Garg
8581b7820d
Merge pull request #32713 from ernestoruiz89/patch-9 
fix: add missing translation function on report related documents
 2022-11-03 09:46:43 +05:30
ruthra kumar
c3dc1c272b
Merge pull request #32816 from ruthra-kumar/advance_paid_in_so_and_po 
fix: update advance paid in SO/PO from Payment Ledger
 2022-11-02 16:27:56 +05:30
ruthra kumar
721ac6b847 test: SO advance paid on Payment submission and cancellation 2022-11-02 15:54:23 +05:30
Deepesh Garg
b98d25dafb
Merge pull request #32777 from deepeshgarg007/sales_order_advance_paid_amount 
fix: Reset advance paid amount on Order cancel and amend
 2022-10-31 21:38:43 +05:30
Deepesh Garg
92f37ca111 fix: Reset advance paid amount on Oreder cancel and amend 2022-10-31 19:01:54 +05:30
Deepesh Garg
cca36cab70
Merge pull request #32744 from ruthra-kumar/so_terms_report_enhancement 
refactor: additional filters on Payment Terms status report
 2022-10-29 11:09:43 +05:30
Deepesh Garg
25eac80ae6
Merge pull request #32718 from deepeshgarg007/total_sales_amount_project 
fix: Total Sales amount update in project via Sales Order
 2022-10-28 20:46:00 +05:30
ruthra kumar
fed39a53cb test: due date filter on Payment Terms report 2022-10-28 18:15:58 +05:30
ruthra kumar
4765f937ea fix: key error in filter access 2022-10-28 17:50:01 +05:30
ruthra kumar
aadb6b1772 feat: additional filters on Payment terms report 
Filter on Status and Due dates
 2022-10-28 17:46:06 +05:30
Deepesh Garg
16959c0a8c
Merge pull request #32717 from deepeshgarg007/discount_section_collapse 
fix: Add condition for discount section collapse
 2022-10-28 11:24:25 +05:30
Deepesh Garg
6063c4e3c0 fix: Total Sales amount update in project via Sales Order 2022-10-26 18:01:39 +05:30
Deepesh Garg
4cd65027c4 fix: Add condition for discount section collapse 2022-10-26 16:48:24 +05:30
Ernesto Ruiz
b7b53b5857
fix: correct linters 2022-10-25 22:34:21 -06:00
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
Deepesh Garg
fb3da124e5 chore: linting issues 2022-06-14 10:50:38 +05:30
Conor
00ef499739
refactor: use db independent offset syntax (#31345) 
* chore: use db independent offset syntax

* fix: typo

* style: reformat code to black spec

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2022-06-14 10:49:07 +05:30
Deepesh Garg
eb93564db6 Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues 2022-06-11 21:56:24 +05:30
Deepesh Garg
118c786e63 fix: Partially Ordered status for quotation 2022-06-11 21:55:59 +05:30
Deepesh Garg
2fc04f661a fix: Company address filter in quotation 2022-06-10 19:23:17 +05:30
Ankush Menat
1646fbe478
refactor: remove add_fetch (#31315) 
- Sales Team already had fetch from set up
- Set up fetch from on sales partner in sales transaction

Reason for removal: the JS code applies arbitrarily to any field called "sales_person"
 2022-06-10 13:52:17 +05:30
Deepesh Garg
c13e5ad741
fix: Reset represents company on disabling internal customer and supplier (#31302) 2022-06-09 19:18:52 +05:30
Ankush Menat
65b21ee7d6 fix: internal transfer GLE validation 2022-06-08 19:26:40 +05:30
Deepesh Garg
2041738e04
Merge pull request #31194 from ruthra-kumar/bug_sales_order_analysis_report 
fix: incorrect billed_qty in sales order analysis report when multiple delivery notes for item
 2022-06-06 16:39:13 +05:30
Deepesh Garg
21de550549
Merge pull request #31219 from deepeshgarg007/group_filter_cost_center 
fix: Parent dimension filters in orders
 2022-06-06 08:58:40 +05:30
Deepesh Garg
3f376cc3a5 fix: Parent dimension filters in orders 2022-06-02 13:57:54 +05:30
Deepesh Garg
753eb3ec3a
Merge branch 'develop' into bug_sales_order_analysis_report 2022-05-31 21:41:35 +05:30
Deepesh Garg
5fd31c6433
Merge pull request #31199 from deepeshgarg007/settings_perm_fix 
fix: Permission for selling and buying settings
 2022-05-31 21:40:55 +05:30
maharshivpatel
b3ccc4bfb9
fix: Auto Insert Item Price If Missing when discount & blank UOM (#31168) 
* fix: Auto Insert Item Price If Missing when discount and blank UOM

fixes wrong item price insert when discount is used and adds uom=stock_uom instead of blank as price is converted to stock uom

* unit tests added for item with discount

I have added test  for auto_insert_price where discount is used.

* unit test issue fixed

fixed make_sales_order as some of the test that depended on it were failing due to passing of incorrect parameters.

Co-authored-by: Ankush Menat <me@ankush.dev>
 2022-05-31 19:48:30 +05:30
Deepesh Garg
a6beafbc3c fix: Permission for selling and buying settings 2022-05-31 19:41:46 +05:30
ruthra kumar
4f1bfbb93d test: multiple delivery notes and billed quantity 2022-05-31 17:24:36 +05:30
ruthra kumar
0331e37982 fix: incorrect billed_qty when item has multiple Delivery note 
sales order analysis report returns incorrect billed_qty value for
an SO item has multiple delivery notes
 2022-05-31 17:15:31 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool (#31183) 2022-05-31 15:35:40 +05:30
ruthra kumar
59ed7c854d refactor: ignore linked Payment Ledger Entry in basic transactions 2022-05-20 18:21:47 +05:30