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

21127 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
britlog
ddd2bc9aac Translate payment request subject 2018-01-22 23:23:31 +01:00
Saurabh
ef31637549 Merge branch 'master' into develop 2018-01-22 15:29:15 +05:30
Saurabh
4f927ac3e8 Merge branch 'hotfix' 2018-01-22 15:29:14 +05:30
Saurabh
b9f678b350 bumped to version 10.0.13 2018-01-22 15:59:14 +06:00
Saurabh
fb4caff0b2
Merge pull request #12573 from rohitwaghchaure/reorder_issue 
[Fix] Wrong projected qty for warehouse group in the process of reorder item, which making extra material requests
 2018-01-22 16:49:54 +07:00
Saurabh
e72915847c
Merge pull request #12570 from rohitwaghchaure/currency_in_balance_column 
Added currency in balance column in general ledger print
 2018-01-22 16:35:37 +07:00
rohitwaghchaure
1d93bd50eb
Merge pull request #12585 from rohitwaghchaure/sales_income_account_issue 
[Fix] Income account can not be group
 2018-01-22 15:04:46 +05:30
rohitwaghchaure
8e998875a5
Merge pull request #12590 from shreyashah115/total-on-items-remove 
[Fix] Calculate taxes when shipping rule not present at removal of item
 2018-01-22 15:03:11 +05:30
rohitwaghchaure
c87a3370cd
Merge pull request #12595 from rohitwaghchaure/image_path_in_item_search 
[Fix] Image path showing in the item link
 2018-01-22 15:01:58 +05:30
Rohit Waghchaure
c4c2bf0bfb [Fix] Image patch showing in the item link 2018-01-22 13:47:28 +05:30
Shreya
39adc8f85f calculate total when items are removed 2018-01-22 13:08:05 +05:30
Rohit Waghchaure
8676590cfe [Fix] Income account can not be group 2018-01-22 12:35:36 +05:30
rohitwaghchaure
cf7b6511ba
Merge pull request #12574 from rohitwaghchaure/sales_payment_summary_issue 
[Fix] Sales payment summary issue
 2018-01-20 17:02:13 +05:30
Rohit Waghchaure
bc94914338 [Fix] Sales payment summary issue 2018-01-20 17:01:31 +05:30
Rohit Waghchaure
f83f6aae22 [Fix] Wrong projected qty for warehouse group in the process of reorder item making extra material requests 2018-01-20 15:44:38 +05:30
rohitwaghchaure
6a81acfddf
Merge pull request #12563 from Zlash65/general-ledger-fix 
[Hotfix] General Ledger report not working for group_by_account filter
 2018-01-20 12:55:35 +05:30
Rohit Waghchaure
edef642794 Added currency in balance column in general ledger print 2018-01-20 12:54:25 +05:30
Zlash65
93344dff26 group_by_account not displayed fix 2018-01-19 19:06:39 +05:30
Rohit Waghchaure
abc0632925 Merge branch 'master' into develop 2018-01-19 15:49:29 +05:30
Rohit Waghchaure
03adf84a8d Merge branch 'hotfix' 2018-01-19 15:49:29 +05:30
Rohit Waghchaure
0e61b52022 bumped to version 10.0.12 2018-01-19 16:19:28 +06:00
rohitwaghchaure
0efd7934b8
Merge pull request #12530 from frappe/manassolanki-patch-2 
Issue in the data import while importing the invoice
 2018-01-19 15:35:23 +05:30
Rohit Waghchaure
c987500e08 Merge branch 'master' into develop 2018-01-19 13:29:57 +05:30
Rohit Waghchaure
16cde58821 Merge branch 'hotfix' 2018-01-19 13:29:56 +05:30
Rohit Waghchaure
e1815f0989 bumped to version 10.0.11 2018-01-19 13:59:56 +06:00
rohitwaghchaure
c59d52d073
Merge pull request #12550 from rohitwaghchaure/po_permission_issue 
[Fix] Error in PO. No Permission for Buying Settings
 2018-01-19 13:00:36 +05:30
