Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,316 Commits 3 Branches 0 Tags 1 GiB
2a619fd789
Commit Graph

3197 Commits

Author SHA1 Message Date
Nabin Hait
f72d5506de fix: get_all replace by sql 2022-06-25 15:08:45 +05:30
Nabin Hait
d8163f3e47 fix: set exchange rate 2022-06-25 11:40:23 +05:30
Nabin Hait
f904ac599e fix: merge conflicts and sider issues 2022-06-25 11:40:23 +05:30
ruthra kumar
5826b7b071 fix: identify empty values "" in against_voucher columns 2022-06-21 19:50:50 +05:30
Ankush Menat
6f2086d770
test: verify that all patches exist in patches.txt (#31371) 
* chore: delete orphaned patches

* test: orphan/missing entries in patches.txt


[skip ci]
 2022-06-16 22:15:06 +05:30
Ankush Menat
276267d5a6
fix: remove agriculture module from patch (#31369) 2022-06-15 15:26:05 +05:30
Deepesh Garg
3d76b1a093
Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql 
refactor: migrating data from GL to payment ledger using raw SQL
 2022-06-10 17:15:58 +05:30
ruthra kumar
e2c52436da refactor: migrate gl to payment ledger using sql 2022-06-10 13:17:43 +05:30
Ankush Menat
ee5bc58e9b
fix(job card): only hold during draft state (#31243) 2022-06-06 16:27:25 +05:30
Rucha Mahabal
956a803be7
Merge branch 'develop' into fix-salary-slip-bg-job 2022-06-02 17:30:34 +05:30
Rucha Mahabal
d4b9cc0242
fix: remove leave policy assignment creation patch (#31097) 2022-06-01 12:18:14 +05:30
Rucha Mahabal
1c91793634
Merge branch 'develop' into fix-salary-slip-bg-job 2022-06-01 12:15:42 +05:30
Ankush Menat
a1b7a7983a
refactor!: drop naming series tool (#31183) 2022-05-31 15:35:40 +05:30
Rucha Mahabal
273b21c0cb
chore: move patch for updating Employee Advance status to v13 (#31118) 2022-05-25 11:34:25 +05:30
ruthra kumar
8e72f19bfb feat: patch to migrate gl entries to payment ledger 2022-05-20 18:21:47 +05:30
Rucha Mahabal
7d4872aedd patch: set payroll entry status 2022-05-19 20:35:56 +05:30
Ankush Menat
80d959c579
fix: dont fail repost for recoverable errors (#30979) 
recoverable erros:
1. timeout
2. lock/deadlocks
 2022-05-16 11:23:35 +05:30
Deepesh Garg
b13698a1d5 fix: Failing accounting dimension patch 
(cherry picked from commit b14a7b8a5db2512f365efb75b9cc75ee3c3fa213)
 2022-05-12 09:27:40 +00:00
Sagar Sharma
1a70701eca
fix: per_billed for return DN (#30868) 
* fix: per_billed for return DN

* chore: move patch from v14 to v13
 2022-05-11 16:49:28 +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
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
Deepesh Garg
f25251bb70 chore: Clean up patches 2022-04-29 12:42:29 +05:30
Deepesh Garg
3c578a3b0b chore: Add patch to delete education doctypes 2022-04-28 19:54:28 +05:30
Deepesh Garg
60b693f84f chore: clean up hooks 2022-04-28 12:02:54 +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
rahib-hassan
6c86067d90
Merge branch 'develop' into separate-discount-account 2022-04-25 12:17:50 +05:30
Rucha Mahabal
9d158088ee chore: remove unused Employee Transfer Property doctype 2022-04-22 20:20:12 +05:30
rahib-hassan
78c8e46511
Merge branch 'develop' into separate-discount-account 2022-04-21 15:06:58 +05:30
Marica
87f1617780
Merge branch 'develop' into field-filters-e-com 2022-04-21 12:32:33 +05:30
marination
6d750e185e fix: Handle Multiselect field mapping separately 
- Map Multiselect child table to Website Item (copy rows)
 2022-04-20 17:40:03 +05:30
marination
5660b335ba fix: Mistyped variable name in patch 2022-04-20 12:25:59 +05:30
Rucha Mahabal
7c547f152f
fix(patch): check if column is present while fixing reverse linking (#30737) 2022-04-19 12:18:46 +05:30
marination
d0cd194398 chore: Patch to copy custom fields (field filters) from Item to Website Item 2022-04-18 21:40:19 +05:30
Ankush Menat
0d64349142
Merge branch 'develop' into separate-discount-account 2022-04-14 17:29:28 +05:30
rahib-hassan
0eff74c650 fix: tabspacing 2022-04-14 15:42:16 +05:30
Raffael Meyer
6453fb4cea
refactor!: remove DATEV integration (#30584) 
The DATEV integration follows the trend and moves into a separate app.

- the DATEV Integration will be maintained at https://github.com/alyf-de/erpnext_datev (version-14 branch)
- the German Compliance and Localization will be maintained at https://github.com/alyf-de/erpnext_germany
 2022-04-13 09:24:19 +00:00
Saqib Ansari
0373347a97
Merge branch 'develop' into separate-discount-account 2022-04-11 14:55:42 +05:30
Deepesh Garg
02c6b898a6
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-09 19:57:59 +05:30
rahib-hassan
dc2944a041 fix[minor]: removed doc assignment 2022-04-09 03:55:25 +05:30
rahib-hassan
ac16f3b71f fix: lock timeout exceeded 2022-04-08 18:20:41 +05:30
rahib-hassan
ac7f1cbd87 fix: minor fix 2022-04-08 17:46:49 +05:30
rahib-hassan
35e875c111 fix(patch): enable discount account in buying and selling if exist in accounts settings 2022-04-08 17:27:53 +05:30
Ankush Menat
bb875fe217
fix: check null values in is_cancelled patch (#30594) 2022-04-06 14:20:39 +05:30
Deepesh Garg
ec6f7040f4
Merge branch 'develop' into mergify/bp/develop/pr-30385 2022-04-06 10:00:51 +05:30