HarryPaulo
ebbe27c183
fix: subtract change_amount from paid_amount field on POS Register ( #30922 )
2022-05-09 15:14:57 +05:30
Saqib Ansari
867494edad
fix(pos): creating pos returns resets pricing rules & discounts ( #30935 )
2022-05-09 15:05:05 +05:30
Deepesh Garg
dbb37aefae
Merge pull request #30926 from frappe/mergify/bp/develop/pr-30065
...
fix: HSN-wise-summary of outward supplies Updated Report (backport #30065 )
2022-05-09 13:21:58 +05:30
Ankush Menat
7e2fbc050a
fix: sort before picking next stock reco
2022-05-09 13:16:02 +05:30
marination
1ce45f623e
fix: Set actual qty and basic rate in SE on warehouse triggers (get_warehouse_details)
...
- set `actual_qty` on source and target warehouse change
2022-05-09 13:00:00 +05:30
Rucha Mahabal
f92bc4dd33
fix: remove check for already allocated earned leaves ( #30931 )
...
* fix: remove check for already allocated earned leaves
* fix: do not set New Leaves Allocated field as read-only for earned leaves
- removing this until there's a better way to update existing allocations
2022-05-09 12:15:02 +05:30
Ankush Menat
ae842d8145
chore: remove datettime formatting from debug report
...
This hides some information that would otherwise help during debugging
2022-05-09 11:29:00 +05:30
Ankush Menat
7c839c4503
fix: double future qty updates
...
update_qty_in_future_sle is reprocessing rows which are already
processed by process_sle_against_current_voucher
2022-05-09 11:28:21 +05:30
Deepesh Garg
c9f6405b2a
chore: Resolve conflicts
2022-05-09 10:33:03 +05:30
Deepesh Garg
b3d5c74df5
Merge branch 'develop' of https://github.com/frappe/erpnext into mergify/bp/develop/pr-30065
2022-05-09 10:21:46 +05:30
Ankush Menat
95e41b0d48
chore: correct version in hooks
...
[skip ci]
2022-05-08 22:04:14 +05:30
Deepesh Garg
85c137b3aa
chore: Remove print statement
...
(cherry picked from commit a8fbd2451b498ad49356cf0e6a710616ab802465)
2022-05-08 14:07:00 +00:00
Deepesh Garg
3ae4b9033f
chore: Remove extra columns
...
(cherry picked from commit b0e929b8ae8780ada76ea6b699a2b4d840b31487)
# Conflicts:
# erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
2022-05-08 14:07:00 +00:00
Govind S Menokee
d99b4e29b9
fix: HSN-wise-summary of outward supplies Updated Report
...
Report changes done in order to meet the specification as per govt guideline - [GUIDELINE](https://taxguru.in/goods-and-service-tax/12-points-note-filing-gstr-1-01st-2021-onwards.html )
(cherry picked from commit 363752510ead7d3b86693d3659b2157753f2762d)
# Conflicts:
# erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
2022-05-08 14:06:58 +00:00
maharshivpatel
b8dc40b7a0
feat(india): cancel e-way bill is enabled with e-invoicing APIs. ( #30888 )
2022-05-07 18:59:27 +05:30
maharshivpatel
b825179286
feat(india): store e-way bill auto calculated distance in sales invoice ( #30908 )
2022-05-07 18:46:12 +05:30
Raffael Meyer
f3ad4f3c3b
Merge branch 'develop' into de-translate-employee
2022-05-06 19:57:42 +02:00
Rucha Mahabal
7f1024f8aa
feat(minor): fetch default salary structure and base from Employee Grade in Salary Structure Assignment ( #30918 )
2022-05-06 17:44:30 +05:30
Deepesh Garg
c05144fb60
Merge pull request #30897 from deepeshgarg007/general_ledger_consolidated
...
fix: Consider party and party type as well in group by consolidated view
2022-05-06 13:10:00 +05:30
Deepesh Garg
f255741b16
Merge pull request #30855 from Altizo/develop
...
fix: update translate
2022-05-06 13:04:24 +05:30
Deepesh Garg
d5dca69090
Merge pull request #30901 from alyf-de/translate-party
...
feat(German Translation)!: translate "Party" as "Partei"
2022-05-06 13:02:27 +05:30
Deepesh Garg
cf4128edba
Merge pull request #30900 from alyf-de/bank-account-website
...
feat: remove website from bank account
2022-05-06 13:01:28 +05:30
Ahmad
458f2fcd62
Merge branch 'develop' into feat-request-for-quotation
2022-05-06 11:54:07 +05:00
maharshivpatel
ee7a7eb782
fix(india): keyerror while generating e-way bill from an e-invoice ( #30879 )
2022-05-06 11:23:16 +05:30
barredterra
02b38a439f
fix: german translations for Employee
2022-05-05 20:37:51 +02:00
Devin Slauenwhite
e9cf5cb4b0
feat: add prompt qty flag to pick list
2022-05-05 10:47:06 -04:00
Devin Slauenwhite
0a77c28594
fix: cast value to Number type
2022-05-05 10:46:40 -04:00
Devin Slauenwhite
47b4251844
feat: prompt qty on scan
2022-05-05 09:39:19 -04:00
Ankush Menat
f31122cbc3
fix: disable form save on naming series tool ( #30909 )
2022-05-05 17:35:58 +05:30
Ankush Menat
ad7c113c0d
test: activation
2022-05-05 11:02:23 +05:30
Aditya Hase
912c1d0a1b
chore: Remove reference to Instructor doctype ( #30903 )
...
References:
https://github.com/frappe/erpnext/pull/30830
44c54f69f8
2022-05-05 10:40:42 +05:30
Ankush Menat
d48ab81622
fix: auto-fulfill picking list when not in scan mode
2022-05-04 12:43:31 -04:00
Devin Slauenwhite
7ae89dedd5
fix: cleanup dont_allow_new_row logic
2022-05-04 11:06:16 -04:00
Devin Slauenwhite
5560ceca62
fix: max qty message
...
Co-authored-by: Ankush Menat <ankushmenat@gmail.com>
2022-05-04 10:32:21 -04:00
Devin Slauenwhite
4a19c1c19d
Revert "fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it"
...
This reverts commit c2335ec0
2022-05-04 10:29:52 -04:00
Deepesh Garg
826c3f5c63
Merge pull request #30899 from deepeshgarg007/timesheet_link
...
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 19:54:06 +05:30
barredterra
5435da6d2b
feat(German Translation): translate "Party" as "Partei"
2022-05-04 16:20:20 +02:00
barredterra
f1b8a969cf
feat: remove website from bank account
2022-05-04 15:51:52 +02:00
Deepesh Garg
3e38dc7ea8
fix: Show linked time sheets in sales invoice dashboard
2022-05-04 17:30:52 +05:30
Deepesh Garg
c2d52a1ac0
fix: Consider paryt and party type as well in group by consolidated view
2022-05-04 15:59:24 +05:30
Deepesh Garg
8535ad46e9
Merge pull request #30882 from fproldan/issue_25414
...
fix: "Supplier Quotation Comparison" - Tools - Select Default Supplier
2022-05-04 14:23:17 +05:30
Ankush Menat
91cd5f5d4a
fix: show group warehouse in Sales Order ( #30891 )
2022-05-04 13:07:58 +05:30
Deepesh Garg
e8d6eb207d
fix: Ignore loan repayments made from salary slip
...
(cherry picked from commit b7e1d40e43c136f0e967111e10af95ddc80e2fd5)
2022-05-04 04:15:07 +00:00
Devin Slauenwhite
5d8e3f264c
Merge branch 'feat-picklist-scan' of /home/devin/repos/erpnext into feat-picklist-scan
2022-05-03 16:28:54 -04:00
Devin Slauenwhite
c2335ec0d8
fix(test): manually select picked_qty since before_submit validates qty instead of auto filling it
2022-05-03 16:28:28 -04:00
Francisco Roldán
5604dccdb6
Merge branch 'develop' into issue_25414
2022-05-03 13:27:10 -03:00
Devin Slauenwhite
afb841c771
Merge branch 'develop' into feat-picklist-scan
2022-05-03 11:15:42 -04:00
Deepesh Garg
322f0db1e9
chore: Resolve conflicts
2022-05-03 18:28:50 +05:30
Deepesh Garg
2e3e666784
Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup
2022-05-03 18:17:36 +05:30
Francisco Roldán
288e2258f6
Merge branch 'develop' into issue_25414
2022-05-03 08:48:30 -03:00
Rucha Mahabal
924cf7763e
fix: payment days calculation for employees joining/leaving mid-month ( #30863 )
2022-05-03 11:27:25 +05:30
Francisco Roldan
26654e5e29
fix: supplier quotation comparission report button
2022-05-02 21:07:54 -03:00
Devin Slauenwhite
6cc83d658b
Merge branch 'feat-picklist-scan' of github.com:dj12djdjs/erpnext into feat-picklist-scan
2022-05-02 17:20:48 -04:00
maharshivpatel
80a13c38bc
fix(india): e-invoice generation for registered composition gst category type ( #30814 )
2022-05-02 21:51:27 +05:30
Saqib Ansari
2b354270eb
Merge pull request #30875 from deepeshgarg007/supply_type_einvoice
...
fix(India): Supply type for overseas invoices with payment of tax
2022-05-02 21:49:52 +05:30
Saqib Ansari
c8aa77285e
fix: supply type for sez invoices with payment of tax
2022-05-02 21:15:54 +05:30
Deepesh Garg
d7cb269e0c
fix: Supply type for overseas invoices with payment of tax
2022-05-02 19:23:43 +05:30
Ahmad
04c96b547e
feat: request_for_quotation - refactor
...
- Set supplier as link in while selecting supplier to create quotation
2022-05-02 18:05:21 +05:00
Deepesh Garg
f8db6f0ac5
Merge pull request #30872 from frappe/mergify/bp/develop/pr-30852
...
fix: Vat Audit report fixes (backport #30852 )
2022-05-02 17:59:10 +05:30
Deepesh Garg
e0fd980bcc
Merge pull request #30848 from deepeshgarg007/cost_center_filter_p_r
...
fix: Cost center filter in payment reconciliation
2022-05-02 17:58:45 +05:30
Deepesh Garg
a31f577c9e
fix: Vat Audit report fixes
...
(cherry picked from commit d5319a48269a4277818486e7ed74468e9107b8f4)
2022-05-02 10:44:37 +00:00
Deepesh Garg
b440dabe12
test: Add test for payment reconciliation
2022-05-02 16:09:48 +05:30
Ankush Menat
59a5090843
fix(UX): misleading stock entry lables ( #30870 )
...
* fix(UX): misleading stock entry lables
* chore: field labels
[skip ci]
Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Marica <maricadsouza221197@gmail.com>
2022-05-02 15:11:14 +05:30
Rushabh Mehta
548afba8bb
fix(minor): update frappe.error_log to new API ( #30864 )
...
* fix(minor): update frappe.error_log to new API
* refactor: changes for updated log_error api
Co-authored-by: Ankush Menat <ankush@frappe.io>
2022-05-02 15:04:26 +05:30
Ankush Menat
dcda55641b
fix: convert default_item_manufacturer to link field ( #30835 )
2022-05-02 13:58:22 +05:30
Ankush Menat
f0049da284
chore: correct link
2022-05-02 11:52:46 +05:30
Ankush Menat
bae8ab2fa9
Merge branch 'develop' into education_sepration
2022-05-02 11:47:37 +05:30
sersaber
b8a9f821a4
feat: Copy task color from project template ( #30857 )
...
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
2022-05-02 10:29:43 +05:30
Rushabh Mehta
be0f84a722
fix(minor): fix create_accounting_dimensions_in_orders.py
2022-05-02 09:41:12 +05:30
Deepesh Garg
fc09c90af7
Merge branch 'develop' into accounting_dimension_consistency
2022-05-01 22:02:10 +05:30
Rushabh Mehta
d746db5547
fix(minor): discount accounting patch
2022-05-01 12:25:21 +05:30
Vlad
5eddaddf74
fix: update translate
2022-04-30 21:47:34 +03:00
Deepesh Garg
19d66e5219
Merge branch 'develop' of https://github.com/frappe/erpnext into accounting_dimension_consistency
2022-04-30 22:15:27 +05:30
Deepesh Garg
c7edc29152
Merge branch 'develop' of https://github.com/frappe/erpnext into cost_center_filter_p_r
2022-04-30 22:11:43 +05:30
Deepesh Garg
bfd053ed23
Merge branch 'develop' into uae_setup_cleaup
2022-04-30 19:54:40 +05:30
Devin Slauenwhite
5ff471e22f
fix: linter
2022-04-29 16:39:33 -04:00
Devin Slauenwhite
fa1378dd49
fix: prevent user from proceeding without all qty picked.
2022-04-29 16:38:52 -04:00
Devin Slauenwhite
5f8f83c6d8
fix: warn user pick list is not complete instead of auto fulfilling picked_qty.
2022-04-29 16:28:49 -04:00
Devin Slauenwhite
48128911be
fix: syntax
2022-04-29 16:27:15 -04:00
Devin Slauenwhite
472e634625
Merge branch 'develop' into feat-picklist-scan
2022-04-29 14:11:42 -04:00
Devin Slauenwhite
2554cdceeb
revert: scan_mode flag
2022-04-29 13:45:59 -04:00
Devin Slauenwhite
24d8f62b21
revert: barcode scan field from pick list item.
2022-04-29 13:40:48 -04:00
Deepesh Garg
ab94b73e93
fix: Cost center filter on payment reconciliation
2022-04-29 18:06:13 +05:30
Rucha Mahabal
65742947e7
fix(UX): record reason for skipping attendance or marking absent for auto attendance ( #30844 )
2022-04-29 15:46:00 +05:30
Deepesh Garg
a8452c2ba2
fix: Multi currency opening invoices
2022-04-29 14:27:03 +05:30
Deepesh Garg
1622faad40
Merge pull request #30802 from deepeshgarg007/multi_currency_opening
...
fix: Allow multi-currency opening invoices
2022-04-29 13:34:54 +05:30
Deepesh Garg
f25251bb70
chore: Clean up patches
2022-04-29 12:42:29 +05:30
Deepesh Garg
0cb36cc18c
Merge branch 'develop' into payment_term_rpt_on_selling
2022-04-28 21:22:38 +05:30
Deepesh Garg
3c578a3b0b
chore: Add patch to delete education doctypes
2022-04-28 19:54:28 +05:30
Deepesh Garg
44c54f69f8
chore: Remove references for Student doctype
2022-04-28 16:16:47 +05:30
Deepesh Garg
cc867fd949
chore: Remove Fees Doctype
2022-04-28 15:51:32 +05:30
Deepesh Garg
848827cf5c
chore: Remove references for Assessment Group
2022-04-28 15:11:22 +05:30
Deepesh Garg
8dcbbf1b9e
chore: Remove course links from training doctypes
2022-04-28 13:49:34 +05:30
Deepesh Garg
60b693f84f
chore: clean up hooks
2022-04-28 12:02:54 +05:30
Deepesh Garg
41e2959389
chore: remove files related to LMS
2022-04-28 10:41:30 +05:30
Devin Slauenwhite
8053f2dbcd
feat: increment picked_qty on scan_barcode
2022-04-27 22:10:15 -04:00
Devin Slauenwhite
ceffbf243e
fix: show alert when maximum qty scanned is reached
2022-04-27 22:07:25 -04:00
Devin Slauenwhite
159cf2848e
fix: get correct row to modify with duplicate item_codes and max_qty fields are present
2022-04-27 22:03:39 -04:00
Devin Slauenwhite
e04fbb6a99
feat: pick list scan fields
2022-04-27 22:02:04 -04:00
Deepesh Garg
69d369dd7f
refactor: Remove education domain from ERPNext
2022-04-27 19:20:36 +05:30
Ankush Menat
777f0204dd
test: create new item instead of using with _Test Item ( #30827 )
...
Unnecessary dependency causes flake in stock. The test was reposting all
entries for item just to test some behavior that is best tested on a
newly created item _anyway_.
2022-04-27 17:47:40 +05:30
Ankush Menat
ebd5f0b1bb
chore: make picked qty read only
2022-04-27 14:53:20 +05:30
Ankush Menat
9a8e3ef235
fix(UX): only show pick list when picking is pending
...
[skip ci]
2022-04-27 14:43:42 +05:30
Ankush Menat
47e1a0104c
fix: dont map picked qty and consider pick qty for new PL
...
Co-Authored-By: marination <maricadsouza221197@gmail.com>
2022-04-27 13:44:19 +05:30
Deepesh Garg
429361ce87
chore: Remove domains from Setup
2022-04-27 13:32:51 +05:30
Ankush Menat
8207697e43
fix: compare against stock qty while validating
...
Other changes:
- only allow whole number of bundles to get picked
2022-04-27 12:51:18 +05:30
Ahmad
b226e7d2ac
feat: request_for_quotation
...
- Show supplier name if supplier ID is not equal to supplier name
2022-04-27 12:16:03 +05:00
Ankush Menat
9e60acdf56
test: test bundle - picklist behaviour
2022-04-27 12:05:15 +05:30
Ankush Menat
ee54ece8fd
test: product bundle fixture
2022-04-27 12:05:15 +05:30
Ankush Menat
1ac275ce61
feat: transfer picklist stock info to packing list
2022-04-27 12:05:15 +05:30
Ankush Menat
41aa4b3524
fix: round off bundle qty
...
This is to accomodate bundles that might allow floating point qty.
2022-04-27 12:05:15 +05:30
Ankush Menat
25485edfd9
refactor: remove unnecssary vars
...
also remove misleading docstring
2022-04-27 12:05:15 +05:30
Ankush Menat
23cb0d684d
feat: create DN from pick list with bundle items
2022-04-27 12:05:15 +05:30
Ankush Menat
f574121741
refactor: simpler check for non-SO items
2022-04-27 12:05:15 +05:30
Ankush Menat
277b51b404
refactor: groupby using keys instead of int index
2022-04-27 12:05:15 +05:30
Ankush Menat
3ddad6891a
refactor: simplify needlessly complicated code
2022-04-27 12:05:15 +05:30
Ankush Menat
60bc26fdbe
feat: back-update min picked qty for a bundle
2022-04-27 12:05:15 +05:30
Ankush Menat
c3fc0a4f55
perf: single update per Sales Order.
...
For each SO item the sales order picking status was being updated, this
isn't required and wasteful.
2022-04-27 12:05:15 +05:30
Ankush Menat
e64cc66df7
refactor: sales order status update
...
- rename badly named variables
- support updated packed items
2022-04-27 12:05:15 +05:30
Ankush Menat
36c5e8a14f
feat: Pick list from SO with Product Bundle
2022-04-27 12:05:15 +05:30
Ankush Menat
7d5682020a
test: bundles in picklist
2022-04-27 12:05:15 +05:30
Ankush Menat
5c3f9019cc
refactor: misc pick list refactors
...
- make tracking fields read only and no-copy 🤦
- collapse print settings section, most users configure it once and
forget about it, not need to show this.
- call pick list grouping function directly
- use get_descendants_of instead of obscure db function
2022-04-27 12:05:15 +05:30
Deepesh Garg
67bb29026f
fix: Ignore custom field validation while setup
2022-04-26 20:15:15 +05:30
Ankush Menat
24a7acaabc
chore: incorrect translations
2022-04-26 19:22:26 +05:30
Ankush Menat
dcc2243fbb
Merge pull request #30811 from marination/multiple-wh-acc
...
chore: Warn users about multiple warehouse accounts
2022-04-26 18:18:11 +05:30
marination
e2a163d4e9
fix: Use account_type == 'Stock' to filter stock accounts
2022-04-26 17:50:51 +05:30
marination
44331f4f1f
chore: Warn users about multiple warehouse accounts
...
- Get distinct accounts that warehouse value has been booked against
- If same account as the one being set, ignore
- If not same account or multiple accounts: warn user that it makes it harder to track mismatches
2022-04-26 17:43:33 +05:30
Rucha Mahabal
1cc8c79807
test: fix flaky carry forwarded leave expiry test ( #30810 )
2022-04-26 17:43:08 +05:30
Saqib Ansari
078f26bef3
Merge pull request #30808 from nextchamp-saqib/pos-search-ux-fix
...
fix(pos): search field doesn't reset on checkout
2022-04-26 14:47:22 +05:30
Saqib Ansari
b1ac5ff9d2
fix(pos): number pad translations
2022-04-26 14:41:36 +05:30
Saqib Ansari
03a6103fe5
fix(pos): search field doesn't reset on checkout
2022-04-26 14:28:33 +05:30
Deepesh Garg
00ace8f62c
Merge branch 'develop' into accounting_dimension_consistency
2022-04-26 14:26:08 +05:30
Deepesh Garg
82a0635c66
fix: Consistent accounting dimensions across Sales and Purchase docs
2022-04-26 14:01:13 +05:30
ruthra kumar
b0ead459a0
feat: add payment terms status rpr to Selling homepage
2022-04-26 13:30:13 +05:30
Ankush Menat
88e257ff6d
fix: column name in party query
2022-04-26 11:47:05 +05:30
Ankush Menat
052171f51c
fix: date condition in tax rule
2022-04-26 11:47:05 +05:30
Ankush Menat
a90e7e32a4
fix: proper quoting in sql queries
2022-04-26 11:47:05 +05:30
Ankush Menat
7e555d3d8c
fix: item price query for postgres
...
postgres doesn't like bad type comparisons and doesn't have `isnull`
funciton
2022-04-26 11:47:02 +05:30
Ankush Menat
7d2587c0a9
fix: nullish check and table name
2022-04-26 11:03:32 +05:30
Ankush Menat
0fdfc1e76e
fix: only query fields that exist
2022-04-26 11:03:32 +05:30
Ankush Menat
ce75fe0ec4
fix: out of range date value
2022-04-26 11:03:32 +05:30
Ankush Menat
cdac2b8c63
fix: ignore duplicate fixtures
2022-04-26 11:03:32 +05:30
Ankush Menat
e1c1687661
refactor: use db agnostic CombineDatetime
2022-04-26 11:03:32 +05:30
Deepesh Garg
d3582ea399
fix: Allow multi-currency opening invoices
2022-04-25 18:18:39 +05:30
Deepesh Garg
4ffea617ef
Merge pull request #30754 from deepeshgarg007/round_off_account_cost_center
...
fix: First preference to parent cost center rather than round off cost center
2022-04-25 17:06:19 +05:30
Deepesh Garg
3fa1c63479
test: Unit test for round off entry dimensions
2022-04-25 16:29:26 +05:30
Deepesh Garg
b1158bcb7c
Merge pull request #30799 from nextchamp-saqib/einv-cess-fix
...
fix(india): cess value not considered while validating e-invoice totals
2022-04-25 14:39:15 +05:30
Deepesh Garg
f064e0b15e
Merge pull request #30642 from rahib-hassan/separate-discount-account
...
feat: separate discount accounting for buying and selling
2022-04-25 14:07:20 +05:30
Saqib Ansari
8e6c7a6bf7
fix(india): cess value not considered while validating e-invoice totals
2022-04-25 14:02:46 +05:30
Deepesh Garg
02aaa6546c
chore: Remove dead code
2022-04-25 12:42:06 +05:30
