Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
72,480 Commits 36 Branches 189 Tags
84ec39f043c3d807519b8e4cb1570a01eb47d848
Commit Graph

5186 Commits

Author SHA1 Message Date
Regis Houssin
db17eb80ec Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/class/paymentterm.class.php
 2017-09-15 16:45:49 +02:00
Laurent Destailleur
c930ba1669 Merge pull request #7403 from hregis/develop_bug 
Fix: avoid Warning: A non-numeric value encountered
 2017-09-15 15:52:25 +02:00
Regis Houssin
25cd1ee27a Fix: avoid Warning: A non-numeric value encountered 2017-09-15 11:19:19 +02:00
Regis Houssin
a213a5d5fd Fix: missing empty $object 2017-09-15 11:12:56 +02:00
Regis Houssin
b9e0879847 NEW: Add hook addAdminLdapOptions and doAction in ldap admin page 
NEW: complete_head_from_modules() in ldap_prepare_head()
 2017-09-15 10:57:22 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
3b40c95107 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/class/categorie.class.php
 2017-09-14 21:57:14 +02:00
Regis Houssin
a494e01f00 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-14 12:07:19 +02:00
Laurent Destailleur
205989b64b Fix phpunit 2017-09-14 09:16:57 +02:00
Laurent Destailleur
51e5959765 Fix travis 2017-09-14 08:26:13 +02:00
Laurent Destailleur
1a056d29d2 Debug search on dolistore 2017-09-12 21:02:18 +02:00
Laurent Destailleur
a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/customer/index.php
	htdocs/accountancy/expensereport/index.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/fichinter/class/fichinter.class.php
	htdocs/societe/class/societe.class.php
	htdocs/societe/list.php
 2017-09-12 13:26:25 +02:00
Laurent Destailleur
d0a0bf57b6 NEW The "Show detail by account" accepts 3 values: yes, no, if non zero 2017-09-12 12:52:48 +02:00
Laurent Destailleur
31b5ca17f1 Merge pull request #7353 from hregis/6.0_htmlentities 
Fix: avoid htmlentities
 2017-09-11 14:08:37 +02:00
Regis Houssin
b5de8da3a6 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/core/modules/modFacture.class.php
 2017-09-11 08:07:55 +02:00
Laurent Destailleur
e9e6a8e5ad Fix center of button 2017-09-11 03:29:36 +02:00
Laurent Destailleur
903df90f8a NEW Can edit with delete/insert a forced translation 2017-09-10 22:46:08 +02:00
Regis Houssin
7404a6cf98 Fix: avoid htmlentities 2017-09-09 12:15:59 +02:00
Laurent Destailleur
75172966c2 Fix selection of email templates 2017-09-08 14:40:39 +02:00
Laurent Destailleur
259cca0230 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/admin/mails_templates.php
 2017-09-08 13:30:54 +02:00
Laurent Destailleur
152416a6d7 Fix bad param 2017-09-08 13:24:10 +02:00
Laurent Destailleur
b7197530c2 NEW Each user can edit its own email template (menu tools) 2017-09-08 12:48:01 +02:00
Laurent Destailleur
835cd43565 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-09-08 10:09:41 +02:00
Laurent Destailleur
7dbd0bd355 FIX Some page of admin were not responsive 2017-09-08 10:09:22 +02:00
Laurent Destailleur
f92eded0a2 Merge pull request #7340 from Oeris/6.0-ficheinter 
NEW Adds an option to hide duration in the "intervention" module
 2017-09-07 18:07:14 +02:00
Laurent Destailleur
b9af2d6b97 Merge pull request #7331 from simnandez/6.0 
FIX: Bad const name
 2017-09-07 17:57:33 +02:00
Neil Orley
e43b13968e New: Adds an hide hour button in the "intervention" module 
Adds a way to set the visibility of hours/mins of the intervention date field from the administration interface of the "intervention" module
 2017-09-07 15:31:19 +02:00
Neil Orley
b5c30ea679 New: Adds an hide duration button in intervention module 
Adds a way to set the visibility of the intervention time field from the administration interface of the "intervention" module
 2017-09-07 11:58:22 +02:00
Regis Houssin
66e548427c Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/resultat/clientfourn.php
	htdocs/core/lib/functions.lib.php
	htdocs/install/mysql/migration/6.0.0-7.0.0.sql
 2017-09-07 10:50:35 +02:00
Laurent Destailleur
859d0dfe97 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2017-09-06 19:24:42 +02:00
Laurent Destailleur
d26b2a694d FIX Security fixes (filter onload js, less verbose error message in 
download and viewimage, show info to encourage dolibarr_main_prod=1)
 2017-09-06 11:39:30 +02:00
Laurent Destailleur
f29a4c1fb1 Make accountancy pages responsive 2017-09-05 20:42:34 +02:00
Juanjo Menent
53f5513476 FIX: Bad const name 2017-09-05 18:10:19 +02:00
Laurent Destailleur
c3daad7545 Fix not reachable code 2017-09-04 12:55:32 +02:00
Laurent Destailleur
3e9679f273 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-09-04 10:20:17 +02:00
Laurent Destailleur
58b08c7de8 Clean code 2017-09-01 23:56:59 +02:00
Laurent Destailleur
4b9f54e571 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/install/mysql/data/llx_accounting.sql
	htdocs/install/mysql/migration/5.0.0-6.0.0.sql
	htdocs/install/mysql/tables/llx_holiday_config.sql
 2017-09-01 17:34:57 +02:00
Regis Houssin
d9008cd302 Fix: missing $dolibarrdataroot value 2017-09-01 08:20:33 +02:00
Regis Houssin
8e8f94df11 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_dict

Conflicts:
	htdocs/compta/facture/card.php
	htdocs/compta/facture/class/facture-rec.class.php
 2017-08-30 19:33:23 +02:00
Juanjo Menent
bfc5f01e1e NEW Add detail of all tax rates into pdf column tax sale. 
-Can be hidden by pdf setup page
-For know if localtax is applied into line we have to read totaltax line
 2017-08-30 14:36:00 +02:00
Laurent Destailleur
4d908c2dd0 Merge pull request #7299 from atm-maxime/new_expense_numbering 
New : add expense report numbering mask
 2017-08-29 18:24:17 +02:00
Laurent Destailleur
a60cd49fb0 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/CMailFile.class.php
	htdocs/filefunc.inc.php
 2017-08-28 12:53:02 +02:00
Laurent Destailleur
21a7fcb01a Fix substitution when sending emails 2017-08-28 12:18:18 +02:00
Maxime Kohlhaas
350b24f32b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_expense_numbering 2017-08-27 17:53:19 +02:00
Maxime Kohlhaas
61fadfd0e1 New numbering module for expense report + admin setup 2017-08-27 10:49:51 +02:00
Laurent Destailleur
77af3b96d3 Showempty on language list 2017-08-26 18:45:10 +02:00
Laurent Destailleur
5ed22b64fb Show if module add objects tables 2017-08-26 16:04:24 +02:00
Laurent Destailleur
632119a5c5 Show if module add dictionary data 2017-08-26 15:46:35 +02:00
Laurent Destailleur
f2a437fa89 Enhance modulebuilder 2017-08-26 15:22:13 +02:00
Laurent Destailleur
7329d21dcd Fix lang selection 2017-08-25 17:13:33 +02:00