Commit Graph

21021 Commits

Author SHA1 Message Date
Manas Solanki
15b880154a
Merge pull request #12283 from kennethsequeira/cust-doc-img
Updated the image paths for Custom Doctype manual
2018-01-01 20:16:01 +05:30
Kenneth Sequeira
13e5689bd9 Updated the image paths for Custom Doctype manual 2018-01-01 17:33:57 +05:30
Saurabh
2ac1835f7d [fix] if is_root is true make parent account empty (#12255) 2018-01-01 16:17:43 +05:30
Saurabh
15d53c7912 [fix] key error (#12257) 2018-01-01 16:17:14 +05:30
Saurabh
9579645ae1 [fix] if item code exists then only call get_item_details (#12258) 2018-01-01 16:17:02 +05:30
Saurabh
a6b41e855b [fix] check if null for mode of payments (#12264) 2018-01-01 16:16:50 +05:30
rohitwaghchaure
526b0bc4e9 [minor] Code cleanup (#12278) 2018-01-01 16:16:16 +05:30
rohitwaghchaure
2640c7eec5 [Fix] Validation issue for online POS profile (#12276) 2018-01-01 16:15:41 +05:30
Nabin Hait
c33788a91b Show standard rate only in unsaved Item 2017-12-29 15:42:50 +05:30
Jamsheer
c90195de29 Patient medical record and Consulatation (#12198)
* Patient Medical Record - Subject field reqd=0, Subject text formated

* Consultation - remove patient details section

* Search fields are updated for Consultation and Appointment

* Translations applied on menu
2017-12-29 14:32:13 +05:30
Javier Wong
2469095a13 Check Meta before Toggling Conversion Factor (#12237)
If it has been customized so as to set the conversion factor to read only, `toggle_conversion_factor` should respect that setting.
2017-12-29 14:06:47 +05:30
Shreya Shah
df0dd8be5f Travis fix for client side tests (#12224)
* salary slip test fix

* attendance tool test fix

* timeout after routing
2017-12-29 14:04:46 +05:30
Nabin Hait
ddd5bf736b Merge branch 'master' into develop 2017-12-28 18:46:52 +05:30
Nabin Hait
da82674b47 Merge branch 'hotfix' 2017-12-28 18:46:51 +05:30
Nabin Hait
07be33805d bumped to version 10.0.4 2017-12-28 19:16:51 +06:00
rohitwaghchaure
a84d38999c [Fix] Sales order erased on production order on selection of sales order (#12225) 2017-12-28 18:45:27 +05:30
rohitwaghchaure
c9ed09440c Re-execute uae vat patch (#12230) 2017-12-28 18:42:22 +05:30
rohitwaghchaure
fe22686a8f Update last purchase rate from the purchase invoice (#12189) 2017-12-28 16:11:27 +05:30
Nabin Hait
b820174b18 Merge branch 'master' into develop 2017-12-28 14:22:59 +05:30
Nabin Hait
31d7433946 Merge branch 'hotfix' 2017-12-28 14:22:58 +05:30
Nabin Hait
c70a78dcf6 bumped to version 10.0.3 2017-12-28 14:52:57 +06:00
rohitwaghchaure
d45266881a [Enhance] New print format for UAE/KSA for vat/excise (#12202)
* [Enhance] New print format for UAE/KSA for vat/excise

* Fixed spelling
2017-12-28 14:20:13 +05:30
rohitwaghchaure
dbb5ae9a9e [fix] Closing balance showing at wrong side (#12220) 2017-12-28 13:15:21 +05:30
Nabin Hait
ca674bec42
Set numeric ranges in Item tamplate if blank (#12199) 2017-12-28 12:35:11 +05:30
Saurabh
28ce1c0c3a [fix] add flag ignore mandatory (#12201) 2017-12-28 12:34:58 +05:30
Manas Solanki
91017cba8d Additional fields in the instructor doctype for the academics log and minor permission changes (#12204) 2017-12-28 12:34:36 +05:30
Frappe PR Bot
878b5f7e71 [Translation] Updated Translations (#12212) 2017-12-28 12:31:01 +05:30
Manas Solanki
e20a0f1115 [Fix] make PE unique for the combination of academic year and academic term (#12214) 2017-12-28 12:29:11 +05:30
Frappe PR Bot
efd9086579 [Translation] Updated Translations (#12212) 2017-12-28 11:49:37 +05:30
Fahim Ali Zain TP
5f7cedb206 Fix v8 to v10 migration issue (#12177) 2017-12-27 17:14:54 +05:30
Nabin Hait
ff2fb653be Merge branch 'develop' 2017-12-26 18:35:50 +05:30
Nabin Hait
a47ea94ab4 bumped to version 10.0.2 2017-12-26 19:05:49 +06:00
Nabin Hait
58384215b6 Merge branch 'hotfix' 2017-12-26 18:34:16 +05:30
Nabin Hait
9e16697702 Merge branch 'master' into develop 2017-12-26 18:34:16 +05:30
Nabin Hait
451af06d2f bumped to version 10.0.1 2017-12-26 19:04:16 +06:00
Nabin Hait
123759aff7
Fixes for travis (#12161)
* Fixes for travis

* Testcase fixes for get_item_details

* Testcase fixes for get_item_details

* Travis fixes

* Travis fixes
2017-12-26 17:50:34 +05:30
rohitwaghchaure
30e38ff7c7 [Fix] Asset make sales invoice (#12168) 2017-12-26 16:23:06 +05:30
Vishal Dhayagude
f06c281964 [fix] allow to change doc status on get items (#12174) 2017-12-26 16:22:40 +05:30
Manas Solanki
389b9a2be3
Merge pull request #12173 from manassolanki/fix-15
Minor fix
2017-12-26 15:43:19 +05:30
Manas Solanki
5e9d1246e8 remove the autoname from the supplier json 2017-12-26 15:21:03 +05:30
Nabin Hait
7e1dc0d724 Merge branch 'develop' 2017-12-25 15:24:49 +05:30
Nabin Hait
6211a3edf2 bumped to version 10.0.0 2017-12-25 15:54:48 +06:00
Nabin Hait
ed13b3c19a Fixed minor issue 2017-12-25 15:11:56 +05:30
Nabin Hait
c65279b584 Reloaded account doctype in UAE Vat patch 2017-12-25 15:02:54 +05:30
Nabin Hait
92615901a7 Fixed merge conflict 2017-12-25 13:41:04 +05:30
Nabin Hait
537db4c2c7 Merge branch 'hotfix' 2017-12-25 13:38:06 +05:30
Nabin Hait
f4c5cf5bd0 bumped to version 9.2.24 2017-12-25 14:08:05 +06:00
Nabin Hait
e9dabd5cec
Settings to show payment schedule in print (#12158) 2017-12-25 13:30:01 +05:30
Prateeksha Singh
293c700c08
Merge pull request #12157 from pratu16x7/setup-fixes
[setup] remove sample data commit, fix namespace
2017-12-25 12:31:23 +05:30
Prateeksha Singh
b61d091f4c [setup] remove sample data commit, fix namespace 2017-12-25 12:30:35 +05:30