Nabin Hait
51a07d19c8
Merge branch 'master' into develop
2017-09-26 15:59:15 +05:30
Nabin Hait
8ff0a64ac2
Merge branch 'staging'
2017-09-26 15:59:12 +05:30
Nabin Hait
c0b4f0e81b
bumped to version 9.0.0
2017-09-26 16:29:12 +06:00
Nabin Hait
b0ba55e52f
Set bill no while making payment entry from purchase invoice
2017-09-26 15:56:58 +05:30
rohitwaghchaure
d4c2d77bba
[fix] POS not working if user clicks on back button from form view ( #10912 )
2017-09-26 13:27:06 +05:30
Prateeksha Singh
ada8ba96b3
[setup] remove translations from action name ( #10911 )
2017-09-26 13:07:24 +05:30
Nabin Hait
773e686fb1
change log for version 9
2017-09-26 12:41:43 +05:30
Nabin Hait
afe9eabd3c
Merge branch 'master' into develop
2017-09-25 16:36:47 +05:30
Nabin Hait
360c1efd18
Merge branch 'master' into staging
2017-09-25 16:36:47 +05:30
Nabin Hait
a0b85cd1ec
Merge branch 'hotfix'
2017-09-25 16:36:45 +05:30
Nabin Hait
9ef023b10f
bumped to version 8.11.6
2017-09-25 17:06:44 +06:00
Nabin Hait
0d0811ca14
reload print style
2017-09-25 16:33:45 +05:30
Nabin Hait
39c2f75e6d
Merge branch 'master' into staging
2017-09-25 16:03:32 +05:30
Nabin Hait
cb5e1e550f
Merge branch 'master' into develop
2017-09-25 16:03:31 +05:30
Nabin Hait
3ab938ea34
Merge branch 'hotfix'
2017-09-25 16:03:29 +05:30
Nabin Hait
7da3c46ef2
bumped to version 8.11.5
2017-09-25 16:33:29 +06:00
Nabin Hait
3b61552836
Revert "Advance against expense claim ( #10632 )" ( #10877 )
...
This reverts commit cdd6ded790
2017-09-25 11:27:39 +05:30
Nabin Hait
4ebac3380d
reload print style
2017-09-23 15:50:39 +05:30
tundebabzy
e4be3f8dc9
use generator when updating and notify user of long process ( #10777 )
2017-09-21 18:27:33 +05:30
Nabin Hait
cdd6ded790
Advance against expense claim ( #10632 )
...
* Adds Whitelist Method for Advance Entry
* Adds changes required for managing Advance Payments in Expense Claim including new fields and documentation. Also resolved merge conflict by using the more recent modified date
* Adds changes for managing advance payments using Default Account and Party
* Removed console.log from the JS file
* Advance Payment Patch - Fixed Codacy errors
* Removed stray file
* Fixed conflicts due to changes in upstream
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed Codacy errors
* Fixed pending Codacy error
* Updated JS code by removing cur_frm which is soon to be deprecated
* Advance against Expense Claim: cleanup and fixes
* Test case fixed
2017-09-21 18:03:45 +05:30
Nabin Hait
3d5d858933
set total in tax table if category not valuation and consider deductions ( #10870 )
2017-09-21 16:15:30 +05:30
Nabin Hait
fb142f5283
Merge branch 'AravindPranera-develop' into develop
2017-09-21 15:52:06 +05:30
Nabin Hait
6d78f7b862
Fixed indentation
2017-09-21 15:51:42 +05:30
Nabin Hait
5478a7fa67
Merge branch 'develop' of https://github.com/AravindPranera/erpnext-1 into AravindPranera-develop
2017-09-21 15:48:18 +05:30
Nabin Hait
2851dfad99
Set fields in Item Variant Settings which should be copied from template to variant
2017-09-21 15:41:57 +05:30
Rohit Waghchaure
5b05335e89
added patch and set default fields after completion of setup wizard
2017-09-21 15:41:57 +05:30
Rohit Waghchaure
0e28fccb34
[Enahance] Update variants fields defined in the Item Varianst Settings, if template updated
2017-09-21 15:41:57 +05:30
tundebabzy
ab5b03011d
Enhance Currency Exchange Management ( #10482 )
...
* add new settings in Accouts Settings
* patch for new settings
* refactor `get_exchange_rate`
* adds validation
* tests validation
* disables conversion rate field if stale rates not allowed
* more test cases
more test case...
test `get_exchange_rate` behaviour with stale not allowed in sett..
fix currency exchange test case
do housekeeping after running accounts settings test
* clean up
* documentation
* make use of correct api url
* Fix tests failing due to wrong exchange rate from fixer.io
* remove mandatory constraint from `allow_stale`
* added info to documentation
2017-09-21 14:50:39 +05:30
rohitwaghchaure
12fd8a6047
[fix] User not able to complete the production order because of decimal issue ( #10868 )
2017-09-21 14:39:10 +05:30
Nabin Hait
24ec3c7dcb
Fixed merge conflict
2017-09-21 12:53:41 +05:30
Vishal Dhayagude
c4c2c56af2
env variable added ( #10847 )
2017-09-21 12:07:56 +05:30
Prateeksha Singh
705d885b64
[progress] R/W permission for all roles ( #10866 )
2017-09-21 12:02:18 +05:30
Manas Solanki
1c1dd08a34
only validate party account and ref doc party account in selected case ( #10863 )
...
* only validate party account and ref doc party account in selected case
* fix for fee structure test
* fix the assessment result test
2017-09-21 12:01:20 +05:30
Nabin Hait
b2dca79d89
Updated modified timestamp in sales/purchase transaction doctypes
2017-09-20 09:56:06 +05:30
Nabin Hait
6960a76adc
Fixes related to schools fees
2017-09-19 17:23:03 +05:30
Manas Solanki
0664d6ed8b
real time fee creation status via socketio
2017-09-19 17:23:03 +05:30
Manas Solanki
1bcc6c661a
minor changes
2017-09-19 17:23:03 +05:30
Manas Solanki
9b44c16a32
add the fee schedule in config
2017-09-19 17:23:03 +05:30
Manas Solanki
1299d56e85
cleanup of the fee module
2017-09-19 17:23:03 +05:30
Manas Solanki
8c88af23ef
added the test case for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
d1d2633658
removed the fee schedule
2017-09-19 17:23:03 +05:30
Manas Solanki
152ba1eccb
fixes as per the review
2017-09-19 17:23:03 +05:30
Manas Solanki
49c52f7639
renamed one doctype to the fee schedule
2017-09-19 17:23:03 +05:30
Manas Solanki
4e0559bc79
make payment entry for the fees
2017-09-19 17:23:03 +05:30
Manas Solanki
2b39d5d6d5
make gl_entry on submission of fees
2017-09-19 17:23:02 +05:30
Manas Solanki
e4acf763a5
make payment request for the fee
2017-09-19 17:23:02 +05:30
Manas Solanki
f073814635
added fee request doctype
2017-09-19 17:23:02 +05:30
Nabin Hait
2e4de83df6
Rounding Adjustment via a separate field, instead of last tax row ( #10659 )
...
* Rounding Adjust via a separate field, instead of last tax row
* Fixed test cases
2017-09-19 14:53:16 +05:30
rohitwaghchaure
f551b43a94
Merge pull request #10841 from rohitwaghchaure/subscription_patch_fix_docststus
...
[fix] Subscription patch broken if reference document has been cancelled
2017-09-19 13:24:04 +05:30
Rohit Waghchaure
c15a3bd379
[fix] Subscription patch broken if reference document has been cancelled
2017-09-19 12:53:11 +05:30
