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
|
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 |
|