Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 21:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
84,048 Commits 36 Branches 190 Tags
50b5226d10547030c0a2cb151935251bb6ec6937
Commit Graph

5903 Commits

Author SHA1 Message Date
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
John Botella
9c2e83dcae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-07-01 09:51:26 +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
atm-quentin
49db277368 FIX ending slash 2019-06-26 16:42:14 +02:00
John Botella
7e14a598e2 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-26 09:43:43 +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
3c4956838e Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-06-24 15:44:44 +02:00
John Botella
ec7446762c Fix travis 2019-06-24 14:36:06 +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
John Botella
9c414a7a57 Change function to camel case 2019-06-24 12:22:33 +02:00
John Botella
a83e7f3665 Add retained warranty to PDF 2019-06-24 12:00:55 +02:00
John Botella
7b6925b8f7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-06-24 10:29:43 +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
John Botella
ec7ebe9f39 redo backported fix and update adherent substitution methode 2019-06-21 15:32:38 +02:00
John Botella
200b66d11f Remove a backported fix because failling at init test 2019-06-21 14:52:12 +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
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +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
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Regis Houssin
3afd4e15ad FIX try to remove ob_* functions 2019-06-17 07:09:19 +02:00
Regis Houssin
908b5fff00 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_pdf 2019-06-17 07:08:35 +02:00
Regis Houssin
6597c9f60d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-06-17 06:45:08 +02:00
Laurent Destailleur
122c4eb8bd Merge pull request #11337 from atm-john/10.0_fix_dolGetButtonAction 
FIX empty test
 2019-06-14 13:51:34 +02:00
Laurent Destailleur
1fa1b91916 Update product.lib.php 2019-06-14 13:46:59 +02:00
Laurent Destailleur
e6c28188db Update product.lib.php 2019-06-14 13:38:52 +02:00
ATM john
e7d81a68f0 Fix Override Attribute 2019-06-13 22:11:47 +02:00