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

32030 Commits

Author SHA1 Message Date
Saqib Ansari
95b059a98c fix: validate disabled accounts before posting ledger entries 2022-05-11 13:26:15 +05:30
Saqib Ansari
a1e3ae8869 fix: user can select disabled accounts in taxes table 2022-05-11 13:01:06 +05:30
Saqib Ansari
b0f302e579 fix: validate on hold purchase invoices in payment entry 2022-05-11 12:42:35 +05:30
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
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
maharshivpatel
ee7a7eb782
fix(india): keyerror while generating e-way bill from an e-invoice (#30879) 2022-05-06 11:23:16 +05:30
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
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
Francisco Roldán
5604dccdb6
Merge branch 'develop' into issue_25414 2022-05-03 13:27:10 -03: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
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
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
Deepesh Garg
ab94b73e93 fix: Cost center filter on payment reconciliation 2022-04-29 18:06:13 +05:30