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

19311 Commits

Author SHA1 Message Date
Deepesh Garg
d301d26fda fix: Enhancement in credit note (#18511) 
* fix: Credit note enhancement

* Fix: Print format for Sales Invoice Return

* fix: Zero quantity validation fix for credit note
 2019-07-31 15:58:19 +05:30
Suraj Shetty
36c724d7b5
fix(Issue): reset issue fulfilled indicator (#18454) 
fix(Issue): reset issue fulfilled indicator
 2019-07-29 18:27:53 +05:30
Deepesh Garg
62daa43a4c
Merge pull request #18513 from deepeshgarg007/trail_balance_fix 
fix: Opening balance not getting calculated in trail balance report
 2019-07-29 15:38:39 +05:30
rohitwaghchaure
a55e4e2c03
Merge pull request #18452 from rohitwaghchaure/scrap_item_not_adding 
fix: scrap item not adding while doing finished good entry
 2019-07-29 15:30:24 +05:30
deepeshgarg007
4c652396d0 fix: Opening balance not getting calculated in trail_balance_report 2019-07-29 14:57:33 +05:30
deepeshgarg007
ec421df4e4 fix: Code cleanup 2019-07-29 08:58:56 +05:30
deepeshgarg007
6a43f6718a fix: Reload doc in patch 2019-07-28 10:30:32 +05:30
deepeshgarg007
a65ad10c62 fix: GL entry validation fix 2019-07-27 19:06:36 +05:30
deepeshgarg007
4fce891241 Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension 2019-07-27 18:11:34 +05:30
Himanshu
9443e8e85f
Merge branch 'develop' into iss_ful_fix_v13 2019-07-26 12:51:09 +00:00
Saurabh
af19347376
Merge branch 'develop' into scrap_item_not_adding 2019-07-26 15:10:17 +05:30
Himanshu
e87fbcc286
Merge branch 'develop' into iss_ful_fix_v13 2019-07-26 07:31:44 +00:00
Deepesh Garg
941e21092c
Merge branch 'develop' into stock_ageing_fix 2019-07-26 12:47:05 +05:30
Deepesh Garg
c391d65dc3
Merge pull request #18488 from adityahase/faster 
perf(travis): Faster builds
 2019-07-26 12:41:01 +05:30
Himanshu
0162d0a2ea
Merge branch 'develop' into iss_ful_fix_v13 2019-07-26 06:58:55 +00:00
rohitwaghchaure
ad89b029c2
Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp 
fix(Account): Pass parent currency to child currency
 2019-07-26 12:13:27 +05:30
deepeshgarg007
15154d4bd0 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-26 10:30:22 +05:30
deepeshgarg007
dda6b5cd53 fix: Add accounting dimensions to subscription and opening invoice tool 2019-07-26 09:14:42 +05:30
deepeshgarg007
aa92df4ddc fix: Test cases for accounting dimensions 2019-07-26 09:14:42 +05:30
deepeshgarg007
0ce2afc9bc fix: Test Cases for accounting dimensions 2019-07-26 09:14:42 +05:30
deepeshgarg007
41a1cd954c fix: Set query fix 2019-07-26 09:14:42 +05:30
deepeshgarg007
b124aff0bb fix: Codacy Fixes 2019-07-26 09:14:42 +05:30
deepeshgarg007
703fc08467 fix: Patch 2019-07-26 09:14:42 +05:30
deepeshgarg007
6dd5f74671 fix: Remove dimensions from boot 2019-07-26 09:14:42 +05:30
deepeshgarg007
ada1ac8013 fix: Added default dimension and filter in bootinfo 2019-07-26 09:14:42 +05:30
deepeshgarg007
efd6307bc4 fix: Default Accounting Dimensions in doctypes 2019-07-26 09:14:42 +05:30
Faris Ansari
0ec747f57c fix(Account): Pass parent currency to child currency 
In a scenario where Parent Company Account's Currency is different
from it's default currency, the Account Currency of Child would be set
from the default currency of Company which might be wrong
 2019-07-26 08:55:34 +05:30
Deepesh Garg
641e8fea02
Merge branch 'develop' into bank_reco_develop 2019-07-26 08:48:02 +05:30
Aditya Hase
1e82638ae8 perf(tests): Remove unnecessary tearDown code 2019-07-26 03:52:17 +05:30
Aditya Hase
ff79463e36 perf(travis): Use setUpClass instead of setUp 2019-07-26 03:08:45 +05:30
Aditya Hase
6bc2988623 fix(stock): Fix travis builds 2019-07-26 03:08:45 +05:30
Aditya Hase
0f072d7d40 perf(tests): Use country with lesser fixtures 2019-07-26 01:11:57 +05:30
Aditya Hase
0ae786adec perf(tests): Do not unnecessarily create companies 2019-07-26 00:38:51 +05:30
Aditya Hase
6a5b7f751c perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown 2019-07-26 00:23:13 +05:30
deepeshgarg007
f56284b0c1 Dynamic link issue fix in Bank reconciliation statement 2019-07-25 12:47:32 +05:30
deepeshgarg007
b1f3e0224c fix: GSTR-1 query fix 2019-07-24 21:36:56 +05:30
Himanshu Warekar
20e1a3e199 fix: reset issue fulfilled indicator 2019-07-23 17:00:23 +05:30
Rohit Waghchaure
bcfbc792b4 fix: scrap item not adding while doing finished good entry 2019-07-23 16:05:29 +05:30
Aditya Hase
48d9cfe304 fix(website): Remove references to Product Settings.products_a… (#18448) 
This was accidentally added back in 34c551d9a5 (diff-f0a387cdb305471e74e523ecc4e646ac)
 2019-07-23 12:05:31 +05:30
deepeshgarg007
a19d1d6926 fix: Fixes in stock ageing report 2019-07-23 08:30:09 +05:30
Nabin Hait
7b76cdbb29 Merge branch 'develop' of https://github.com/frappe/erpnext into develop 2019-07-22 17:01:44 +05:30
Nabin Hait
cd1094e1c2 Merge branch 'rohitwaghchaure-stock_reco_for_serialized_items' into develop 2019-07-22 17:01:08 +05:30
Nabin Hait
ca25b925f5 fix: Calcellation logic for reconciliation of serialized items 2019-07-22 17:00:32 +05:30
Mangesh-Khairnar
3f8326358b fix: remove wrong status update for order type maintenance (#18444) 2019-07-22 16:24:56 +05:30
deepeshgarg007
d9cc84892b fix: Use get_serial_no and remove batch 2019-07-22 15:56:41 +05:30
deepeshgarg007
3877b5407c fix: Remove batch 2019-07-22 15:30:18 +05:30
Suraj Shetty
433e587a95
style: Add tabs 2019-07-22 13:21:35 +05:30
Suraj Shetty
002474367b
Merge branch 'develop' into email-campaign 2019-07-22 13:20:06 +05:30
Rucha Mahabal
6224266512 fix: replaced frappe.db.get_value with frappe.db.exists 2019-07-22 13:04:43 +05:30
deepeshgarg007
55ca054cb4 Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix 2019-07-22 12:46:30 +05:30