Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,800 Commits 3 Branches 0 Tags 1 GiB
614f5adf6d
Commit Graph

25800 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe Bot
f74e28bc64 Merge branch 'staging-fixes' into staging 2019-01-23 08:12:19 +00:00
Frappe Bot
2d5bf69dc4 bumped to version 11.0.3-beta.37 2019-01-23 08:12:19 +00:00
Frappe Bot
34121bc81a Merge branch 'master' into staging-fixes 2019-01-23 08:08:55 +00:00
Frappe Bot
d801437f5f Merge branch 'hotfix' 2019-01-23 08:08:53 +00:00
Frappe Bot
342854f6f2 bumped to version 10.1.80 2019-01-23 08:08:53 +00:00
Nabin Hait
06607fda4e
fix: removed print statement 2019-01-23 12:15:48 +05:30
Nabin Hait
141c543f97
Update journal_entry.js 2019-01-23 12:14:55 +05:30
Nabin Hait
36706c04bb
Merge pull request #16451 from nabinhait/unicode-issue 
fix: Unicode issue in purchase invoice
 2019-01-23 12:11:00 +05:30
Nabin Hait
d2e2ca31ac
Merge pull request #16460 from nabinhait/pricing-rule-issue 
fix: Enforce pricing rule based on rate on server side
 2019-01-23 12:09:12 +05:30
Nabin Hait
fb8c0bd664
Merge pull request #16464 from adityahase/flakes 
style: Linting fixes
 2019-01-23 12:08:57 +05:30
Nabin Hait
5b2922f76c
Merge pull request #16466 from nabinhait/project-nonetype 
fix(projects): None type handling while updating tasks
 2019-01-23 12:07:25 +05:30
Nabin Hait
4ef578e1c4
Merge pull request #16406 from rohitwaghchaure/newchanges_in_tds_reports 
fix: Multiple fixes in the reports
 2019-01-23 12:05:36 +05:30
Nabin Hait
49e09624d6 fix(projects): None type handling while updating tasks 2019-01-23 10:43:00 +05:30
Nabin Hait
8c2a2c8f60 fix(accounts): Validate gst accounts defined in GST Settings in eway bill report 2019-01-23 10:33:47 +05:30
Aditya Hase
819a16d0f5 fix(dead-code): Remove .py files (#16462) 2019-01-23 07:57:08 +05:30
Aditya Hase
f79937d64b style: Remove unused imports 2019-01-23 00:28:37 +05:30
Aditya Hase
55a08dee78 style: Remove unusued local variable 2019-01-23 00:28:02 +05:30
Aditya Hase
4b4265f8a7 fix(dead-code): Remove .py files (#16457) 2019-01-22 20:54:21 +05:30
FinByz Tech Pvt. Ltd
237a871f17 fix: NoneType object has no attribute "gstin" (#16458) 
* fix: NoneType object has no attribute "gstin"

* fix: handle NoneType values
 2019-01-22 20:49:06 +05:30
Nabin Hait
da32916396 fix: Enforce pricing rule based on rate on server side 2019-01-22 19:06:06 +05:30
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Sagar Vora
c4bda9fac3 Merge branch 'staging' into develop 2019-01-22 18:17:09 +05:30
Sagar Vora
4d418b98f3 Merge branch 'staging-fixes' into staging 2019-01-22 18:17:09 +05:30
Sagar Vora
5555b2802f bumped to version 11.0.3-beta.36 2019-01-22 18:37:09 +05:50
Sagar Vora
c84e3fe21b Merge branch 'master' into staging-fixes 2019-01-22 18:16:13 +05:30
Sagar Vora
33bc3f3309 Merge branch 'hotfix' 2019-01-22 18:15:44 +05:30
Sagar Vora
2a9a867f05 bumped to version 10.1.79 2019-01-22 18:35:44 +05:50
Sagar Vora
ecf6467799
fix(travis): Redis must be working for caching, so reverting (#16455) 2019-01-22 17:41:56 +05:30
Saif Ur Rehman
74a3370095 Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 
# Conflicts:
#	erpnext/buying/doctype/purchase_order/purchase_order.json
#	erpnext/patches.txt
#	erpnext/selling/doctype/quotation/quotation.json
#	erpnext/selling/doctype/sales_order/sales_order.json
 2019-01-22 16:20:40 +05:00
Sagar Vora
4d1a9b10ed Merge branch 'staging' into develop 2019-01-22 15:56:39 +05:30
Sagar Vora
815c575a0b Merge branch 'staging-fixes' into staging 2019-01-22 15:45:56 +05:30
Sagar Vora
64d774d178 bumped to version 11.0.3-beta.35 2019-01-22 16:05:56 +05:50
Nabin Hait
a5270e561f fix: Unicode issue in purchase invoice 2019-01-22 15:43:04 +05:30
Sagar Vora
ceacacc320 Merge branch 'master' into staging-fixes 2019-01-22 15:37:05 +05:30
Sagar Vora
8c8e4fd130 Merge branch 'hotfix' 2019-01-22 15:33:48 +05:30
Sagar Vora
1e61dd024b bumped to version 10.1.78 2019-01-22 15:53:48 +05:50
Nabin Hait
cdcf474f12
Merge pull request #16447 from adityahase/ars-fix 
fix(ar-summary-report): Changes to column list to match recent changes in AR Report
 2019-01-22 15:08:46 +05:30
Nabin Hait
5582cadae3
Merge pull request #16332 from deepeshgarg007/email_digest 
feat: Links to report in email digest
 2019-01-22 14:30:46 +05:30
Rohit Waghchaure
ddd9136d10 Renamed field and added finance book column in the trial balance simple report 2019-01-22 14:11:57 +05:30
Aditya Hase
d157ae17b7 fix(ar-summary-report): Changes to column list to match recent changes in AR report 2019-01-22 13:37:54 +05:30
Zlash65
270c4c2a87 fix: push party filter only if applicable 2019-01-22 12:47:25 +05:30
Zlash65
c8d632ddff fix: add set query for payroll entry in JV 2019-01-22 12:46:13 +05:30
Nabin Hait
22923ed663
Merge branch 'staging-fixes' into pr_staging_fixes_2 2019-01-22 10:51:59 +05:30
Nabin Hait
f0ea152022
Merge pull request #16289 from Anurag810/Quality-inspection-fix 
fix: validated quality inspection for delivery note(DN) and purchase receipt(PR)
 2019-01-22 10:49:55 +05:30
Nabin Hait
a334ed879f
Update __init__.py 2019-01-22 10:41:50 +05:30
Nabin Hait
9adfd2d7b4
Merge pull request #16419 from rohitwaghchaure/project_update_status_code_and_design_refactoring 
fix: Project update status feature's code and design refactored
 2019-01-22 10:02:34 +05:30
Nabin Hait
b9b8d575bc
Merge pull request #16435 from deepeshgarg007/support-fix 
fix(accounts_receivable): Bug fix in accounts receivable report
 2019-01-22 09:59:17 +05:30
Nabin Hait
48fa697d54
Merge pull request #16439 from nabinhait/disable-rounded-total 
fix: Disable rounded total field's value honours docfield's default value
 2019-01-22 09:58:06 +05:30
Nabin Hait
16bbf09947
Merge pull request #16440 from rohitwaghchaure/not_able_to_submit_work_order 
fix: not able to submit work order
 2019-01-22 09:57:49 +05:30
Nabin Hait
0abfcb5516
Merge pull request #16442 from rohitwaghchaure/pos_query_code_cleanup 
fix: Code cleanup
 2019-01-22 09:56:57 +05:30