{"action":"created","comment":{"url":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/comments/184385221","pull_request_review_id":115569911,"id":184385221,"diff_hunk":"@@ -49,6 +49,7 @@ class ReportTemplate(models.Model):\n     file_address = fields.Char(u'模板文件路径',required=True)\n     active = fields.Boolean(u'可用', default=True)\n     blank_rows = fields.Integer(u'空白行数',required=True)\n+    header_rows = fields.Integer(u'表头行数',required=True)","path":"web_export_view_good/controllers/controllers.py","position":4,"original_position":4,"commit_id":"febfee865e97b558b71ec7ebc436940ede55de2d","original_commit_id":"febfee865e97b558b71ec7ebc436940ede55de2d","user":{"login":"GoodERPJeff","id":1857069,"avatar_url":"https://avatars1.githubusercontent.com/u/1857069?v=4","gravatar_id":"","url":"https://api.github.com/users/GoodERPJeff","html_url":"https://github.com/GoodERPJeff","followers_url":"https://api.github.com/users/GoodERPJeff/followers","following_url":"https://api.github.com/users/GoodERPJeff/following{/other_user}","gists_url":"https://api.github.com/users/GoodERPJeff/gists{/gist_id}","starred_url":"https://api.github.com/users/GoodERPJeff/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/GoodERPJeff/subscriptions","organizations_url":"https://api.github.com/users/GoodERPJeff/orgs","repos_url":"https://api.github.com/users/GoodERPJeff/repos","events_url":"https://api.github.com/users/GoodERPJeff/events{/privacy}","received_events_url":"https://api.github.com/users/GoodERPJeff/received_events","type":"User","site_admin":false},"body":"这个必输没必要，可以去掉。 这样ci就会被修复了。","created_at":"2018-04-26T13:19:18Z","updated_at":"2018-04-26T13:19:18Z","html_url":"https://github.com/osbzr/gooderp_addons/pull/1713#discussion_r184385221","pull_request_url":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/1713","author_association":"CONTRIBUTOR","_links":{"self":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/comments/184385221"},"html":{"href":"https://github.com/osbzr/gooderp_addons/pull/1713#discussion_r184385221"},"pull_request":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/1713"}}},"pull_request":{"url":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/1713","id":184330472,"html_url":"https://github.com/osbzr/gooderp_addons/pull/1713","diff_url":"https://github.com/osbzr/gooderp_addons/pull/1713.diff","patch_url":"https://github.com/osbzr/gooderp_addons/pull/1713.patch","issue_url":"https://api.github.com/repos/osbzr/gooderp_addons/issues/1713","number":1713,"state":"open","locked":false,"title":"增强 在 list 视图，可以支持多于2个 栏位的合并","user":{"login":"jeffery9","id":1404460,"avatar_url":"https://avatars1.githubusercontent.com/u/1404460?v=4","gravatar_id":"","url":"https://api.github.com/users/jeffery9","html_url":"https://github.com/jeffery9","followers_url":"https://api.github.com/users/jeffery9/followers","following_url":"https://api.github.com/users/jeffery9/following{/other_user}","gists_url":"https://api.github.com/users/jeffery9/gists{/gist_id}","starred_url":"https://api.github.com/users/jeffery9/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeffery9/subscriptions","organizations_url":"https://api.github.com/users/jeffery9/orgs","repos_url":"https://api.github.com/users/jeffery9/repos","events_url":"https://api.github.com/users/jeffery9/events{/privacy}","received_events_url":"https://api.github.com/users/jeffery9/received_events","type":"User","site_admin":false},"body":"增强 在 导出excel 是，可以支持表格表头跨行单元格合并\r\n\r\n本次提交合并增加的功能或解决的问题：\r\n---\r\nFix #1711 \r\n\r\n提交前:\r\n---\r\n\r\n\r\n提交后:\r\n---\r\n\r\n\r\n--\r\n我确认贡献此代码版权给GoodERP项目\r\n","created_at":"2018-04-26T12:54:59Z","updated_at":"2018-04-26T13:19:18Z","closed_at":null,"merged_at":null,"merge_commit_sha":"686346b6a7ba5df2970b378f8ba0ad399f6eb00a","assignee":null,"assignees":[],"requested_reviewers":[],"requested_teams":[],"labels":[],"milestone":null,"commits_url":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/1713/commits","review_comments_url":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/1713/comments","review_comment_url":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/comments{/number}","comments_url":"https://api.github.com/repos/osbzr/gooderp_addons/issues/1713/comments","statuses_url":"https://api.github.com/repos/osbzr/gooderp_addons/statuses/febfee865e97b558b71ec7ebc436940ede55de2d","head":{"label":"jeffery9:fix_export_excel","ref":"fix_export_excel","sha":"febfee865e97b558b71ec7ebc436940ede55de2d","user":{"login":"jeffery9","id":1404460,"avatar_url":"https://avatars1.githubusercontent.com/u/1404460?v=4","gravatar_id":"","url":"https://api.github.com/users/jeffery9","html_url":"https://github.com/jeffery9","followers_url":"https://api.github.com/users/jeffery9/followers","following_url":"https://api.github.com/users/jeffery9/following{/other_user}","gists_url":"https://api.github.com/users/jeffery9/gists{/gist_id}","starred_url":"https://api.github.com/users/jeffery9/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeffery9/subscriptions","organizations_url":"https://api.github.com/users/jeffery9/orgs","repos_url":"https://api.github.com/users/jeffery9/repos","events_url":"https://api.github.com/users/jeffery9/events{/privacy}","received_events_url":"https://api.github.com/users/jeffery9/received_events","type":"User","site_admin":false},"repo":{"id":56234957,"name":"gooderp_addons","full_name":"jeffery9/gooderp_addons","owner":{"login":"jeffery9","id":1404460,"avatar_url":"https://avatars1.githubusercontent.com/u/1404460?v=4","gravatar_id":"","url":"https://api.github.com/users/jeffery9","html_url":"https://github.com/jeffery9","followers_url":"https://api.github.com/users/jeffery9/followers","following_url":"https://api.github.com/users/jeffery9/following{/other_user}","gists_url":"https://api.github.com/users/jeffery9/gists{/gist_id}","starred_url":"https://api.github.com/users/jeffery9/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/jeffery9/subscriptions","organizations_url":"https://api.github.com/users/jeffery9/orgs","repos_url":"https://api.github.com/users/jeffery9/repos","events_url":"https://api.github.com/users/jeffery9/events{/privacy}","received_events_url":"https://api.github.com/users/jeffery9/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/jeffery9/gooderp_addons","description":"可能是中国用户数最多的开源ERP","fork":true,"url":"https://api.github.com/repos/jeffery9/gooderp_addons","forks_url":"https://api.github.com/repos/jeffery9/gooderp_addons/forks","keys_url":"https://api.github.com/repos/jeffery9/gooderp_addons/keys{/key_id}","collaborators_url":"https://api.github.com/repos/jeffery9/gooderp_addons/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/jeffery9/gooderp_addons/teams","hooks_url":"https://api.github.com/repos/jeffery9/gooderp_addons/hooks","issue_events_url":"https://api.github.com/repos/jeffery9/gooderp_addons/issues/events{/number}","events_url":"https://api.github.com/repos/jeffery9/gooderp_addons/events","assignees_url":"https://api.github.com/repos/jeffery9/gooderp_addons/assignees{/user}","branches_url":"https://api.github.com/repos/jeffery9/gooderp_addons/branches{/branch}","tags_url":"https://api.github.com/repos/jeffery9/gooderp_addons/tags","blobs_url":"https://api.github.com/repos/jeffery9/gooderp_addons/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/jeffery9/gooderp_addons/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/jeffery9/gooderp_addons/git/refs{/sha}","trees_url":"https://api.github.com/repos/jeffery9/gooderp_addons/git/trees{/sha}","statuses_url":"https://api.github.com/repos/jeffery9/gooderp_addons/statuses/{sha}","languages_url":"https://api.github.com/repos/jeffery9/gooderp_addons/languages","stargazers_url":"https://api.github.com/repos/jeffery9/gooderp_addons/stargazers","contributors_url":"https://api.github.com/repos/jeffery9/gooderp_addons/contributors","subscribers_url":"https://api.github.com/repos/jeffery9/gooderp_addons/subscribers","subscription_url":"https://api.github.com/repos/jeffery9/gooderp_addons/subscription","commits_url":"https://api.github.com/repos/jeffery9/gooderp_addons/commits{/sha}","git_commits_url":"https://api.github.com/repos/jeffery9/gooderp_addons/git/commits{/sha}","comments_url":"https://api.github.com/repos/jeffery9/gooderp_addons/comments{/number}","issue_comment_url":"https://api.github.com/repos/jeffery9/gooderp_addons/issues/comments{/number}","contents_url":"https://api.github.com/repos/jeffery9/gooderp_addons/contents/{+path}","compare_url":"https://api.github.com/repos/jeffery9/gooderp_addons/compare/{base}...{head}","merges_url":"https://api.github.com/repos/jeffery9/gooderp_addons/merges","archive_url":"https://api.github.com/repos/jeffery9/gooderp_addons/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/jeffery9/gooderp_addons/downloads","issues_url":"https://api.github.com/repos/jeffery9/gooderp_addons/issues{/number}","pulls_url":"https://api.github.com/repos/jeffery9/gooderp_addons/pulls{/number}","milestones_url":"https://api.github.com/repos/jeffery9/gooderp_addons/milestones{/number}","notifications_url":"https://api.github.com/repos/jeffery9/gooderp_addons/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/jeffery9/gooderp_addons/labels{/name}","releases_url":"https://api.github.com/repos/jeffery9/gooderp_addons/releases{/id}","deployments_url":"https://api.github.com/repos/jeffery9/gooderp_addons/deployments","created_at":"2016-04-14T12:19:38Z","updated_at":"2018-04-26T12:51:36Z","pushed_at":"2018-04-26T12:54:30Z","git_url":"git://github.com/jeffery9/gooderp_addons.git","ssh_url":"git@github.com:jeffery9/gooderp_addons.git","clone_url":"https://github.com/jeffery9/gooderp_addons.git","svn_url":"https://github.com/jeffery9/gooderp_addons","homepage":null,"size":1423,"stargazers_count":1,"watchers_count":1,"language":"Python","has_issues":false,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":1,"mirror_url":null,"archived":false,"open_issues_count":0,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0"},"forks":1,"open_issues":0,"watchers":1,"default_branch":"master"}},"base":{"label":"osbzr:master","ref":"master","sha":"a1cd8671128bcb668bf3f5a2dae27bece6ea380c","user":{"login":"osbzr","id":3438646,"avatar_url":"https://avatars0.githubusercontent.com/u/3438646?v=4","gravatar_id":"","url":"https://api.github.com/users/osbzr","html_url":"https://github.com/osbzr","followers_url":"https://api.github.com/users/osbzr/followers","following_url":"https://api.github.com/users/osbzr/following{/other_user}","gists_url":"https://api.github.com/users/osbzr/gists{/gist_id}","starred_url":"https://api.github.com/users/osbzr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/osbzr/subscriptions","organizations_url":"https://api.github.com/users/osbzr/orgs","repos_url":"https://api.github.com/users/osbzr/repos","events_url":"https://api.github.com/users/osbzr/events{/privacy}","received_events_url":"https://api.github.com/users/osbzr/received_events","type":"Organization","site_admin":false},"repo":{"id":55025852,"name":"gooderp_addons","full_name":"osbzr/gooderp_addons","owner":{"login":"osbzr","id":3438646,"avatar_url":"https://avatars0.githubusercontent.com/u/3438646?v=4","gravatar_id":"","url":"https://api.github.com/users/osbzr","html_url":"https://github.com/osbzr","followers_url":"https://api.github.com/users/osbzr/followers","following_url":"https://api.github.com/users/osbzr/following{/other_user}","gists_url":"https://api.github.com/users/osbzr/gists{/gist_id}","starred_url":"https://api.github.com/users/osbzr/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/osbzr/subscriptions","organizations_url":"https://api.github.com/users/osbzr/orgs","repos_url":"https://api.github.com/users/osbzr/repos","events_url":"https://api.github.com/users/osbzr/events{/privacy}","received_events_url":"https://api.github.com/users/osbzr/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/osbzr/gooderp_addons","description":"可能是中国用户数最多的开源ERP","fork":false,"url":"https://api.github.com/repos/osbzr/gooderp_addons","forks_url":"https://api.github.com/repos/osbzr/gooderp_addons/forks","keys_url":"https://api.github.com/repos/osbzr/gooderp_addons/keys{/key_id}","collaborators_url":"https://api.github.com/repos/osbzr/gooderp_addons/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/osbzr/gooderp_addons/teams","hooks_url":"https://api.github.com/repos/osbzr/gooderp_addons/hooks","issue_events_url":"https://api.github.com/repos/osbzr/gooderp_addons/issues/events{/number}","events_url":"https://api.github.com/repos/osbzr/gooderp_addons/events","assignees_url":"https://api.github.com/repos/osbzr/gooderp_addons/assignees{/user}","branches_url":"https://api.github.com/repos/osbzr/gooderp_addons/branches{/branch}","tags_url":"https://api.github.com/repos/osbzr/gooderp_addons/tags","blobs_url":"https://api.github.com/repos/osbzr/gooderp_addons/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/osbzr/gooderp_addons/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/osbzr/gooderp_addons/git/refs{/sha}","trees_url":"https://api.github.com/repos/osbzr/gooderp_addons/git/trees{/sha}","statuses_url":"https://api.github.com/repos/osbzr/gooderp_addons/statuses/{sha}","languages_url":"https://api.github.com/repos/osbzr/gooderp_addons/languages","stargazers_url":"https://api.github.com/repos/osbzr/gooderp_addons/stargazers","contributors_url":"https://api.github.com/repos/osbzr/gooderp_addons/contributors","subscribers_url":"https://api.github.com/repos/osbzr/gooderp_addons/subscribers","subscription_url":"https://api.github.com/repos/osbzr/gooderp_addons/subscription","commits_url":"https://api.github.com/repos/osbzr/gooderp_addons/commits{/sha}","git_commits_url":"https://api.github.com/repos/osbzr/gooderp_addons/git/commits{/sha}","comments_url":"https://api.github.com/repos/osbzr/gooderp_addons/comments{/number}","issue_comment_url":"https://api.github.com/repos/osbzr/gooderp_addons/issues/comments{/number}","contents_url":"https://api.github.com/repos/osbzr/gooderp_addons/contents/{+path}","compare_url":"https://api.github.com/repos/osbzr/gooderp_addons/compare/{base}...{head}","merges_url":"https://api.github.com/repos/osbzr/gooderp_addons/merges","archive_url":"https://api.github.com/repos/osbzr/gooderp_addons/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/osbzr/gooderp_addons/downloads","issues_url":"https://api.github.com/repos/osbzr/gooderp_addons/issues{/number}","pulls_url":"https://api.github.com/repos/osbzr/gooderp_addons/pulls{/number}","milestones_url":"https://api.github.com/repos/osbzr/gooderp_addons/milestones{/number}","notifications_url":"https://api.github.com/repos/osbzr/gooderp_addons/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/osbzr/gooderp_addons/labels{/name}","releases_url":"https://api.github.com/repos/osbzr/gooderp_addons/releases{/id}","deployments_url":"https://api.github.com/repos/osbzr/gooderp_addons/deployments","created_at":"2016-03-30T02:27:10Z","updated_at":"2018-04-26T08:43:25Z","pushed_at":"2018-04-26T12:54:59Z","git_url":"git://github.com/osbzr/gooderp_addons.git","ssh_url":"git@github.com:osbzr/gooderp_addons.git","clone_url":"https://github.com/osbzr/gooderp_addons.git","svn_url":"https://github.com/osbzr/gooderp_addons","homepage":"http://www.gooderp.org","size":22928,"stargazers_count":607,"watchers_count":607,"language":"Python","has_issues":true,"has_projects":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":453,"mirror_url":null,"archived":false,"open_issues_count":45,"license":{"key":"agpl-3.0","name":"GNU Affero General Public License v3.0","spdx_id":"AGPL-3.0","url":"https://api.github.com/licenses/agpl-3.0"},"forks":453,"open_issues":45,"watchers":607,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/1713"},"html":{"href":"https://github.com/osbzr/gooderp_addons/pull/1713"},"issue":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/issues/1713"},"comments":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/issues/1713/comments"},"review_comments":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/1713/comments"},"review_comment":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/pulls/1713/commits"},"statuses":{"href":"https://api.github.com/repos/osbzr/gooderp_addons/statuses/febfee865e97b558b71ec7ebc436940ede55de2d"}},"author_association":"CONTRIBUTOR"}}
{"actor":{"display_login":"GoodERPJeff"}}