[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] f3cd9d: Resource fixes
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] f3cd9d: Resource fixes |
|
Date: |
Mon, 17 Aug 2015 03:55:55 -0700 |
Branch: refs/heads/3.8
Home: https://github.com/Dolibarr/dolibarr
Commit: f3cd9da73d74ad10c8631dab575dcd5a45d08c38
https://github.com/Dolibarr/dolibarr/commit/f3cd9da73d74ad10c8631dab575dcd5a45d08c38
Author: Ion Agorria <address@hidden>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M htdocs/resource/card.php
M htdocs/resource/class/resource.class.php
M htdocs/resource/element_resource.php
Log Message:
-----------
Resource fixes
Commit: 2e1e9017c6961ef23b7183e00c255a04091e6717
https://github.com/Dolibarr/dolibarr/commit/2e1e9017c6961ef23b7183e00c255a04091e6717
Author: Ion Agorria <address@hidden>
Date: 2015-08-12 (Wed, 12 Aug 2015)
Changed paths:
M htdocs/core/tpl/resource_add.tpl.php
Log Message:
-----------
Missed the file
Commit: 2abb90713e1bfa999aa75739eaafd1e2f9e9095b
https://github.com/Dolibarr/dolibarr/commit/2abb90713e1bfa999aa75739eaafd1e2f9e9095b
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M htdocs/core/class/commonobject.class.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/resource/element_resource.php
Log Message:
-----------
Fix list of resource not visible
Commit: 6c01403ef3fb5cab93068a704fb16f33e1be1004
https://github.com/Dolibarr/dolibarr/commit/6c01403ef3fb5cab93068a704fb16f33e1be1004
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/resource/card.php
M htdocs/resource/class/resource.class.php
M htdocs/resource/element_resource.php
Log Message:
-----------
Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr
into IonAgorria-resources-fixes
Conflicts:
htdocs/core/tpl/resource_add.tpl.php
htdocs/resource/element_resource.php
Commit: 4ad05890c1ddef44ef3dcd8ff99e75b214712394
https://github.com/Dolibarr/dolibarr/commit/4ad05890c1ddef44ef3dcd8ff99e75b214712394
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/resource/card.php
M htdocs/resource/class/resource.class.php
M htdocs/resource/element_resource.php
Log Message:
-----------
Merge branch 'IonAgorria-resources-fixes' into develop
Commit: 10d3c41358e04347aea95895f17c404325299ec6
https://github.com/Dolibarr/dolibarr/commit/10d3c41358e04347aea95895f17c404325299ec6
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/core/class/html.formactions.class.php
Log Message:
-----------
Fix Bad value into popup
Commit: d4081936571c728b93bf7a83d712a0eded61cef3
https://github.com/Dolibarr/dolibarr/commit/d4081936571c728b93bf7a83d712a0eded61cef3
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M htdocs/expedition/card.php
M htdocs/langs/en_US/sendings.lang
Log Message:
-----------
Fix: When stock is empty, no information was visible to explain why
create button does not work.
Commit: 3bdd342df15ba1961eded3a4486cc65a1dccd64f
https://github.com/Dolibarr/dolibarr/commit/3bdd342df15ba1961eded3a4486cc65a1dccd64f
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-14 (Fri, 14 Aug 2015)
Changed paths:
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/product/class/productbatch.class.php
M htdocs/product/stock/class/mouvementstock.class.php
Log Message:
-----------
Fix #3116
Commit: d9b3069813754d88f750edf9bee33149b4bf39d6
https://github.com/Dolibarr/dolibarr/commit/d9b3069813754d88f750edf9bee33149b4bf39d6
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-15 (Sat, 15 Aug 2015)
Changed paths:
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
Log Message:
-----------
Fix: When validation and approval where done in same step, label of
action used always label for validation.
Commit: 52240eec9aa7e688b999886ff356f837e6583b18
https://github.com/Dolibarr/dolibarr/commit/52240eec9aa7e688b999886ff356f837e6583b18
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-15 (Sat, 15 Aug 2015)
Changed paths:
M htdocs/core/class/html.formactions.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/fourn/commande/card.php
Log Message:
-----------
Fix removed warnings
Commit: f3c4e20db2857ad649fee53a97c7dc4e141c6844
https://github.com/Dolibarr/dolibarr/commit/f3c4e20db2857ad649fee53a97c7dc4e141c6844
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-15 (Sat, 15 Aug 2015)
Changed paths:
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Fix centering of message on logon page
Commit: 911f37b6eb9af6b037ac9d8eb50340dd7f7d071c
https://github.com/Dolibarr/dolibarr/commit/911f37b6eb9af6b037ac9d8eb50340dd7f7d071c
Author: Laurent Destailleur <address@hidden>
Date: 2015-08-17 (Mon, 17 Aug 2015)
Changed paths:
M htdocs/comm/action/class/actioncomm.class.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/html.formactions.class.php
M htdocs/core/lib/functions.lib.php
M htdocs/core/lib/functions2.lib.php
M htdocs/core/tpl/login.tpl.php
M htdocs/core/tpl/passwordforgotten.tpl.php
M htdocs/core/tpl/resource_add.tpl.php
M htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
M htdocs/expedition/card.php
M htdocs/expedition/class/expedition.class.php
M htdocs/fourn/commande/card.php
M htdocs/langs/en_US/sendings.lang
M htdocs/product/class/productbatch.class.php
M htdocs/product/stock/class/mouvementstock.class.php
M htdocs/resource/card.php
M htdocs/resource/class/resource.class.php
M htdocs/resource/element_resource.php
M htdocs/theme/eldy/style.css.php
Log Message:
-----------
Merge remote-tracking branch 'origin/develop' into 3.8
Compare:
https://github.com/Dolibarr/dolibarr/compare/cfc76583990c...911f37b6eb9a