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

31568 Commits

Author SHA1 Message Date
marination
1d1e925bcf test: API hit via BOM Update Tool 
- test creation of log and it's impact
 2022-03-30 13:01:01 +05:30
Deepesh Garg
d4cc7c553e fix: Account currency validation 2022-03-30 12:43:18 +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
Marica
a51ba4cedf
Merge branch 'develop' into bom-update-tool 2022-03-30 10:36:15 +05:30
marination
b5ad626d23 fix: Linter 2022-03-30 10:22:05 +05:30
Saqib Ansari
6528218ac3 perf: skip warehouse validation for non-stock items 2022-03-29 18:43:33 +05:30
Ankush Menat
b80fac03af
fix: validate 0 transfer qty in stock entry (#30476) 2022-03-29 17:19:22 +05:30
Ankush Menat
b12fe0f15b
fix: dont check for failed repost while freezing (#30472) 
[skip ci]
 2022-03-29 13:54:26 +05:30
marination
fa3b953cf7 test: idx mapping correctness 2022-03-29 13:54:14 +05:30
Saqib Ansari
c122882884 fix: credit limit validation in delivery note 2022-03-29 13:36:00 +05:30
Marica
88a460b54e
Merge branch 'develop' into stock-entry-items-idx 2022-03-29 13:18:08 +05:30
Ankush Menat
0cb9cdb414
Merge branch 'develop' into fix-asset-warehouse-validation 2022-03-29 11:48:35 +05:30
Ankush Menat
76dce2eddc
fix: use name for links not item_code (#30462) 2022-03-29 11:21:03 +05:30
Saqib Ansari
b60fad6113 Merge branch 'develop' of https://github.com/frappe/erpnext into fix-asset-warehouse-validation 2022-03-29 10:50:21 +05:30
Saqib Ansari
136466d255 fix(asset): do not validate warehouse on asset purchase 2022-03-29 10:47:27 +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
63d892454b Merge branch 'develop' into bom-update-tool 2022-03-28 20:28:21 +05:30
Ankush Menat
40d7418dca Merge branch 'develop' into stock-entry-items-idx 2022-03-28 20:21:21 +05:30
Ankush Menat
3821a97a75 Merge branch 'develop' into mergify/bp/develop/pr-30395 2022-03-28 20:14:19 +05:30
Ankush Menat
494bd9ef78 style: format code with black 2022-03-28 18:52:46 +05:30
Ankush Menat
8dff4d66a4
fix: bom valuation - handle lack of LPP (#30454) 2022-03-28 18:18:23 +05:30
Sagar Vora
77c36f6d22
fix: set options for Currency field Incoming Rate (#30384) 2022-03-28 17:55:23 +05:30
Raffael Meyer
c01fe74cf0
fix(patch): fix failing patches (#30427) 
* patch: reload Opportunity

* patch: reload child tables before doctype
 2022-03-28 17:53:54 +05:30
Saqib Ansari
eea183957a
Merge pull request #30419 from nextchamp-saqib/fix-item-tax-template-patch 
fix: move item tax to item tax template patch
 2022-03-28 17:34:31 +05:30
rahib-hassan
500870b2b0 fix: enable row deletion in reference table 2022-03-28 15:25:01 +05:30
Ankush Menat
b58b1343bb refactor: dont harcode "serial_no" field 2022-03-28 12:07:00 +05:30
Ankush Menat
98468fab18 fix: ignore circular dependencies on barcode scan 2022-03-28 12:07:00 +05:30
Ankush Menat
806f420ddd fix: revert global flag added for erasing barcode 
This looked like a hack and doesn't even work anyway! how can row level
barcode-item relation be maitnained on entire form?
 2022-03-28 12:07:00 +05:30
Ankush Menat
17a2ceb5d1 style: prettier js 2022-03-28 12:07:00 +05:30
Ankush Menat
9f0e7949aa fix: clean up if item is not found 2022-03-28 12:07:00 +05:30
Ankush Menat
32e44f5121 fix: correctly capture first serial no 2022-03-28 12:07:00 +05:30
Ankush Menat
b3c604d679 refactor: dont hardcode child table name 2022-03-28 12:07:00 +05:30
Ankush Menat
3a8656b3c8 refactor: split data update responsibilty to multiple functions 
Apply "single responsibilty principle"
 2022-03-28 12:07:00 +05:30
Ankush Menat
c34847e801 refactor: dont hardcode child table "items" 2022-03-28 12:07:00 +05:30
Ankush Menat
893139f963 refactor: dont hardcode "scan_barcode" field 2022-03-28 12:07:00 +05:30
Ankush Menat
bd06ffab00 refactor: store scannned field as attr 2022-03-28 12:07:00 +05:30
Ankush Menat
2d15413c9e refactor: transaction.js -> barcode_scanner.js 2022-03-28 12:07:00 +05:30
Ankush Menat
18abb28744 fix(barcode_scan): dont add duplicate serial nos 2022-03-28 12:07:00 +05:30
Ankush Menat
b06123bc65 fix: trigger table_add on new row 2022-03-28 12:07:00 +05:30
Ankush Menat
a270f12855 fix(UX): reduce duration of barcode scan toasts 
default is 7 which is bit too much when you're scanning lots of items,
switched to 5 sec delay
 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
Deepesh Garg
18c5b24ac1 fix: Update condition 2022-03-27 19:20:37 +05:30
Deepesh Garg
fc09377de2 fix: Resolve conflicts 2022-03-27 19:18:32 +05:30
Ankush Menat
e401ad3f90 refactor: replace dead duplicate code 2022-03-26 19:33:00 +05:30
Ankush Menat
9daea6fa6c perf: slimmer and faster before_tests 2022-03-26 19:33:00 +05:30
Saqib Ansari
4766732b56
Merge branch 'develop' into fix-item-tax-template-patch 2022-03-26 11:48:41 +05:30
Saqib Ansari
8e7c214e9e
Merge branch 'develop' into fix-minor-custom-cash-flow 2022-03-26 11:48:40 +05:30
Deepesh Garg
2e9648538e fix: Check for onload property 
(cherry picked from commit 71402b43a776d4af98912223c8299c4fd8bfbbfe)
 2022-03-25 16:23:44 +00:00
Rucha Mahabal
ffec9516fa fix: do not update status to Paid if sanctioned amount is 0 2022-03-25 21:41:48 +05:30
Rucha Mahabal
2d915782cb chore: sort imports 2022-03-25 21:41:48 +05:30
Rucha Mahabal
edf0c0030e test: expense claim against fully and partially paid advances 2022-03-25 21:41:48 +05:30
Rucha Mahabal
0461223627 fix: Expense Claim conditions for Paid status 
- status doesn't change to Paid if the entire required amount is already covered via linked advances

- status doesn't change to Paid if the claim is partially paid via advances

- patch to update such uncancelled claims to Paid
 2022-03-25 21:41:48 +05:30
Deepesh Garg
19b1b1f4ba test: test for auto write-off amount 
(cherry picked from commit 6a50f36b3167d43b1e964d4f0cf96af587f1a4a2)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:12 +00:00
Deepesh Garg
b2ac773cca fix: Ignore for Purchase Invoices 
(cherry picked from commit d3fd2fd2c535733939ed69439301033052f45712)
 2022-03-25 15:27:11 +00:00
Deepesh Garg
8cfa3a9ece fix: Ignore for Purchase Invoices 
(cherry picked from commit ed38679d222e12709396fbb8dacbe9e25ea38ed7)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:11 +00:00
Deepesh Garg
d04d3038f5 fix: Client side changes for POS Write off amount 
(cherry picked from commit 2e33e748ea248acface128f759d3982635024399)

# Conflicts:
#	erpnext/public/js/controllers/taxes_and_totals.js
 2022-03-25 15:27:10 +00:00
Deepesh Garg
f57f4af1d9 fix: Write off amount wrongly calculated in POS Invoice 
(cherry picked from commit ee4258e42c33899fae7b7add8a676274259a40e0)
 2022-03-25 15:27:10 +00:00
Ankush Menat
0534cf6c9c
fix: show subassembly table always (#30422) 
[skip ci]
 2022-03-25 19:03:33 +05:30
Saqib Ansari
80c7d7064b
Merge branch 'develop' into fix-minor-custom-cash-flow 2022-03-25 17:16:42 +05:30
Saqib Ansari
5450542fdb fix: unsupported operand type(s) for +=: 'int' and 'NoneType' 2022-03-25 16:44:37 +05:30
Wolfram Schmidt
85b0d5fc77
fix: translations (#30387) 
fixed and added translation
 2022-03-25 16:22:23 +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
936267c934 fix: move item tax to item tax template patch 2022-03-25 15:45:13 +05:30
Saqib Ansari
33863cd6ab
Merge pull request #30324 from nextchamp-saqib/fix-pos-issues-again 
fix: multiple pos issues
 2022-03-25 15:34:54 +05:30
Deepesh Garg
a9d992ac9f
Merge pull request #30338 from deepeshgarg007/bank_transaction_currency_symbol_fixes 
fix: Currency symbol in bank transactions
 2022-03-25 14:39:01 +05:30
Deepesh Garg
97e102ceef fix: Condition 
(cherry picked from commit 2e0e6ca6b177043f673c05472ac3069f060d1563)
 2022-03-25 07:30:41 +00:00
Deepesh Garg
a83a0a03b1 fix: Revert rate calculation 
(cherry picked from commit 6937a498e71cffc56cad65141f561b4c8785d185)
 2022-03-25 07:30:40 +00:00
Deepesh Garg
54cdff7947 fix: Add back calculation for discount 
(cherry picked from commit 067564bd260437290b7cb190fb1cdc02eb658d0a)
 2022-03-25 07:30:40 +00:00
Deepesh Garg
174a6ec398 fix: Rate change issue on save and mapping from other doc 
(cherry picked from commit 13fcda57767c456dfca4c064c41ca4f80a1898b2)
 2022-03-25 07:30:40 +00:00
Shadrak Gurupnor
c4854bb1b1
fix: failing broken patches (#30409) 
* fix: failing broken patches

* refactor: simpler conditions

[skip ci]
 2022-03-25 12:49:37 +05:30
Saqib Ansari
9a0f5bff65
Merge branch 'develop' into fix-pos-issues-again 2022-03-25 10:52:08 +05:30
Saqib Ansari
16253a2f72 fix: set is_return & return_against in POS Invoice Reference table 2022-03-25 10:51:30 +05:30
Ankush Menat
788d492757 test: basic item and wh capacity dashboard tests 2022-03-25 10:51:19 +05:30
Ankush Menat
10d5fb8cd1 test: check printviews for all docs 2022-03-25 10:51:19 +05:30
Saqib Ansari
1b556d1c53 fix: test cases 2022-03-24 17:59:34 +05:30
Ankush Menat
d4ee31dc8f fix: consider all existing PO items 
When this is sent from API/client side doesn't send temporary_name it
can be flaky. Hence, use all available names for validation.
 2022-03-24 17:58:22 +05:30
Saqib Ansari
cb4873c019 fix: sider issues 2022-03-24 17:56:27 +05:30
Saqib Ansari
cf51a0a1b8 fix(pos): cannot close the pos if sr. no. is sold & returned 2022-03-24 16:22:36 +05:30
Ankush Menat
5b1d6055e6 fix: subassembly items linked to temporary name 
Production Plan tables for po_items and sub_assembly_items are prepared
client side so both dont exist at time of first save or modifying and
hence any "links" created are invalid. This change retains temporary
name so it can be relinked server side after naming is performed.

Co-Authored-By: Marica <maricadsouza221197@gmail.com>
 2022-03-24 15:00:05 +05:30
Ankush Menat
3d43c437ad fix: only validate qty for main non-subassy items 2022-03-24 15:00:05 +05:30
Marica
d24458ab77
fix: (ux) Add is_group=0 filter on website warehouse (#30396) 
- It does not support group warehouses right now and it is misleading
 2022-03-24 12:56:57 +05:30
Saqib Ansari
4aabe97565
Merge branch 'develop' into fix-pos-issues-again 2022-03-24 11:18:13 +05:30
Deepesh Garg
07c7ebfd99
Merge branch 'develop' into gst_state_number_unsetting 2022-03-23 22:04:13 +05:30
Ankush Menat
c9dcf31cf7 test: ensure super()setUpClass is called 2022-03-23 19:46:50 +05:30
Deepesh Garg
993cc287d5
Merge branch 'develop' into sales_person_dashboard 2022-03-23 16:11:22 +05:30
Ankush Menat
6418dc1606 fix: make auto created job cards "Open" 2022-03-23 15:50:46 +05:30
Ankush Menat
e1f5620654 fix: material transfer status should be before WIP 2022-03-23 15:50:46 +05:30
Ankush Menat
4aa74af90d fix: ignore items without info for pending qty computation 2022-03-23 15:46:40 +05:30
Ankush Menat
be16fb9dbb chore(DX): add sourceURL for debugging 2022-03-23 15:46:40 +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
78ca88d227 fix: Check if onload property exists in the form object 2022-03-23 13:55:05 +05:30
Deepesh Garg
c3f1ad78aa
Merge pull request #30361 from deepeshgarg007/tax_account_display 
fix: GST account not showing up in tax templates
 2022-03-23 13:17:11 +05:30
Deepesh Garg
3a1e31592e
Merge branch 'develop' into ignore_price_list 2022-03-23 09:27:44 +05:30
Deepesh Garg
405dcb1d3c fix: Add ignore pricelist for missing flows 2022-03-23 09:04:03 +05:30
Deepesh Garg
66ca085e39 fix: Changing item prices on converting orders/receipts to invoices 2022-03-22 23:03:41 +05:30
Deepesh Garg
57924599da fix: GST account not showing up in tax templates 2022-03-22 18:26:58 +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
f606d2ecc6
fix: flaky salary slip email test (#30358) 2022-03-22 17:36:18 +05:30