Makarand Bauskar
3ad045302b
[minor] set abbreviation on company name trigger ( #10671 )
...
* [minor] set abbreviation on company name trigger
* [minor] codecy fixes
2017-09-05 15:23:55 +05:30
Nabin Hait
499fbe90dc
Test case fixed for multi-currency and multi-uom BOM ( #10679 )
2017-09-05 15:16:32 +05:30
Francisco Roldán
c929e88b97
Company Dashboard Title Translatable ( #10673 )
2017-09-05 15:09:35 +05:30
creamdory
05885ca184
Sorting in Production Order BOM Items
2017-09-05 17:02:54 +08:00
Rohit Waghchaure
2967d7ed01
Merge branch 'bom_currency' into develop
2017-09-05 11:26:22 +05:30
Rohit Waghchaure
c872095d76
update rate based on uom conversion factor
2017-09-05 11:25:05 +05:30
Frappe PR Bot
8054d962cf
[Translation] Updated Translations ( #10669 )
2017-09-05 09:19:06 +05:30
Nabin Hait
22cff25bf5
BOM rates as per selected currency and UOM
2017-09-04 18:31:45 +05:30
mbauskar
7faac85fff
Merge branch 'master' into staging
2017-09-04 14:50:32 +05:30
mbauskar
d32f08f6ec
Merge branch 'master' into develop
2017-09-04 14:50:31 +05:30
mbauskar
10fdf5a8c3
Merge branch 'hotfix'
2017-09-04 14:50:30 +05:30
mbauskar
11cf44986b
bumped to version 8.10.2
2017-09-04 15:20:30 +06:00
Prateeksha Singh
95d8fd38f5
User Progress ( #10336 )
...
* [user-progress] first cut
* [user-progress] Add users slide, remove taxes, make sample data
* wip tests
* [setup-wiz] UI test
* [user-progress] notif test, docs trim
* wip
* [user-progress] Setup Progress single to update action states, fixtures
* setup progress actions patch
* rename sales_target field patch
* [progress] wip reform slide data
* [progress] remove slide data
* [setup] add roles for GST doctypes, remove commit from fixtures
2017-09-04 11:14:04 +05:30
Makarand Bauskar
cf9e986f82
[hotfix] fixed the invalid variable name lead.name ( #10648 )
2017-09-04 10:25:37 +05:30
rohitwaghchaure
fd39d6bd3c
[Enahance] Provision to select customer, item code while making an invoice from timesheet ( #10616 )
2017-09-04 10:20:40 +05:30
Arundhatii
2e6db4d928
Help pages for Attendance ( #10634 )
...
* Help pages for Schools setup
* Documentation of Schools module
* Help pages for Student
* Help pages for Student
* Help pages for Schools Student and Admission Module
* Documentation for Schools Attendance
2017-09-04 10:17:18 +05:30
Saurabh
21833413b0
[fix] ERPNext signup link fix on demo page ( #10649 )
2017-09-04 10:15:24 +05:30
Francisco Roldán
11355cd3c9
Set at lost translated in quotation ( #10652 )
2017-09-04 10:14:58 +05:30
Nabin Hait
2b05e61d58
Merge branch 'rmehta-bcornwellmott-confirm_training' into develop
2017-09-04 10:13:47 +05:30
Nabin Hait
baacf51a00
Fixed merge conflict
2017-09-04 10:13:29 +05:30
Zarrar
85eeafdccc
added filter for grading scale selection ( #10639 )
2017-09-01 21:45:10 +05:30
Makarand Bauskar
d6922b2de3
[hotfix] lead name should available before creating new customer from quotations ( #10642 )
2017-09-01 18:45:40 +05:30
Rohit Waghchaure
6ab630371d
Fixed serial no trigger not working from dialog box
2017-09-01 17:02:42 +05:30
Umair Sayed
f1881065a8
Merging Help Articles (Q & A) into Manual (Part 2) ( #10629 )
...
* adding articles in the manual
* adding articles in the manual 2
* migrating help articles to manuals
* migrating help articles to manuals
2017-09-01 16:26:41 +05:30
Rushabh Mehta
fc1c00716c
[test] test_account.js - more timeout?
2017-09-01 12:41:12 +05:30
Rushabh Mehta
baabb07e00
[test] test_account.js
2017-09-01 12:12:39 +05:30
Rushabh Mehta
7d868e41a6
[test] test_account.js
2017-09-01 11:46:11 +05:30
Nabin Hait
a9c9b69c22
Change actual charges based on exchange rate ( #10619 )
...
* Change actual charges based on exchange rate
* Update transaction.js
2017-08-31 19:40:09 +05:30
Frappe PR Bot
d112ee5244
[Translation] Updated Translations ( #10628 )
2017-08-31 19:38:41 +05:30
Rohit Waghchaure
3e43927767
Test cases
2017-08-31 18:21:27 +05:30
Saurabh
60739847ab
[minor][fix] change price field type from float to currency ( #10626 )
2017-08-31 17:08:30 +05:30
mbauskar
9012a9b414
Merge branch 'master' into staging
2017-08-31 15:31:48 +05:30
mbauskar
4f939b82b6
Merge branch 'hotfix'
2017-08-31 15:31:47 +05:30
mbauskar
2965f92be3
Merge branch 'master' into develop
2017-08-31 15:31:47 +05:30
mbauskar
2a4328b4f5
bumped to version 8.10.1
2017-08-31 16:01:47 +06:00
mbauskar
d974bcd2fa
Merge branch 'develop' into staging
2017-08-31 15:30:12 +05:30
Nabin Hait
d7ff9dca1d
Fixed rounding issue in Process Payroll, fixes #9300 ( #10586 )
2017-08-31 15:17:01 +05:30
Nabin Hait
e7e29b7f10
GST print format for POS ( #10590 )
...
* Serial no added in GST tax invoice
* GST print format for POS
2017-08-31 15:06:12 +05:30
Umair Sayed
84be137b4e
Migrating Help Articles (Q&A format) into User Manual ( #10608 )
...
* adding articles in the manual
* adding articles in the manual 2
* migrating help articles to manuals
2017-08-31 14:53:47 +05:30
Vishal Dhayagude
1252c30edf
[UI Test] UI test for Repack and Sales Invoice with Serialize item Added ( #10583 )
...
* [UI Test] UI test for Repack and Sales Invoice with Serialize item Added
* [Fix] Fixed path for sales invoice"
2017-08-31 14:47:56 +05:30
Vishal Dhayagude
1458d7fea6
[UI Test] Stock Entry for material issue with serialize item ( #10592 )
2017-08-31 14:47:01 +05:30
tundebabzy
7f8a259beb
Fixer Always Fetches Latest Exchange Rate Even When Date is Specified ( #10596 ) ( #10597 )
...
* test that confirms the bug. Same test should pass after fix
* make use of correct api url
2017-08-31 14:30:15 +05:30
rohitwaghchaure
56e31d05e9
[Fix] POS customer field is hang while searching customer, make error log if sync has failed ( #10607 )
2017-08-31 14:19:58 +05:30
krnkris
3c635e219e
Rename fr_plan_comptable_général.json to fr_plan_comptable_general.json ( #10601 )
2017-08-31 14:17:46 +05:30
Makarand Bauskar
de278635a3
[hotfix] fixes for UnicodeDecodeError ( #10620 )
2017-08-31 13:36:56 +05:30
Rohit Waghchaure
7e752c4ebf
Added patch, fixed codacy issue
2017-08-31 00:31:35 +05:30
Faris Ansari
6163a397df
Disable eslint in lib
2017-08-30 12:54:16 +05:30
Faris Ansari
1116f96aee
Grand Total Value width
2017-08-30 12:53:08 +05:30
Faris Ansari
491108a198
Merge branch 'develop' into pos-refactor
2017-08-30 12:37:05 +05:30
mbauskar
5096c45dec
Merge branch 'master' into hotfix
2017-08-29 20:42:06 +05:30
