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

41594 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rucha Mahabal
9b93c63830 fix: tests 2022-04-22 17:54:32 +05:30
Rucha Mahabal
788e0a1c6c chore: format employee_property_update.js 2022-04-22 17:25:37 +05:30
Rucha Mahabal
ed04241cf4
Merge branch 'develop' into promotion-enhancements 2022-04-22 16:38:01 +05:30
Rucha Mahabal
833a33a94b test: employee property update via Employee Promotion 2022-04-22 16:28:25 +05:30
Rucha Mahabal
a93867de19 feat: add CTC fields in Employee master and Promotion 2022-04-22 16:28:14 +05:30
Vladislav
e088e65871
fix: update translation (#30725) 
* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv

* Update ru.csv
 2022-04-22 11:00:57 +05:30
Deepesh Garg
81b3342480
Merge pull request #30757 from nextchamp-saqib/einv-401-fix 
fix(india): 401 & 403 client error while generating IRN
 2022-04-21 18:55:26 +05:30
Ankush Menat
d5ab626a31
Merge pull request #30726 from ankush/dependent_gle_reposting 
fix: dependent gle reposting
 2022-04-21 18:06:40 +05:30
Ankush Menat
ee3036651a
fix: batch_no filtering not working when batch no is also a number in scientific notation (#30770) 
[skip ci]
 2022-04-21 16:34:31 +05:30
Ankush Menat
4dced7dfeb
Merge pull request #30733 from marination/field-filters-e-com 
fix: Filter fields in E Commerce Settings (use Website Item)
 2022-04-21 14:30:31 +05:30
Marica
87f1617780
Merge branch 'develop' into field-filters-e-com 2022-04-21 12:32:33 +05:30
marination
c5d4bed932 test: setup e commerce settings before running invalid filtrs test 2022-04-21 12:29:30 +05:30
Rucha Mahabal
c3dc5d5ce7 fix: property addition not working for select fields 2022-04-21 08:17:00 +05:30
marination
8981405a62 test: Field filter validation and Custom field as field filter 
- Test to block Item fields (which aren’t in Website Item) in E Commerce Settings as filters
- Removed unnecessary function and setup in E Commerce Settings test
- Removed commented useless test
- Test to check custom field as filter
 2022-04-20 18:50:47 +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
Rucha Mahabal
5411e69553
fix: filters not working in Shift Assignment Calendar view (#30752) 2022-04-20 14:56:06 +05:30
Saqib Ansari
ee8047aba3 fix(india): 401 & 403 client error while generating IRN 2022-04-20 14:14:29 +05:30
HENRY Florian
143786aaa0
fix: Must not be able to start Job Card if it is related to Work Order that is not started yet (#29072) 
* fix: Cannot start Job strat if related to Work Order not started yet

* fix: Cannot start Job strat if related to Work Order not started yet

* test

* test

* fix siders

* PR review

* chore: Code cleanup

- Better short circuit for if condition (make it such that both conditions dont always have to be computed)
- Remove `r.message` extraction by avoiding `then()`

* chore: Remove unnecessary json change

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2022-04-20 12:29:52 +05:30
marination
5660b335ba fix: Mistyped variable name in patch 2022-04-20 12:25:59 +05:30
Deepesh Garg
5c45093d2d
Merge pull request #30746 from frappe/mergify/bp/develop/pr-30736 
fix(india): transporter name is null while generating e-way bill (backport #30736)
 2022-04-20 11:25:27 +05:30
Ankush Menat
9734329094 test: discard local future SLE cache between tests 2022-04-19 17:40:28 +05:30
Ankush Menat
700e864d90 fix: sort stock vouchers before reposting GLE 2022-04-19 17:40:26 +05:30
Ankush Menat
b24920c0e9 fix: correct sorting while updating bin 2022-04-19 17:38:36 +05:30
Ankush Menat
d2882ea436 test: use disposable item codes in tests 
dependency causes flake
 2022-04-19 17:38:36 +05:30
Ankush Menat
8f519545b0 test: repost queue progress 2022-04-19 17:38:36 +05:30
Ankush Menat
ecdb49314f fix: dependent GLE reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
a2af2daca7 test: dependent GL entry reposting 2022-04-19 17:38:36 +05:30
Ankush Menat
afc5a55a23 refactor: repost error handling 2022-04-19 17:38:36 +05:30
Deepesh Garg
e4265ce814
chore: Update creds to allow updates on protected branch (#30749) 2022-04-19 17:26:42 +05:30
FinByz Tech Pvt. Ltd
54a05075f3 fix(india): transporter name is null while generating e-way bill (#30736) 
(cherry picked from commit 6291b28c37f02380001ab68b3a660b2804383ab2)
 2022-04-19 10:57:59 +00:00
Deepesh Garg
5d0a6c1e64
Merge pull request #30742 from deepeshgarg007/bot_token 
fix: Update token to allow updates on protected branch
 2022-04-19 15:30:52 +05:30
Deepesh Garg
6f332f3669 fix: Update token to allow updates on protected branch 2022-04-19 15:28:56 +05:30
Rucha Mahabal
f39615bd80
Merge pull request #30701 from ejaazkhan/shift-type-null-in-employee-checkin 2022-04-19 14:34:36 +05:30
Rucha Mahabal
789fa31b82
Merge branch 'develop' into shift-type-null-in-employee-checkin 2022-04-19 13:39:32 +05:30
Rucha Mahabal
3cddc1e97e test: shift fetching when assignment has an end date 2022-04-19 13:39:03 +05:30
Rucha Mahabal
98cccf221e fix: shift fetching fails in Employee Checkin if shift assignment has an end date 
Co-authored-by: Ejaaz Khan <ejaazrkhan@gmail.com>
 2022-04-19 13:17:36 +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
Deepesh Garg
d96bfe13a8 Merge pull request #30721 from ruthra-kumar/bug_so_analysis_report 
fix: SO's without delivery note will also be fetched
 2022-04-18 19:58:37 +05:30
marination
1e80b97915 refactor: Change Filter Fields table fieldtype to Autocomplete 
- Remove dynamic js fieldtype change to `Select`
 2022-04-18 19:01:43 +05:30
marination
d35b37881b fix: Validate field filter wrt to Website Item & re-use validation in Item Group 2022-04-18 18:51:48 +05:30
Marica
8a366309e1
Merge branch 'develop' into field-filters-e-com 2022-04-18 18:11:25 +05:30
marination
c993ac09df fix: Query filter fields from Website Item instead of Item master 
- tweak `filters.py` to correctly query filter field values from Website Item
- Use Website Item for filter field options in Settings and Item Group Field Filter table
 2022-04-18 18:01:48 +05:30
Ankush Menat
c4d20ce159
Merge pull request #30729 from deepeshgarg007/semantic_releases 
chore: Add semantic releases
 2022-04-18 17:13:16 +05:30
Deepesh Garg
e0a9a69d76 chore: do not publish any assets 2022-04-18 16:45:01 +05:30
Ankush Menat
6fc11cb4c5
ci: use latest ubuntu container 2022-04-18 16:17:36 +05:30
Deepesh Garg
264ec65255
Merge pull request #30728 from deepeshgarg007/pricing_rule_apply_mapped_doc 
fix: Price changing on creating Sales return from Delivery Note
 2022-04-18 14:34:28 +05:30
Deepesh Garg
c12a36aed9 chore: block major releases 2022-04-18 13:05:56 +05:30
Deepesh Garg
1c49e453ea
Merge pull request #30724 from deepeshgarg007/erpnext_changes 
fix: Consistent customer and supplier forms
 2022-04-18 11:23:26 +05:30
Deepesh Garg
cc1bdd426b chore: Update branch name 2022-04-18 10:48:31 +05:30