Deepesh Garg
|
564f5b2394
|
Merge pull request #30890 from frappe/mergify/bp/develop/pr-30884
fix: Ignore loan repayments made from salary slip (backport #30884)
|
2022-05-04 10:19:36 +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
|
1b285cf662
|
Merge pull request #30820 from deepeshgarg007/erpnext_setup_cleanup
chore: Remove domains from setup wizard
|
2022-05-03 20:05:52 +05:30 |
|
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 |
|
Francisco Roldán
|
62225e0956
|
Merge pull request #174 from frappe/develop
Fetch upstream
|
2022-05-02 20:44:38 -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
|
bdd55f07f4
|
Merge pull request #30830 from deepeshgarg007/education_sepration
refactor!: Remove education domain from ERPNext
|
2022-05-02 13:20:01 +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
|
04d56fbb8d
|
Merge pull request #30858 from rmehta/fix-account-dim-patch-again
fix(minor): accounting dimension patch
|
2022-05-02 09:42:28 +05:30 |
|
Rushabh Mehta
|
be0f84a722
|
fix(minor): fix create_accounting_dimensions_in_orders.py
|
2022-05-02 09:41:12 +05:30 |
|
Deepesh Garg
|
6a953d9297
|
Merge pull request #30806 from deepeshgarg007/accounting_dimension_consistency
fix: Consistent accounting dimensions across Sales and Purchase docs
|
2022-05-01 22:02:41 +05:30 |
|
Deepesh Garg
|
fc09c90af7
|
Merge branch 'develop' into accounting_dimension_consistency
|
2022-05-01 22:02:10 +05:30 |
|
Deepesh Garg
|
15237fd747
|
Merge pull request #30854 from rmehta/fix-discount-accounting-patch
fix(minor): discount accounting patch
|
2022-05-01 15:22:45 +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
|
54d16de849
|
Merge pull request #30815 from deepeshgarg007/uae_setup_cleaup
fix: Ignore custom field validation while setup
|
2022-04-30 22:03:21 +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 |
|