rohitwaghchaure
7b605a628e
Merge pull request #12543 from rohitwaghchaure/precision_issue_bom 
[Fix] Precision issue while making material requests from production planning tool
 2018-01-19 13:00:16 +05:30
Rohit Waghchaure
2f3ad64bd6 [Fix] Precision issue while making material requests from production planning tool 2018-01-19 12:47:55 +05:30
Rohit Waghchaure
86cbde9057 [Fix] Error in PO. No Permission for Buying Settings 2018-01-19 12:45:53 +05:30
rohitwaghchaure
65a669c81e
Merge pull request #12534 from rohitwaghchaure/patch_fix_v7 
[Fix] Timesheet patch
 2018-01-19 11:37:18 +05:30
rohitwaghchaure
39e0d1b7d6
Merge pull request #12539 from rohitwaghchaure/minor_sales_payment_summary_issue 
[Fix] Sales payment summary issue
 2018-01-19 11:34:48 +05:30
Rohit Waghchaure
de420322b5 [Fix] Sales payment summary issue 2018-01-18 17:20:21 +05:30
rohitwaghchaure
c8e016522d
Merge pull request #12533 from rohitwaghchaure/pos_css_issue 
[Fix] POS css
 2018-01-18 16:12:00 +05:30
Rohit Waghchaure
5c4f52ccf1 [Fix] POS css 2018-01-18 16:10:19 +05:30
Rohit Waghchaure
95adb60a8f Fix patch 2018-01-18 15:52:52 +05:30
Manas Solanki
c6d5611408
Issue in the data import while importing the invoice 2018-01-18 11:20:24 +05:30
rohitwaghchaure
bd47abdc9a [Enhance] Running Balance in GL Report (#12491) 
* Running Balance in GL Report

* Supplier invoice no in GL Report/Print Format
 2018-01-18 09:32:43 +05:30
Faris Ansari
00e547d319 Encode letterhead filename (#12525) 2018-01-18 09:28:13 +05:30
Nabin Hait
f1b098e03c
payment terms filter in AR Summary report (#12529) 2018-01-18 09:23:32 +05:30
Nabin Hait
570e29d5e7 Fixed merge conflict 2018-01-17 18:56:02 +05:30
Nabin Hait
a7bcf6791e Merge branch 'hotfix' 2018-01-17 18:51:20 +05:30
Nabin Hait
f76fb50685 bumped to version 10.0.10 2018-01-17 19:21:20 +06:00
rohitwaghchaure
da941af687 Set due date in purchase invoice based on suppler invoice date (#12395) 2018-01-17 16:23:04 +05:30
Nabin Hait
91fd29a963
Remove enqueuing update_total_sales method, sometimes it does not include current invoice (#12522) 2018-01-17 16:14:31 +05:30
Kenneth Sequeira
7030817bf2 fixed image links in role based permissions and user permisissions. Fixed a spelling mistake in user permissions (#12500) 2018-01-17 16:13:28 +05:30
Gaurav Naik
dc0db3a652 Exploded view for BOM Stock Report (#12506) 
* Multilevel BOM Stock Report prototype

* Rechristened multilevel to exploded view

* Removed trailing whitespace in line 16. Replaced spaces with tabs for indentation

* Used BOM Explosion item in query for exploded view

* Removed trailing whitespaces for Codacy compliance
 2018-01-17 16:12:55 +05:30
Umair Sayed
d8b4c8bd5b Update index.txt (#12507) 2018-01-17 16:12:00 +05:30
Raghavendra Kamath
2967ec3d45 Add desk icons for healthcare - fixes 11838 (#12518) 
* Add desk icons for healtcare - fixes 11838

* Remove unnecessary white spaces
 2018-01-17 16:11:09 +05:30
Umair Sayed
230805b016 Update total.html (#12511) 2018-01-17 14:41:38 +05:30
rohitwaghchaure
60febc5465 [Fix] Gross profit validation issue (#12516) 2018-01-17 14:40:59 +05:30