lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
79,270 Commits 43 Branches 150 Tags 886 MiB
2b66282b61
Commit Graph

2225 Commits

Author SHA1 Message Date
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
cd242523a5 Fix billed time is empty 2019-10-01 13:47:12 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
dc7ad61940 Add class reposition on button that switch the view mode 2019-09-30 17:46:53 +02:00
Laurent Destailleur
48fc165026 Trans 2019-09-30 17:15:05 +02:00
Laurent Destailleur
ce7e8c83a3 Use a dedicated css imgforviewmode for button used to switch view 2019-09-30 17:08:57 +02:00
Laurent Destailleur
b28cd1bb57
Merge pull request #11972 from aspangaro/11.0_fa_icon 
NEW Add fa_icon on load_fiche_titre
 2019-09-30 15:26:28 +02:00
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
412e0f193b
Update element.php 2019-09-27 12:36:53 +02:00
Laurent Destailleur
34aa64bae2
Update element.php 2019-09-27 12:36:15 +02:00
Laurent Destailleur
2eaa910336
Update project.class.php 2019-09-27 12:32:27 +02:00
Alexandre SPANGARO
1b099733f5 Merge remote-tracking branch 'upstream/develop' into 11.0_translation 2019-09-24 08:42:57 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Laurent De Coninck
b4f31d61fa allow to remove one custom referent in the project. 
Allow to remove one custom referent from the project.

When we develop one module that supports the custom referent in a
project and if you don't follow the same naming convention as in the
other table (in french). You cannot remove the element.

This fix support now the property 'project_field'. And thus set this
column to null.

[see: #11881]
 2019-09-23 17:46:54 +02:00
Laurent Destailleur
41a2a25729 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/ligne.php
 2019-09-17 12:23:58 +02:00
Laurent Destailleur
a91f39ea3e FIX selection of project i am contact of. 2019-09-17 12:18:29 +02:00
Laurent Destailleur
4e4172dd1b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/public/payment/newpayment.php
 2019-09-13 18:56:19 +02:00
Laurent Destailleur
36963423c3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-13 11:59:39 +02:00
Laurent Destailleur
7b73e2d57a FIX label of thirdparty is wrong on open project list 2019-09-13 11:05:50 +02:00
Laurent Destailleur
61cf47aa16 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-10 00:14:07 +02:00
Laurent Destailleur
ba33369af6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-09-10 00:10:08 +02:00
Laurent Destailleur
0466ee1941 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-09 14:08:20 +02:00
Laurent Destailleur
d2131a0be8 Add filter on usage on project list 2019-09-09 14:08:10 +02:00
Laurent Destailleur
f2b9517dac FIX #11834 2019-09-09 13:16:31 +02:00
ATM john
ecddeb2b8b Add progress to global task list 2019-09-08 21:19:15 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
98459363df
Merge pull request #11795 from jtraulle/fix-doxygen-examples 
Fix Wrongly catched examples by Doxygen
 2019-09-03 12:45:23 +02:00
Laurent Destailleur
a269082d70 Replace deprecated code with new one 2019-09-02 03:58:00 +02:00
Laurent Destailleur
40890ae345 Fix scrutinizer 2019-09-01 21:31:07 +02:00
Laurent Destailleur
04057cd83e Prepare reengeneering of project usage 2019-09-01 02:02:38 +02:00
Jean Traullé
c32c7d48ba
Fix Wrongly catched examples by Doxygen 2019-08-30 17:14:59 +02:00
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
Laurent Destailleur
9f775ca480 Fix look and feel v10 2019-08-29 01:37:19 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
c93e6550ce Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:43:24 +02:00
Laurent Destailleur
dcfbba9af5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-08-26 16:41:06 +02:00
Regis Houssin
064ab389ed FIX wrong parameters (same error in branch 9, 10, develop) 2019-08-24 12:44:23 +02:00
Laurent Destailleur
cb05380f74 Fix look and feel v10 2019-08-21 04:02:30 +02:00
Laurent Destailleur
cb0bb55b3a Label centered 2019-08-19 10:29:59 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
21fc089f58 FIX Translation of month 2019-08-19 10:18:38 +02:00