vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4
15248 commits 1 branch 0 tags 587 MiB
Commit graph

1657 commits

Author SHA1 Message Date
Achilles Rasquinha
0e450616f6
Merge pull request #5134 from achillesrasquinha/py3 
cmp alternative
 2018-03-08 11:51:46 +05:30
Achilles Rasquinha
c0f674f5e5 cmp alternative 2018-03-08 11:49:31 +05:30
Nabin Hait
7b0a7e029d Fixed merge conflict 2018-03-05 14:46:18 +05:30
Suraj Shetty
1202ff1fdb List view bulk edit option (#5107) 
* added actions button for bulk operations

also included bulk edit option

* page html refactor and added show/hide action option

* copy field object to avoid mutation

* commonify update method and other refactor

* fixed bug with progress bar level and minor fix with 'value' field display

* fixed frappe/erpnext#13063

* commonify field control method and removed unwanted code

* separate method for submit and cancel

* [minor] msgprint change

* refresh list on complete

* requested changes and refactor

* codacy fix

* code formatting, changed var name

* conflict fix

* description option for progress dialog

* extracted bulk operations to a separate file

* Refactor

commonified redundant method
get_json -> parse_json

* rename change_df -> replace_field
 2018-03-05 11:02:50 +05:30
Achilles Rasquinha
ad9a207ec2
Merge pull request #5103 from achillesrasquinha/py3 
Fix Unittest
 2018-02-28 21:34:18 +05:30
Achilles Rasquinha
abb7f14bbd self.assertEqual 2018-02-28 21:19:01 +05:30
Achilles Rasquinha
826c14db31 [CHAT] Some cleanup from previous chat 2018-02-28 19:35:14 +05:30
Achilles Rasquinha
cacc0b8cb2 Use range instead of xrange, and sorted fix (#5094) 
* Use range instead of xrange

* sort using cmp_to_key

* [min] import functools
 2018-02-28 17:07:59 +05:30
Achilles Rasquinha
cbc8831add sort using cmp_to_key 2018-02-28 12:38:19 +05:30
Zarrar
582e1a8c2c [Hotfix] Skip notification count on Desk for Reports and Toggle charts based on Filter (#5080) 
* fix desktop crash after adding item balance report (simple) icon

* toggle true when changing report filter range
 2018-02-26 12:27:26 +05:30
Nabin Hait
764c5e2167 Fixed merge conflict 2018-02-23 16:58:01 +05:30
Nabin Hait
f07a9cf17f
Delete duplicate custom fields (#5070) 
* Delete duplicate custom fields

* Delete duplicate custom fields
 2018-02-23 16:16:49 +05:30
Rushabh Mehta
f20da41bf6 [fix] rename custom fields before sync if name conflicts (#5062) 
* [fix] rename custom fields before sync if name conflicts

* [minor] re-add text_type

* Update doctype.py
 2018-02-23 11:10:21 +05:30
Nabin Hait
dfa494875c Fixed merge conflict 2018-02-22 14:38:36 +05:30
Charles-Henri Decultot
bf2936268b Transaction Log for France (#4974) 
* Transaction Log creation

* Addition of tests

* Codacy corrections
 2018-02-21 11:06:48 +05:30
tundebabzy
672b0dffc7 fix translatable docfields (#5041) 2018-02-21 11:04:38 +05:30
Saurabh
6a23461b42 [fix] Send email with no letterhead if print letterhead is unchecked on print preview (#4816) 
* [fix] send email with no letterhead if print letterhead is unchecked on print priview

* [fix] if not on print preview page, pull with_letterhead from print settings

* remove redundant if condition

* minor
 2018-02-19 11:25:14 +05:30
Charles-Henri Decultot
41598d22f0 Braintree integration (#4971) 
* Braintree Integration WIP

* Braintree integration

* Link in config + settings after save

* Code cleanup

* Code cleanup

* JS beautify issue

* Codacy corrections

* Spaces to tabs
 2018-02-16 15:16:23 +05:30
Zarrar
974d49dd09 fix keys not defined error (#5023) 2018-02-16 15:15:18 +05:30
Faris Ansari
e581be9fa8 Add translation support for DocFields (#5002) 
* Initial changes for Translation

* Merged translate app into frappe core

* Minor typo fix

* Fixes while syncing translations

* Set defaults

* Fixes on setup

* Improve Code Quality

* Could Code Quality be Improved?

* Small code tweaks

* Minor typo fix

* Addition of Translatable Property

* Small fixes for Codacy Comments

* Simplify code

* Show translations in grid

* Remove enabled from Language

* Revert render_template logic

* typo

* Cleanup unused methods

* move patch to erpnext

* fix codacy

* Update patches.txt

* Update patches.txt
 2018-02-16 15:12:12 +05:30
Neil Trini Lasrado
c4a6242be3 Added Full Name and Username to standard filters in User doctype, also added full name to global search (#5008) 2018-02-15 15:26:45 +05:30
Nabin Hait
af7401865f translated messages 2018-02-15 11:33:26 +05:30
Saurabh
676fdc0098 Merge branch 'master' into develop 2018-02-14 11:43:00 +05:30
Faris Ansari
99b4278f84 [report] Handle rows which can be list of dict (#4987) 2018-02-09 14:28:07 +05:30
Achilles Rasquinha
9743e5091c fixed import 2018-02-09 11:25:09 +05:30
Achilles Rasquinha
9790a8067a PY2-PY3 compat 2018-02-09 11:22:18 +05:30
Achilles Rasquinha
8f0e0fc647 Fixed Unicode to ASCII doc 2018-02-09 11:03:22 +05:30
KanchanChauhan
43cdb2104d Define Icon and color in doctype (#4909) 2018-02-07 11:04:36 +05:30
Nabin Hait
e3de8c10ef Fixed merge conflict 2018-02-03 09:04:25 +05:30
Manas Solanki
76262c4657 don't show import button if import is in progress (#4960) 2018-02-02 17:06:18 +05:30
Nabin Hait
119f284225
Validation for file header (#4959) 2018-02-02 15:34:05 +05:30
Himanshu Mishra
999628f989 allow export_json to accept order_by (#4937) 2018-01-31 12:14:49 +05:30
Zarrar
8a3c4891ae [Fix] Disabling a domain should remove its custom field (#4931) 
* delete custom fields for inactive domains

* patch added to remove custom fields for inactive domains
 2018-01-31 11:19:32 +05:30
Achilles Rasquinha
473d3eb6be Fixes for Python 3 (#4940) 
* Fixed dict_keys and lists

* [FIX] config.get keys must be list

* [FIX] pickle all objects

* [FIX] get versions in unicode

* [FIX] get log versions

* debugging

* Fixed commit ID reference

* Fixed branch reference

* Fixed doc keys to list

* [LOG] test log

* [LOG] test log

* Convert iterators to list

* removed logs

* [FIX] Trial to load templates

* Fixed codacy
 2018-01-31 10:51:13 +05:30
Nabin Hait
428d1d7a6e Fixed merge conflict 2018-01-30 18:18:46 +05:30
Nabin Hait
c328c27f85 minor fix 2018-01-30 15:35:25 +05:30
Prateeksha Singh
ee220861c5 Desktop icons select dialog in place of page (#4843) 
* [module_icon_setup] Initial bindings

* [module_icon_setup] replace with dialog

* [module_icon_setup] remove modules setup page

* [module_icon_setup] remove app installer
 2018-01-23 15:26:49 +05:30
Prateeksha Singh
2bb25442fd
Merge pull request #4876 from pratu16x7/hotfix 
ignore xss on barcode by default, fixes frappe/erpnext#11973
 2018-01-19 15:16:19 +05:30
Prateeksha Singh
077230c922 ignore xss on barcode by default, fixes frappe/erpnext#11973 2018-01-19 15:11:27 +05:30
Rohit Waghchaure
87a0b6213b Merge branch 'master' into develop 2018-01-19 13:06:50 +05:30
Achilles Rasquinha
6a238b0048 Send me a Copy not in BCC (#4874) 2018-01-19 12:15:07 +05:30
rohitwaghchaure
3e187d7d50 [Fix] Showing status as Replied after adding the comment in the emails (#4865) 2018-01-18 15:37:46 +05:30
rohitwaghchaure
cf4060d632 [Fix] Feedback issue (#4867) 2018-01-18 15:37:28 +05:30
Aditya Hase
8c525fc5d4 Python 3 compatibility Frappe installation fixes (#4863) 
* Use consistent indentation

* Fix print syntax

* Pass unicode argument to pymysql.escape_string
 2018-01-18 13:52:46 +05:30
Faris Ansari
477f4b92ea
[fix] file test (#4861) 
* [fix] file test

* minor

* [fix] refresh after apply filter
 2018-01-18 13:12:34 +05:30
Achilles Rasquinha
7874abd830
Merge pull request #4841 from achillesrasquinha/fixes-chat 
[frappe-chat] Updated System Settings
 2018-01-16 12:08:54 +05:30
Achilles Rasquinha
eef939a638 updated system settings 2018-01-16 11:54:18 +05:30
Achilles Rasquinha
1c50e8afd4 updated system settings 2018-01-16 11:49:55 +05:30
Saurabh
3f43899839 resolved merge conflicts 2018-01-15 18:34:11 +05:30
Manas Solanki
edbbf4b464 add the field attach_to_field in the file (#4823) 2018-01-15 18:10:53 +05:30