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

1993 commits

Author SHA1 Message Date
Suraj Shetty
fe49117c92
fix: issue related to quotes (#6682) 2018-12-26 19:36:13 +05:30
Frappe Bot
0499b4a845 Merge branch 'staging' into develop 2018-12-26 12:03:03 +00:00
rohitwaghchaure
ef5791a11e
Merge pull request #6397 from surajshetty3416/staging-fixes 
Permission refactor and bug fixes
 2018-12-26 12:01:20 +05:30
Chinmay Pai
3dc57118ea fix(data-import): Import data in batches (#6673) 
* data_import: import data in a batch

data import for a lot of items (more than 200,000?) is not really appreciated by mariadb, so instead we import data in batches.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>

* fix: Fetch batch size from site_config
 2018-12-25 15:10:51 +05:30
Suraj Shetty
574b970afd Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-12-25 12:23:00 +05:30
rohitwaghchaure
22fe10148a [Fix] Translation not working for the html data (#6647) 
* [Fix] Translation not working for the html data

* Test cases

* Fixed codacy

* Fixed is html method

* Fixed test cases
 2018-12-24 15:17:38 +05:30
rohitwaghchaure
574446e092 [Fix] Notification count not showing for the doctypes like purchase order, sales invoice (#6657) 2018-12-24 13:10:58 +05:30
Rushabh Mehta
fafabac492 fix(test): test_report.py 2018-12-23 19:26:23 +05:30
Faris Ansari
d81797c7dd fix: Remove QUnit boilerplate (#6655) 2018-12-21 13:23:16 +05:30
Aditya Hase
dcb1c1170b fix(test): Add accidentally removed lines 
During release v10.1.68 these two lines were accidentally removed,
add them back.
 2018-12-20 14:28:19 +05:30
Suraj Shetty
81911b9373
Merge branch 'staging-fixes' into staging-fixes 2018-12-20 12:27:06 +05:30
Suraj Shetty
432d22ba76 Add get_permitted_documents function 2018-12-19 19:59:58 +05:30
Frappe Bot
d2c652ef3a Merge branch 'staging' into develop 2018-12-19 06:30:46 +00:00
Frappe Bot
395972bf0b Merge branch 'master' into staging-fixes 2018-12-19 06:26:37 +00:00
Suraj Shetty
45911faa23
Merge branch 'staging-fixes' into staging-fixes 2018-12-18 15:26:11 +05:30
Saurabh
2de5dfdbb3 Merge branch 'staging' into develop 2018-12-18 10:20:24 +05:30
Shreya Shah
5e7e78c2de fix: comment mentions (#6611) 
* fix: replace br with div

* test: Add test coverage
 2018-12-18 09:01:55 +05:30
Shreya Shah
3128723b09 fix: pass parameters as list (#6625) 
* fix: pass parameters as list

* test: Add test case

* test: Add json data for test
 2018-12-18 09:01:29 +05:30
Shreya Shah
b247cae12e fix: pass parameters as list (#6626) 
* fix: pass parameters as list

* test: Add test case

* test: Add json file for test data
 2018-12-18 08:54:26 +05:30
Suraj Shetty
6afc7a4b8a Append self doctype to get_applicable_for_doctype_list 2018-12-11 18:19:46 +05:30
Suraj Shetty
7b5e28088e Fix user permission validation 2018-12-11 18:19:23 +05:30
Suraj Shetty
9a0ff3bad0 Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-12-10 16:27:00 +05:30
Chinmay Pai
b00df7783d
prepared_report: fix file-api reference 
this removes the unnecessarily declared get_file() method, favoring the file-api get_content() method. also removes a reference to the deprecated file_manager.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-12-09 11:45:53 +05:30
Saurabh
7b7a492380 Merge branch 'staging' into develop 2018-12-07 17:56:57 +05:30
Faris Ansari
f23700d33a
Merge pull request #6586 from Thunderbottom/email-attachment-fix 
communication: fix attachments in email queue and generated reports
 2018-12-07 16:38:05 +05:30
Chinmay Pai
25f5d65632
communication: handle attachment case for both filename and fileid 
some incoming files could have either filename or fileid for whatever reason. this handles both those cases (at least for now).

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-12-06 19:32:10 +05:30
Chinmay Pai
ba0045ef1f
communication: fix attachments in email queue and generated reports 
so, apparently i messed up some things that were responsible for handling file attachments in email queue and attached on-the-fly generated reports. these issues should be fixed now.

Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>
 2018-12-06 18:12:34 +05:30
Faris Ansari
7660ac8f98 fix: Use frappe.as_json instead of json.dumps 2018-12-06 17:24:54 +05:30
Aditya Hase
49e5d4e21f fix(prepared-report): Set prepared_report_name query param in Link to query report 
Since visiting the query report URL will show most recently generated report
that matches given filters, Explicitly mention which Prepared Report is going
to be rendered.
 2018-12-06 16:01:42 +05:30
Aditya Hase
013f6ceffc fix(prepared-report): Uncompress Prepared Report data files before downloading 2018-12-06 16:01:42 +05:30
Aditya Hase
fc48597694 fix(prepared-report): Python 2 compatibility fix 
gzip.compress and gzip.decompress were introduced in Python 3.2

Added gzip_compress and gzip_decompress to frappe.utils to add this functionality
to both Python 2 and 3
 2018-12-06 16:01:41 +05:30
Aditya Hase
d76a0136dd refactor(prepared-report): Do not serialize JSON serialized filters 
Prepared report filters were being JSON serialized twice.
There isn't any apparent need to do this. So don't do it.
 2018-12-06 16:01:41 +05:30
Aditya Hase
0919234b66 fix(prepared-report): Serialize Prepared Report data to JSON 
CSV serialization causes information loss for erpnext reports like P&L Statement,
rendering such reports unusable.

Also stored files are gzip compressed to reduce space requirement

Note: This will cause all previously generated reports to break, this should be fixed
 2018-12-06 16:01:41 +05:30
Ameya Shenoy
13524a1ad5
Merge branch 'staging' into develop 2018-11-23 08:14:29 +00:00
Rushabh Mehta
734fa9129d
Merge branch 'staging-fixes' into staging-fixes 2018-11-22 11:38:11 +01:00
Aditya Hase
02d8edd332 [Feature] Markdown Editor (#6383) 
* feat(markdown-editor): Add new fieldtype - MarkdownEditor

* feat(markdown-editor): Add MarkdownEditor control

* fix(markdown-editor): Fix placement of "Show Preview" button

* fix(markdown-editor): Render HTML in prints
 2018-11-22 11:37:50 +01:00
KanchanChauhan
f581ebfbb8 feat: Restrict user in mentions (#6520) 
Avoid mentioning and accidentally sending email to Supplier or Customer or left employees
 2018-11-22 11:50:46 +05:30
Daniel Morlock
9d18c76cfa fix: errors when sending auto email report with 'CSV' type (#6468) 2018-11-22 10:17:35 +05:30
RA-dim
144d6f8cc2 fix[Data Import]: "Not found" error on recently uploaded XLSX file. (#6510) 2018-11-22 09:42:46 +05:30
Ameya Shenoy
c97577577e fix(communication): indentation (#6513) 2018-11-22 09:38:05 +05:30
Suraj Shetty
e79cfc531a Merge branch 'staging-fixes' of https://github.com/frappe/frappe into staging-fixes 2018-11-21 13:18:33 +05:30
Sagar Vora
c5bd405c13 fix(user): remove trailing whitespaces, revert email signature to text editor (html friendly) (#6499) 2018-11-20 16:20:23 +05:30
RicardoJohann
28a413fe83 fix: Save related drafts when switching between reply and reply-all (#6491) 2018-11-20 16:01:30 +05:30
Shreya Shah
d74da75a8d fix: Add download with data checkbox (#6494) 2018-11-20 15:57:21 +05:30
Frappe Bot
22f4433406 Merge branch 'staging' into develop 2018-11-13 11:02:24 +00:00
Suraj Shetty
c3e5ba361f Add apply_to_all_doctypes field and 
custom query for applicable_for field
 2018-11-12 18:23:03 +05:30
Rohit Waghchaure
a5645fec64 [Fix] Date format not shwoing properly in the prepared report 2018-11-11 17:53:11 +05:30
Frappe Bot
478e60fdb1 Merge branch 'staging' into develop 2018-11-09 10:18:33 +00:00
Suraj Shetty
68172aff5f Remove anticipated exception by adding a check (#6424) 2018-11-09 10:50:06 +05:30
Faris Ansari
184a3f57bc
style: Missing semicolon 2018-11-07 18:32:29 +05:30