lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
77,331 Commits 43 Branches 150 Tags 886 MiB
56bc7b62ff
Commit Graph

5151 Commits

Author SHA1 Message Date
Laurent Destailleur
bf55733678 NEW Replace the "info" tab on contract with the more complete "agenda" 
tag.
 2019-07-23 02:45:31 +02:00
Laurent Destailleur
f5afc50067 Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries 2019-07-22 18:47:35 +02:00
Laurent Destailleur
de18d5d187 Enhance phpstan 2019-07-20 16:22:00 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97 FIX Limit of uploaded files (max_post_size was not used) 2019-07-20 13:09:25 +02:00
Laurent Destailleur
220f8300c1 FIX Responsive of public interface of ticket 2019-07-20 00:14:14 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
14751680d2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-19 13:38:05 +02:00
Laurent Destailleur
6c3a30e872 Fix log 2019-07-19 03:05:55 +02:00
Laurent Destailleur
b9fe874b5f Revert "Merge pull request #11022 from altatof/freetext" 
This reverts commit 879b4d8e7f, reversing
changes made to ddc01b4c27.
 2019-07-18 18:19:51 +02:00
Laurent Destailleur
879b4d8e7f
Merge pull request #11022 from altatof/freetext 
NEW : manage output languages for free text
 2019-07-18 17:29:45 +02:00
Alexandre SPANGARO
21bd46fc15 Merge remote-tracking branch 'upstream/develop' into 11.0_salaries 2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda NEW Extrafields on salaries 2019-07-17 14:09:25 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
9b32763919 Fix label for report n ledger for transitionnal bank account on tranfer 2019-07-05 15:25:29 +02:00
Laurent Destailleur
e3359c6f0f FIX Can't submit a ticket from public interface 2019-07-05 11:21:04 +02:00
Laurent Destailleur
4e00cfb455 Clean code 2019-07-04 16:02:04 +02:00
Laurent Destailleur
fb8c93a69d FIX Bad sql request 2019-07-04 16:00:14 +02:00
Laurent Destailleur
c9477f5c4f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:29:33 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
d1dc189a8f
Merge pull request #11383 from atm-maxime/new_task_totaldeclared 
NEW Add global task declared progression
 2019-06-24 18:12:55 +02:00
Laurent Destailleur
76d49229cd Fix log 2019-06-24 13:42:46 +02:00
Laurent Destailleur
1c86294f83 Enhance pdf_getFormat 2019-06-24 13:39:32 +02:00
Laurent Destailleur
1699413a4c Add log 2019-06-24 12:59:16 +02:00
Laurent Destailleur
6cab4f03ba Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 12:10:50 +02:00
Laurent Destailleur
a4cd7772ef Fix title 2019-06-22 12:02:41 +02:00
Laurent Destailleur
8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/accounting.lib.php
	htdocs/product/stock/class/entrepot.class.php
 2019-06-20 18:24:43 +02:00
Maxime Kohlhaas
b0229d1b9a Global task declared progression on project task tab 2019-06-20 14:07:44 +02:00
Laurent Destailleur
ff0f6295d8 Fix phpcs 2019-06-20 13:59:53 +02:00
Laurent Destailleur
6975e18233 Fix phpcs 2019-06-20 13:59:04 +02:00
Laurent Destailleur
4ffa48d9bd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 13:50:47 +02:00
Laurent Destailleur
29e3199639 Fix phpcs 2019-06-20 13:39:29 +02:00
Laurent Destailleur
e9da44e023 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 12:33:02 +02:00
Laurent Destailleur
cb057e9c6d NEW Add hidden option to be ready for BREXIT 2019-06-20 12:32:14 +02:00
Laurent Destailleur
a264a4766a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:45:04 +02:00
Laurent Destailleur
ee8e7d66f8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-20 03:43:27 +02:00
Laurent Destailleur
078324811b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/fourn/class/fournisseur.facture.class.php
 2019-06-20 03:43:16 +02:00
Laurent Destailleur
4574ad2eeb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-20 03:39:48 +02:00
Laurent Destailleur
554724a46f
Merge pull request #11363 from aspangaro/10.0_other 
Translate rights
 2019-06-20 03:36:16 +02:00
Laurent Destailleur
03178bc481
Merge pull request #11293 from hregis/develop_pdf 
FIX better method to check if pdf is protected/encrypted
 2019-06-20 03:22:51 +02:00
Laurent Destailleur
d152354022
Merge pull request #11295 from OPEN-DSI/new-warehouse-extrafield 
NEW add extrafields in warehouses
 2019-06-20 03:16:49 +02:00
Laurent Destailleur
898d766489
Merge pull request #11354 from rycks/allowZeroAsAccountNumber 
Allow zero as account number
 2019-06-20 03:09:37 +02:00
Laurent Destailleur
d6b6f77e74 Fix support domains with 3 levels 2019-06-19 22:06:12 +02:00
Laurent Destailleur
68e9712f0c Fix support domains with 3 levels 2019-06-19 22:05:38 +02:00
Alexandre SPANGARO
c59de49894 Translate rights 2019-06-18 22:38:52 +02:00
Laurent Destailleur
20e00ca290 FIX if last char of customercode is accent making the truncate of first 
chars wrong.
 2019-06-18 19:41:16 +02:00
Laurent Destailleur
42e58d9ea5 Fix preview of interventions 2019-06-17 18:38:14 +02:00