[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Dolibarr-git] [Dolibarr/dolibarr] 54a154: NEW : Add ressource extrafiel
From: |
Laurent Destailleur |
Subject: |
[Dolibarr-git] [Dolibarr/dolibarr] 54a154: NEW : Add ressource extrafields |
Date: |
Sun, 23 Oct 2016 17:06:21 -0700 |
Branch: refs/heads/develop
Home: https://github.com/Dolibarr/dolibarr
Commit: 54a154fa4f91b6058e9cabdf65bb269baf914601
https://github.com/Dolibarr/dolibarr/commit/54a154fa4f91b6058e9cabdf65bb269baf914601
Author: florian HENRY <address@hidden>
Date: 2016-10-19 (Wed, 19 Oct 2016)
Changed paths:
A htdocs/admin/resource.php
A htdocs/admin/resource_extrafields.php
M htdocs/core/lib/resource.lib.php
M htdocs/core/modules/modResource.class.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
A htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
A htdocs/install/mysql/tables/llx_resource_extrafields.sql
M htdocs/langs/en_US/admin.lang
M htdocs/resource/add.php
M htdocs/resource/card.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/list.php
Log Message:
-----------
NEW : Add ressource extrafields
Commit: 5bf03de3fbd000cc33d72387169359ce21d5459d
https://github.com/Dolibarr/dolibarr/commit/5bf03de3fbd000cc33d72387169359ce21d5459d
Author: florian HENRY <address@hidden>
Date: 2016-10-19 (Wed, 19 Oct 2016)
Changed paths:
M htdocs/admin/resource.php
M htdocs/core/lib/resource.lib.php
Log Message:
-----------
Fix setup page
Commit: 5f3eb9097e0a0e7a9359fcb59f7334ea224f9f80
https://github.com/Dolibarr/dolibarr/commit/5f3eb9097e0a0e7a9359fcb59f7334ea224f9f80
Author: florian HENRY <address@hidden>
Date: 2016-10-21 (Fri, 21 Oct 2016)
Changed paths:
M dev/skeletons/skeleton_class.class.php
M htdocs/accountancy/admin/productaccount.php
M htdocs/accountancy/class/bookkeeping.class.php
M htdocs/core/modules/cheque/doc/pdf_blochet.class.php
M htdocs/core/modules/commande/doc/pdf_einstein.modules.php
M htdocs/core/modules/contract/doc/pdf_strato.modules.php
M htdocs/core/modules/dons/html_cerfafr.modules.php
M htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
M htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
M htdocs/core/modules/propale/doc/pdf_azur.modules.php
M htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
M htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
M htdocs/core/triggers/interface_20_all_Logevents.class.php
M htdocs/product/list.php
M htdocs/societe/canvas/actions_card_common.class.php
Log Message:
-----------
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_resource_extrafields
Commit: fdcc85800884c4d202e6e7bc950930ab13c947f6
https://github.com/Dolibarr/dolibarr/commit/fdcc85800884c4d202e6e7bc950930ab13c947f6
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-24 (Mon, 24 Oct 2016)
Changed paths:
A htdocs/admin/resource.php
A htdocs/admin/resource_extrafields.php
M htdocs/core/lib/resource.lib.php
M htdocs/core/modules/modResource.class.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
A htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
A htdocs/install/mysql/tables/llx_resource_extrafields.sql
M htdocs/langs/en_US/admin.lang
M htdocs/resource/add.php
M htdocs/resource/card.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/list.php
Log Message:
-----------
Merge branch 'dev_resource_extrafields' of
https://github.com/atm-florian/dolibarr into
atm-florian-dev_resource_extrafields
Conflicts:
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
Commit: 18fad2088aa6944d1d4133792107f6d61725c14c
https://github.com/Dolibarr/dolibarr/commit/18fad2088aa6944d1d4133792107f6d61725c14c
Author: Laurent Destailleur <address@hidden>
Date: 2016-10-24 (Mon, 24 Oct 2016)
Changed paths:
A htdocs/admin/resource.php
A htdocs/admin/resource_extrafields.php
M htdocs/core/lib/resource.lib.php
M htdocs/core/modules/modResource.class.php
M htdocs/install/mysql/migration/4.0.0-5.0.0.sql
A htdocs/install/mysql/tables/llx_resource_extrafields.key.sql
A htdocs/install/mysql/tables/llx_resource_extrafields.sql
M htdocs/langs/en_US/admin.lang
M htdocs/resource/add.php
M htdocs/resource/card.php
M htdocs/resource/class/dolresource.class.php
M htdocs/resource/list.php
Log Message:
-----------
git push origin developMerge branch 'atm-florian-dev_resource_extrafields'
into develop
Compare:
https://github.com/Dolibarr/dolibarr/compare/b1cab83af59c...18fad2088aa6
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Dolibarr-git] [Dolibarr/dolibarr] 54a154: NEW : Add ressource extrafields,
Laurent Destailleur <=