alsum
852bd76a58
add set_current_asset_value to onload func
2018-11-08 11:12:33 +02:00
alsum
27e7c15c16
trigger set_current_asset_value when make asset_value_adjustment from asset form
2018-10-24 13:23:34 +02:00
Nabin Hait
65bb91d1c7
Merge branch 'develop' into staging-fixes
2018-07-31 15:13:30 +05:30
Fisher Yu
13aec3aecb
Simplified Chinese Translation Update ( #14992 )
...
* delete the old version to be replaced by a new one
* New version of the translated simplified Chinese
2018-07-31 13:29:35 +05:30
Nabin Hait
eed3d4c1b3
Fixed Merge Conflict
2018-07-31 12:36:16 +05:30
Nabin Hait
ebdefade9b
Merge branch 'hotfix'
2018-07-31 12:18:23 +05:30
Nabin Hait
e9afbfde76
bumped to version 10.1.45
2018-07-31 12:48:22 +06:00
Nabin Hait
d53c2c031d
more payroll improvements and tests fixes
2018-07-30 20:17:15 +05:30
rohitwaghchaure
1fa5698798
[minor] Freeze the screen to avoid multiple time clicks ( #15047 )
2018-07-30 19:11:43 +05:30
rohitwaghchaure
086da451ca
Removed academic term from validation to check duplicate program enrollement ( #15046 )
2018-07-30 19:11:14 +05:30
Nabin Hait
d305a7a959
Made leave application importable
2018-07-30 17:12:32 +05:30
Nabin Hait
4f135c9805
Payroll entry ux improvements and processing via background jobs
2018-07-30 16:37:07 +05:30
Nabin Hait
04d5412754
Fixed conflict
2018-07-30 16:37:07 +05:30
Shreya Shah
b2e0f649d2
Merge pull request #15043 from shreyashah115/fix-typo
...
Fix typo in label
2018-07-30 12:27:19 +05:30
Shreya
21ce5e0609
Fix typo in label
2018-07-30 12:07:46 +05:30
Nabin Hait
9c735e43b0
Grant leaves via modal and backgroud jobs ( #15026 )
2018-07-30 10:58:49 +05:30
Ameya Shenoy
b8a59547f0
modified date for reload_doc ( #15027 )
2018-07-30 10:58:19 +05:30
Zarrar
89c87fd6a6
[Minor] Patch fix ( #15041 )
...
* update modified date
* remove extra parameter from function call
2018-07-30 10:57:47 +05:30
Zarrar
6004b66797
[Minor] Job Offer UX improvise ( #15042 )
...
* job offer ux improv
* Update job_offer.js
2018-07-30 10:57:13 +05:30
Nabin Hait
cce7c5c245
Fixed salary structure employee patches
2018-07-30 10:52:51 +05:30
rohitwaghchaure
91d2ace9bb
Account no + account name in trial balance and financial statements reports ( #15038 )
2018-07-30 10:38:51 +05:30
Shreya Shah
91a9ee5179
Merge accounts functionality ( #14993 )
...
* Add dialog to merge accounts
* Add conditions and merge functionality
* Fix travis
* Add test case
* Add more test scenarios
2018-07-28 10:26:11 +05:30
Shreya Shah
749094dd52
Translatable UOMs ( #15024 )
2018-07-27 12:54:34 +05:30
Nabin Hait
fa06ee80e9
Fixed merge conflict
2018-07-27 12:54:00 +05:30
Nabin Hait
11137850cb
Merge branch 'hotfix'
2018-07-27 12:35:42 +05:30
Nabin Hait
584153a1b1
bumped to version 10.1.44
2018-07-27 13:05:42 +06:00
Shreya Shah
eed0a4e2df
Do not copy remarks field while duplicating ( #15023 )
2018-07-27 11:26:35 +05:30
FinByz Tech Pvt. Ltd
f5cc1bd44c
Created Eway Bill Report ( #14926 )
...
* Created Eway Bill Report
* Field value changes
* Changed module from Stock to Regional
* Added comments and minor fix
* minor fix
2018-07-27 11:21:42 +05:30
Yaqin Shurrab
cc56ff5c37
Get the correct Summation of Closing Balances ( #14990 )
...
Fix total raw values for Closing Credit and Closing Debit
2018-07-27 11:13:00 +05:30
rohitwaghchaure
20d3bef3c3
[Fix] Deducted tax amount adding up in the total amount in the GST Itemised Purchase Register report ( #14994 )
2018-07-27 11:03:53 +05:30
mist-01
9821d51e31
Updated appointment availability to consider appointment duration in healthcare domain ( #15011 )
...
* Updated appointment availability to consider appointment duration in healthcare domain.
Fix bug - must clone moment before adding time to avoid updating original moment
* Add spaces after comments
2018-07-27 11:02:03 +05:30
Shreya Shah
1f4c263a63
[minor] Program Enrollment Tool ( #15013 )
...
* Make academic term field mandatory
* Add disabled field to Student Group
* Mandatory check in Education Settings for Academic Term
* Fix as per review
2018-07-27 10:59:14 +05:30
Shreya Shah
f71d18a35a
Increase margin ( #15016 )
2018-07-27 10:57:32 +05:30
Nabin Hait
d0a2b1619b
Optimization for marking student attendance
2018-07-27 10:51:55 +05:30
rohitwaghchaure
0fe6ced99d
[Fix] Valuation rate for serialized items ( #15017 )
2018-07-27 10:33:30 +05:30
Zarrar
4282729c72
delete version log while deleting company transaction ( #15021 )
2018-07-27 10:32:17 +05:30
Ranjith Kurungadam
e555b5bcf2
Salary Slip tests for tax calc on benefits, additional salary ( #14985 )
...
* tests for tax calc on benefits, additional salary
* fix tests - remove created additional salary
2018-07-26 14:39:59 +05:30
Nabin Hait
8173d9f17a
Update additional_salary.json
2018-07-26 12:20:05 +05:30
Saurabh
f86224e6f7
Merge pull request #14945 from chdecultot/gocardless_corrections
...
Gocardless improvement and payment request correction
2018-07-26 11:41:43 +05:30
Faris Ansari
195436093d
Merge pull request #15004 from netchampfaris/hub-factory-syntax
...
Fix Syntax Error in hub_factory.js
2018-07-26 10:57:02 +05:30
Nabin Hait
22fa99d040
Payroll Fixes
2018-07-25 18:21:39 +05:30
Nabin Hait
e50e0e4b30
Update repost_reserved_qty_for_production.py
2018-07-25 17:49:47 +05:30
Faris Ansari
6b07898ef0
semicolon
2018-07-25 17:07:26 +05:30
Faris Ansari
ed1190126e
Fix Syntax Error in hub_factory.js
2018-07-25 16:51:01 +05:30
Zarrar
739542133c
Merge pull request #14995 from Zlash65/min-fix
...
[Minor] Hub Factory class extend fix
2018-07-24 14:53:15 +05:30
Zlash65
617532b2cb
Factory: class.extend -> es6 class
2018-07-24 14:20:10 +05:30
Nabin Hait
90bb5f43d5
Added more status in task web form
2018-07-24 11:33:05 +05:30
Ranjith Kurungadam
e51c175aca
Fix tests ( #14991 )
...
* minor improv in fetching account
* pass name field while creating tds doc
* create tds fixture after creating tds account
* Inpatient Record - Test - Fix
* fix batch query
2018-07-24 11:07:28 +05:30
Nabin Hait
4037915b3c
Update setup.py
2018-07-23 18:05:55 +05:30
Nabin Hait
797497d22e
Fixed web form perm for tasks
2018-07-23 17:58:40 +05:30
