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

3178 Commits

Author SHA1 Message Date
Rucha Mahabal
1867bad693
Merge branch 'develop' into exit-interview 2021-12-12 22:13:11 +05:30
Deepesh Garg
14d03a9446 fix: KSA QR field rename patch 2021-12-12 12:55:30 +05:30
Dany Robert
5b20746311
chore: switch to ORM method 2021-12-08 07:53:45 +05:30
Dany Robert
15373f1b2d
fix: intendation error 2021-12-07 18:34:34 +05:30
Dany Robert
a0aeacee8e fix: reload doc 2021-12-07 12:39:39 +00:00
Dany Robert
2256155e80 feat(Regional): patch to disable ksa print formats for other countries 2021-12-07 11:02:28 +00:00
Rucha Mahabal
4686527928
Merge branch 'develop' into exit-interview 2021-12-07 16:23:31 +05:30
Dany Robert
811e51fb50
fix: reload SI meta before checking 2021-12-07 15:21:51 +05:30
Dany Robert
848b641d7b
fix: rename KSA QR field to match localisation 2021-12-07 14:51:05 +05:30
Saqib Ansari
476e81a631 fix: time to respond & resolve indicators 2021-12-06 18:55:30 +05:30
Saqib Ansari
10b87e081c fix: sider issues 2021-12-06 15:38:19 +05:30
Saqib
8e5b793a0a
Merge branch 'develop' into fix-sla 2021-12-06 14:48:09 +05:30
Anupam Kumar
3928a402d4
feat: CRM Settings (#27788) 
* feat: crm settings

* feat: CRM Settings

* feat: lead and opprtunity section

* feat: added CRM Settings in ERPNext Settings workspace

* fix: review chnages

* added patch

* fix: linter issues

* fix: linter issues

* fix: linter issues

* fix: removed crm settings from selling module

* fix: raw query to frappe.qb

* fix: removed hardcoded value

* fix: linter issue

* fix: simplify CRM Settings migration patch

Co-authored-by: Anupam Kumar <anupam@Anupams-MacBook-Air.local>
Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2021-12-06 13:52:00 +05:30
Saqib Ansari
f9408d170a patch: split 'ongoing' sla status 2021-12-06 12:38:25 +05:30
Ankush Menat
bdf7b8d379 fix: patch to remove default item group and territory 2021-12-06 11:07:24 +05:30
Rucha Mahabal
235b707417 feat: add default Exit Questionnaire email template 2021-12-05 17:06:29 +05:30
Rucha Mahabal
0ef42d1000
fix(patch): create only component type field instead of running the whole setup (#28734) 2021-12-05 12:44:20 +05:30
hrwx
43038aab79 fix: do not add gst fields if no indian company 2021-11-27 21:46:13 +00:00
Ankush Menat
8b33358660 fix: patch failure due to new doctype 2021-11-25 17:41:29 +05:30
Ankush Menat
ab2c1f62a1
fix: correct module for reloading doc (#28523) 2021-11-23 18:21:00 +05:30
marination
dc42c45ebb fix: Move thumbnail updation to different patch 
- Thumbnail updation handled via different patch
- create_website_items will only have one purpose
- added progress bar to `create_website_items`
- code cleanup
 2021-11-16 17:57:10 +05:30
marination
871e9ca6af fix: Check if thumbnail column exists in case of table trimming 2021-11-16 17:53:43 +05:30
marination
a97ee918b2 fix: Get db values as dict when checking for thumbnail in existing web item 2021-11-16 17:53:30 +05:30
marination
d7d70ec9e0 fix: Fetch thumbnail from Item master instead of regenerating 2021-11-16 17:52:14 +05:30
marination
ba52d7c23f fix: Website Items with same Item name unhandled, thumbnails missing 
- Use naming series for Website Item. There could be two items with same name and different item code
- Fix: Website Item Page view breaks if cart is disabled
- Fix: thumbnails not created for Website Items after patch
- Fix: ‘Request for Quote’ button & cart summary not visible if checkout is disabled
 2021-11-16 17:51:01 +05:30
Deepesh Garg
cbfdbd8442 fix: Website item patch fixes 2021-11-16 17:42:04 +05:30
marination
e2b9a38f28 fix: Failing search util import and patch 
- Use simple function import instead of global variable to check if field is valid to index
- Commit after every 20 items in patch to  create web items from items
 2021-11-16 17:38:09 +05:30
marination
9aeb211142 chore: Remove Home Page is Products and Sider fixes 
- Removed `Home Page is Products` checkbox in E Comm Settings. Can be manually set in Website Settings
- Removed hooks trigger to reset home page as products
- Sider: duplicate color attribute, shift `return` to next line, over-indentation
 2021-11-16 17:21:46 +05:30
marination
82f8f3caf2 feat: Guest Display Settings 
- Re-arranged Settings checkboxes
- Deleted `show_availability_status` from E Commerce Settings
- Added `Hide Price for Guest` functionality
- Added Custom Redirection for Guest Actions in  E Commerce Settings
- Minor cleanups
 2021-11-16 16:54:21 +05:30
marination
aca3c8fce7 fix: Font size, empty image styles, and minor cleanup 
- some frappe css font variables weren't loading, remove dependency
- fixed fallback display for missing images in views
- py code cleanup (minor)
 2021-11-16 16:48:33 +05:30
marination
b29c5d6e84 fix: Discount Filters and Web templates 
- Fixed discount filters (didn’t work after js render change)
- Fix Item Card Group template height and style
- Add placeholder to missing images in Product Category Cards template
- Code cleanup
 2021-11-16 16:37:08 +05:30
marination
d29b94f46e fix: Patch fix for fresh installs 
- minor sider fix
- patch fix for fresh installs
 2021-11-16 16:35:22 +05:30
marination
f9929ed8a6 Merge branch 'develop' of https://github.com/frappe/erpnext into e-commerce-refactor-develop 2021-11-16 16:06:07 +05:30
Ankush Menat
54184e54ed fix: patch for naming series property setter 2021-11-15 18:18:22 +05:30
Ankush Menat
c96b5492db fix: reload doctype forcefully 2021-11-10 19:41:55 +05:30
Ankush Menat
ccf84ae88a fix: patch to update job card status 2021-11-09 18:04:50 +05:30
Subin Tom
d2915c6bc7 fix: fixed company field, updated patch 
(cherry picked from commit 7f2d304f32fdf580a354c1dbba58189cdd4f35f2)

# Conflicts:
#	erpnext/patches.txt
 2021-11-08 13:12:27 +00:00
Subin Tom
e51c4ba8a9 fix: Added company field, filtered account heads 
(cherry picked from commit 902c03cd375c7b1b2f35cff4dfbc5f1ff3e4cd56)
 2021-11-08 13:12:25 +00:00
Subin Tom
75e9100a53 fix: Fixed customer address variable, sales invoice item field currency issue 
(cherry picked from commit 904010ab645fdb16f09072c062269945f7747712)
 2021-11-08 13:12:25 +00:00
Deepesh Garg
508832e90a fix: Add patch to make custom fields 2021-11-08 17:46:24 +05:30
Ankush Menat
8fe5feb6a4 chore: remove all six compat code 2021-11-05 11:16:29 +05:30
Ankush Menat
6098e92ba9 chore: remove utf-8 compat code 2021-11-05 11:16:29 +05:30
Rohit Waghchaure
cae29b71d8 fix: patch update_category_in_ltds_certificate 2021-10-31 09:24:07 +05:30
Deepesh Garg
812249e5d1 Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-28 19:01:51 +05:30
Deepesh Garg
09a5616e2d fix: Rewrite patch using query builder 2021-10-28 19:01:24 +05:30
Ankush Menat
b01635e1da
refactor!: remove hub #28117 
refactor!: remove hub
 2021-10-28 14:07:15 +05:30
Alan
05831b18ad
fix: update production plan status #27567 
fix: update production plan status
 2021-10-27 11:36:37 +05:30
Deepesh Garg
7ab7753bfa Merge branch 'develop' of https://github.com/frappe/erpnext into lower_deduction_cetificate_fixes 2021-10-26 20:56:40 +05:30
Deepesh Garg
89d5e494dd fix: Reload customer and supplier doctype 2021-10-26 19:51:03 +05:30
Deepesh Garg
cd4b20313e fix: Test case fixes and linting issues 2021-10-25 11:21:55 +05:30