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

19498 Commits

Author SHA1 Message Date
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
Bahfir Abbes
7f34a03034 It's just a mistake. In order to declare a getnomUrl method, Ccountry does not need to extend Commonobject 2019-06-20 20:55:48 +01: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
bb9b0d401e Fix phpcs 2019-06-20 13:56:20 +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
florian HENRY
0865bdb60f fix depending extrafeilds list 2019-06-20 12:16:48 +02:00
John Botella
b21006614c Fix substitutions null 2019-06-20 12:00:44 +02:00
John Botella
6a68c8cd99 Fix display option email per participient 2019-06-20 11:09:37 +02:00
John Botella
9305403bea Fix duplicate pdf in mass sendmail 2019-06-20 10:32:32 +02:00
John Botella
252bd6d9ba FIX condition 2019-06-20 09:48:08 +02:00
John Botella
7c29fb614c Fix replacement and vars names 2019-06-20 09:21:35 +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
2c0d43a27a Merge pull request #11372 from bafbes/abb90059 
New:Show c_country elements in modulebuilder
 2019-06-20 03:32:53 +02:00
Laurent Destailleur
2b0b7b0dab Update ccountry.class.php 2019-06-20 03:32:28 +02:00
Laurent Destailleur
13200a4d51 Merge pull request #11350 from frederic34/patch-7 
NEW can specify hour start end for selectDate and step for minutes
 2019-06-20 03:24:23 +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
daab58974e Merge pull request #11366 from aspangaro/10.0_other2 
Missing language key
 2019-06-20 03:02:13 +02:00
Laurent Destailleur
925314c710 Merge pull request #11367 from aspangaro/10.0_other3 
Nowrap on amount
 2019-06-20 02:51:14 +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
John Botella
31a53b72ae FIX var name 2019-06-19 16:55:45 +02:00
Laurent Destailleur
04f2fb604f Fix duplicate 'option_' in prefix 2019-06-19 15:48:37 +02:00
Laurent Destailleur
2034faf280 Fix duplicate 'option_' in prefix 2019-06-19 15:48:04 +02:00
Abbes Bahfir
c109eebe38 New:Show c_country elements in modulebuilder 2019-06-19 14:43:18 +01:00
Abbes Bahfir
695a00f21c New:Show labels of countries in modulebuilder 2019-06-19 14:04:18 +01:00
Laurent Destailleur
f9cc120d75 Debug module ticket 2019-06-19 12:53:28 +02:00
Alexandre SPANGARO
9bde7c5229 Nowrap on amount 2019-06-19 09:21:18 +02:00
Alexandre SPANGARO
13836d3e21 Missing language ley 2019-06-19 06:21:53 +02:00
Alexandre SPANGARO
c59de49894 Translate rights 2019-06-18 22:38:52 +02:00
Laurent Destailleur
53923a8581 Fix scrutinizer warnings 2019-06-18 20:21:22 +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
0123a18ff8 Look and feel v10 2019-06-17 18:44:08 +02:00
Laurent Destailleur
42e58d9ea5 Fix preview of interventions 2019-06-17 18:38:14 +02:00
Eric Seigne
0b3bc5a172 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into allowZeroAsAccountNumber 2019-06-17 18:30:11 +02:00
Eric Seigne
80d4d8754d allow zero as accountancy code nomber (replace all empty tests by != '') 2019-06-17 18:28:11 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
2fab35c287 Debug page to export file 2019-06-17 17:20:22 +02:00