Commit Graph

20970 Commits

Author SHA1 Message Date
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
Nabin Hait
9da6844b52 Version 10 change log 2017-12-25 12:25:52 +05:30
rohitwaghchaure
79f8784772
Merge pull request #12156 from rohitwaghchaure/company_setup_issue
[Fix] Setup wizard UAE/KSA
2017-12-25 12:12:57 +05:30
Rohit Waghchaure
cfafb21842 [Fix] Setup wizard UAE/KSA 2017-12-25 12:12:07 +05:30
tundebabzy
590bd0a8e5 trigger payment_terms_template only when needed (#12124) 2017-12-25 11:40:19 +05:30
rohitwaghchaure
bd5e01b09b [fix] Shipping address not fetch from purchase order in to purchase invoice & receipt. (#12134) 2017-12-25 11:28:07 +05:30
rohitwaghchaure
d8c6449f3a [Fix] Bom raw materials not in order in the stock entry (#12149) 2017-12-25 11:26:40 +05:30
rohitwaghchaure
75789b65c2 [Fix] Sales payment summary report (#12151) 2017-12-25 11:26:15 +05:30
Zarrar
adc184c872 [Minor] Fix adding child to root task issue (#12121)
* make parent_task none

* adding multiple tasks - set project of parent
2017-12-22 11:00:19 +05:30
rohitwaghchaure
443691aaf8 [Fix] Allow to change exchange rate in the payment entry if allow stale is enabled (#12128) 2017-12-22 10:59:01 +05:30
Ameya Shenoy
3909bd4e9f [agri] Disease task creation on new CropCycle fix (#12131) 2017-12-22 10:58:47 +05:30
Manas Solanki
5807cd8e6f Set the guardian role automatically. (#12136)
* Add the guardian role for parent portal

* invite guardian as user
2017-12-22 10:50:10 +05:30
Prateeksha Singh
6401678e63
Merge pull request #12141 from tundebabzy/fix-test-cases
[Minor] Fix typo
2017-12-22 10:00:14 +05:30
tunde
e3104938ff fix typo 2017-12-21 16:25:44 +01:00
Manas Solanki
45cb791878
Merge pull request #12130 from manassolanki/leaderboard
remove the print statements
2017-12-21 13:04:25 +05:30
Manas Solanki
1f4b530e68 remove the print statements 2017-12-21 12:57:43 +05:30
Prateeksha Singh
8b0b56dda4 [Setup Wizard] Use setup stages (#12000)
* setup working with packages imports for operations

* setup stages

* use setup_stages hook

* remove commit from app setup
2017-12-21 11:55:58 +05:30
Umair Sayed
82035c6c7a Update index.md (#12118) 2017-12-21 11:55:05 +05:30
Nabin Hait
e591c85f7c Payment schedule total amount validation considering write off amount 2017-12-21 11:47:08 +05:30
Nabin Hait
a5cc84f8af
Reverted gl entry splitting based on payment terms (#12117)
* Reverted gl entry splitting based on payment terms

* changed modified date
2017-12-21 11:37:18 +05:30
rohitwaghchaure
174900506e [HotFix] Validation issue for subcontract stock entry (#12127)
* [Fix] Validation issue for subcontract stock entry

* Update stock_entry.py
2017-12-21 11:28:01 +05:30
Nabin Hait
2f9f4f9c01
Multiple fixes related to payment terms (#12115) 2017-12-20 12:24:59 +05:30
rohitwaghchaure
84da00da2f Allow to add items in manufacturing process which are not part of bom items (#12110) 2017-12-20 12:06:09 +05:30
Manas Solanki
8413f76c19 set the mandatory field in the backend (#12102) 2017-12-20 12:03:19 +05:30
Vishal Dhayagude
c8ecfa15f3 [new] Make Timesheet UX Added (#12100) 2017-12-20 12:02:34 +05:30
Ameya Shenoy
87b7844ae8 [Agri] Item amount set on item set (#12091)
* [Agri] Item amount set on item set

- closes #12008
- fixes #12010

* used frappe.call instead of frm.call in crop

* made modifications for sql query for BOM Item

- done since Crop doctype in Agri module also uses 'BOM Item' child table

* hide BOM no from BOM Item childtable in Crop
2017-12-20 12:00:24 +05:30
Prateeksha Singh
9a57049faa
Merge pull request #12113 from pratu16x7/leaderboard
Add Leaderboard to desktop
2017-12-20 11:39:05 +05:30
Prateeksha Singh
04c4ce353c Add leaderboard to desktop 2017-12-20 10:51:25 +05:30
Saurabh
fb6912b38e
Merge pull request #12101 from saurabh6790/patch_fix
[fix] set asset owner demo data
2017-12-19 14:56:19 +05:30
Saurabh
6386e9a1bd [fix] set asset owner demo data 2017-12-19 14:52:07 +05:30
tundebabzy
dbd068c44b Sales Order With Payment Terms Not Split In Payment Entry #12051 (#12065)
* validate schedule dates in non-invoice documents

* change query for orders

* take care of orders with/without payment schedule

* clean up, refactor, PEP8
2017-12-19 14:36:39 +05:30
Prateeksha Singh
41d2feab35
Merge pull request #12099 from pratu16x7/user-progress-items-fix
Create item price only if item created
2017-12-19 12:54:58 +05:30
Prateeksha Singh
3942cd353a create item price only if item created, fixes #12041 2017-12-19 12:53:39 +05:30
tundebabzy
90076bc3b5 Make Journal entry from Invoice based on Payment Terms (due date) #11989 (#12047)
* split journal entry according to invoice due date

* fix bug where reference_due_dates options are not populated:
- after making JE, add options to _onload
- use __onload to add options

* cater for case where no payment_schedule
2017-12-19 11:58:31 +05:30
Ameya Shenoy
6e5b8bb5d3 fixed logic for creating disease tasks (#12081) 2017-12-19 11:41:10 +05:30
tundebabzy
5825dedf7c Payment schedule error #12057 (#12096)
* use 12 places precision for sums

* use high float precision, fix decimal place late

* Update accounts_controller.py
2017-12-19 11:39:20 +05:30
Nabin Hait
f592f2c9a9
Revert "[Fix] Payment terms validation issue" (#12098)
* Revert "test fixed (#12094)"

This reverts commit dd700a550f.

* Revert "[fix] Column Heading in received item to be billed report (#12083)"

This reverts commit 7c57b6ecd8.

* Revert "[fix] Mobile no search issue in the pos (#12090)"

This reverts commit b725affe0c.

* Revert "[Fix] Payment terms validation issue (#12092)"

This reverts commit 9b8e1cb10e.
2017-12-19 11:31:34 +05:30
Shreya Shah
dd700a550f test fixed (#12094) 2017-12-19 11:24:07 +05:30
Vishal Dhayagude
7c57b6ecd8 [fix] Column Heading in received item to be billed report (#12083) 2017-12-19 11:23:34 +05:30
rohitwaghchaure
b725affe0c [fix] Mobile no search issue in the pos (#12090) 2017-12-19 11:21:00 +05:30
rohitwaghchaure
9b8e1cb10e [Fix] Payment terms validation issue (#12092) 2017-12-19 11:20:29 +05:30
Nabin Hait
33c9da9ab1
Patch to update due_date in GLE, Journal Entry and Payment Entry (#12093) 2017-12-19 11:18:36 +05:30