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

28905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
deepeshgarg007
c82aed0718 fix: Add missing semicolon 2019-11-01 12:36:33 +05:30
Rohan
fba7cae2c9
Merge branch 'develop' into dev-serial-no-statuses 2019-10-29 11:25:36 +05:30
Deepesh Garg
9942fcc8cb fix: Better validation msg for difference account in Stock Entry (#19400) 
* fix: Better validation msg for difference account

* fix: Make primary info bold
 2019-10-28 12:08:31 +05:30
Suraj Shetty
83b58352ce fix: Overwrite default cost center if item has default cost center set. (#19405) 2019-10-28 12:05:30 +05:30
Deepesh Garg
a8358f0342
Merge pull request #19415 from frappe/jaichavan-fix-typo 
fix: typo in Budget Variance Report
 2019-10-27 18:39:23 +05:30
Deepesh Garg
8e7bb002e2
Merge pull request #19317 from frappe/revert-19265-issue_fix 
refactor: Remove ignore_disabled flag from issue doctype
 2019-10-27 18:38:53 +05:30
Shivam Mishra
5e14660dda
Merge branch 'develop' into revert-19265-issue_fix 2019-10-27 17:36:08 +05:30
Saurabh
53794a9029
Merge pull request #19417 from frappe/v12-pre-release 
V12 pre release
 2019-10-26 20:06:53 +05:30
Sahil Khan
0c0604b7ee Merge branch 'v12-pre-release' into version-12 2019-10-26 20:02:19 +05:30
Sahil Khan
e6f86c934d bumped to version 12.1.8 2019-10-26 20:22:19 +05:50
Sahil Khan
970788c64e Merge branch 'v12-pre-release' of https://github.com/frappe/erpnext into v12-pre-release 2019-10-26 19:56:31 +05:30
Sahil Khan
ce5200d700 bumped to version 12.1.7 2019-10-26 19:56:06 +05:30
Jai Chavan
9f483c1fa9
fix: Spelling of Variance 2019-10-26 18:45:01 +05:30
Saurabh
213785e6d5
Merge pull request #19409 from surajshetty3416/accounting-module-fix 
fix: Patch to replace accounting with accounts in home_settings
 2019-10-26 11:14:25 +05:30
Suraj Shetty
8f67ef8a75 fix: Add patch to replace accounting with accounts in home_settings 2019-10-25 18:55:57 +05:30
Deepesh Garg
09a6868ccd
Merge pull request #19390 from 0Pranav/patch-1 
fix: setting incorrect field for party bank account
 2019-10-25 12:24:39 +05:30
Ashish Shah
e1f95c0529 fix: allow_items_not_in_stock should be evaluated (#19398) 2019-10-25 12:16:11 +05:30
Aditya Hase
7bdc612013 chore: Update module name (#19404) 2019-10-24 18:01:58 +05:30
Sahil Khan
6d9a300a85 Merge branch 'v12-pre-release' into version-12 2019-10-24 17:30:19 +05:30
Sahil Khan
758635ab91 bumped to version 12.1.7 2019-10-24 17:50:19 +05:50
rohitwaghchaure
5d0362669d
Merge pull request #19386 from rohitwaghchaure/while_making_return_entry_not_able_to_select_null_batch 
fix: not able to select the zero qty batch while making the sales ret…
 2019-10-23 18:35:58 +05:30
rohitwaghchaure
1da236fdd2
Merge pull request #19322 from ashish-greycube/item_row_link_issue 
Item row link issue
 2019-10-23 18:06:36 +05:30
Pranav Nachnekar
d5166861de
fix:setting incorrect field for party bank account 
Previously
![wrong](https://user-images.githubusercontent.com/6195660/67369702-0671c000-f569-11e9-9916-a1d1a0c3ddd1.gif)

Corrected
![corrected](https://user-images.githubusercontent.com/6195660/67369663-f9ed6780-f568-11e9-859b-cbfa9857b39e.gif)
 2019-10-23 07:46:00 +00:00
Deepesh Garg
d9e27b727f
Merge branch 'develop' into item_row_link_issue 2019-10-23 12:20:19 +05:30
Deepesh Garg
275f3f8b91
Merge pull request #19320 from deepeshgarg007/demo-fixes 
fix: Demo Script fixes
 2019-10-23 12:17:08 +05:30
Deepesh Garg
3f96306986
Merge pull request #19375 from khushalti/develop 
fix: date validation, setting up default company, customer/supplier manadatory property on Blanket Order
 2019-10-23 12:11:13 +05:30
rohitwaghchaure
5ff377e2bb fix: product link not working in website (#19373) 2019-10-23 11:09:21 +05:30
deepeshgarg007
799f8d4f93 Merge branch 'develop' of https://github.com/frappe/erpnext into demo-fixes 2019-10-23 08:47:11 +05:30
Deepesh Garg
36c97c3128
Merge pull request #19385 from ruchamahabal/fix_moduleview 
fix: custom doctypes and reports not visible in Accounts module view
 2019-10-22 17:34:38 +05:30
Deepesh Garg
453ad3c155
Merge branch 'develop' into develop 2019-10-22 17:30:13 +05:30
Shivam Mishra
85c028b60d
Merge branch 'develop' into revert-19265-issue_fix 2019-10-22 17:26:54 +05:30
Rohan
8522fdc99c
Merge branch 'develop' into dev-serial-no-statuses 2019-10-22 17:11:30 +05:30
gavin
2f63529029
Merge pull request #19384 from gavindsouza/docs-templates 
chore(docs): added issue, PR templates, updated SECURITY policy
 2019-10-22 15:30:40 +05:30
gavin
e89d4e2b7f
Merge branch 'develop' into docs-templates 2019-10-22 15:16:02 +05:30
Nabin Hait
bd6b1806cd fix: fixed asset register report and made skip-dn field hidden 2019-10-22 14:28:37 +05:30
Rohit Waghchaure
d8ddd1e2ec fix: not able to select the zero qty batch while making the sales return entry 2019-10-22 14:05:13 +05:30
Rucha Mahabal
b5bd3f3abf fix: custom doctypes and reports not visible in Accounts module view 2019-10-22 13:38:36 +05:30
Gavin D'souza
ce77c4ac4c fix(docs): link update frappe => erpnext 2019-10-22 13:20:02 +05:30
Gavin D'souza
22bc0a929b chore(docs): Added contribution templates, SECURITY policy 2019-10-22 13:14:57 +05:30
Nabin Hait
bebbc6371b fix: Validation message in work order 2019-10-22 12:35:28 +05:30
Saurabh
bdc899857c Fix: Shopify payload operations logging (#19366) 
* fix: payload logging for shopify

* fix: remove print statements
 2019-10-22 12:31:56 +05:30
Anurag Mishra
b7e9e2a1a5 fix: if naming if item-code and index both are same (#19371) 2019-10-22 11:47:03 +05:30
Anurag Mishra
eaff541349 fix: query (#19376) 2019-10-22 11:46:17 +05:30
Deepesh Garg
a324be86d2
Merge branch 'develop' into develop 2019-10-21 21:23:23 +05:30
Khushal Trivedi
e22ca23b81 fix: fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order 2019-10-21 18:17:42 +05:30
gavin
ed8e3b3786 fix: link field country in shopping cart (#19370) 2019-10-21 18:12:29 +05:30
Khushal Trivedi
974f04be24 Merge branch 'develop' of https://github.com/khushalti/erpnext into develop 2019-10-21 17:57:45 +05:30
Khushal Trivedi
ad71307a5e fix: date validation, setting up default conpany, customer/supplier manadatory property on Blanket Order 2019-10-21 17:46:35 +05:30
Khushal Trivedi
ce5c2d8682 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-10-21 17:36:19 +05:30
Khushal Trivedi
cdebd400ec [Fix] - changed codacy changers suggested 2019-10-21 16:29:16 +05:30