[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 0dc8d3: Fix trad
|
From: |
Laurent Destailleur |
|
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 0dc8d3: Fix trad |
|
Date: |
Tue, 20 Mar 2018 06:52:42 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 0dc8d3cb003fefa60d85836ea583958d541119c3
https://github.com/Dolibarr/dolibarr/commit/0dc8d3cb003fefa60d85836ea583958d541119c3
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/langs/en_US/admin.lang
Log Message:
-----------
Fix trad
Commit: a325bbf8650567e2fcce5ff9879d1efa57c46ea9
https://github.com/Dolibarr/dolibarr/commit/a325bbf8650567e2fcce5ff9879d1efa57c46ea9
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-19 (Mon, 19 Mar 2018)
Changed paths:
M htdocs/core/class/html.form.class.php
M htdocs/holiday/card.php
M htdocs/holiday/list.php
M htdocs/langs/en_US/holiday.lang
Log Message:
-----------
FIX Input of holiday for subordinates was ko
Commit: 8cf2d4eb45205f704b3357d4d48feb623c3980ee
https://github.com/Dolibarr/dolibarr/commit/8cf2d4eb45205f704b3357d4d48feb623c3980ee
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-20 (Tue, 20 Mar 2018)
Changed paths:
M htdocs/contrat/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/holiday/class/holiday.class.php
Log Message:
-----------
Fix filter on holiday statut
Fix tr/td balance for extrafields on lines
Commit: 896a1cbc2475abb160f96cb43bfc5cb557099c43
https://github.com/Dolibarr/dolibarr/commit/896a1cbc2475abb160f96cb43bfc5cb557099c43
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-20 (Tue, 20 Mar 2018)
Changed paths:
M htdocs/core/class/conf.class.php
Log Message:
-----------
Fix bad var init
Commit: 8214e7bb42e042d06f55eb77b2c19ec2e8df17c8
https://github.com/Dolibarr/dolibarr/commit/8214e7bb42e042d06f55eb77b2c19ec2e8df17c8
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-20 (Tue, 20 Mar 2018)
Changed paths:
M htdocs/holiday/list.php
M htdocs/modulebuilder/template/myobject_list.php
Log Message:
-----------
Fix missing security restiction test
Commit: 78b4492f1e2afb2226c94a81d4d3065ec7d09475
https://github.com/Dolibarr/dolibarr/commit/78b4492f1e2afb2226c94a81d4d3065ec7d09475
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-20 (Tue, 20 Mar 2018)
Changed paths:
M htdocs/holiday/list.php
Log Message:
-----------
FIX Permission in list of holiday
Conflicts:
htdocs/holiday/list.php
Commit: d7ad899839522c2d9819acec7473d2c97f66a9da
https://github.com/Dolibarr/dolibarr/commit/d7ad899839522c2d9819acec7473d2c97f66a9da
Author: Laurent Destailleur <address@hidden>
Date: 2018-03-20 (Tue, 20 Mar 2018)
Changed paths:
M htdocs/contrat/card.php
M htdocs/core/class/commonobject.class.php
M htdocs/core/class/conf.class.php
M htdocs/core/class/html.form.class.php
M htdocs/core/menus/init_menu_auguria.sql
M htdocs/core/menus/standard/eldy.lib.php
M htdocs/core/tpl/objectline_create.tpl.php
M htdocs/core/tpl/objectline_edit.tpl.php
M htdocs/core/tpl/objectline_view.tpl.php
M htdocs/holiday/card.php
M htdocs/holiday/class/holiday.class.php
M htdocs/holiday/list.php
M htdocs/langs/en_US/admin.lang
M htdocs/langs/en_US/holiday.lang
Log Message:
-----------
Merge branch '7.0' of address@hidden:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contrat/card.php
htdocs/core/class/conf.class.php
htdocs/core/tpl/objectline_view.tpl.php
htdocs/holiday/list.php
Compare:
https://github.com/Dolibarr/dolibarr/compare/a12f884a7f18...d7ad89983952