Commit Graph

17481 Commits

Author SHA1 Message Date
Laurent Destailleur
4499447a89 Fix sort order of import profiles
Fix picto in import profile for accounting
2019-06-21 14:27:38 +02:00
Laurent Destailleur
f9095408b6 Fix sort order of export profiles
Add missing pos information into export of invoice
Add missing label of project in export of invoice
2019-06-21 13:25:40 +02:00
Laurent Destailleur
ad4bd05efb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/modules/modAdherent.class.php
2019-06-21 11:29:06 +02:00
Laurent Destailleur
c725db166d Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-21 11:26:44 +02:00
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
Laurent Destailleur
ff0f6295d8 Fix phpcs 2019-06-20 13:59:53 +02:00
Laurent Destailleur
29e3199639 Fix phpcs 2019-06-20 13:39:29 +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
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
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
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
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
Laurent Destailleur
a74eaaff4d Fix sort of linked elements 2019-06-17 15:54:54 +02:00
Laurent Destailleur
cf82587504 Fix menu entry 2019-06-17 15:02:44 +02:00
Laurent Destailleur
8330078de1 Fix default value 2019-06-17 12:33:09 +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
Laurent Destailleur
48b2cb83af Close #11152 by a manual merge to keep only required things 2019-06-16 17:08:23 +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
5cada6ee0b Merge pull request #11336 from ptibogxiv/patch-186
Fix measuring_units_string display function
2019-06-14 13:48:31 +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
Laurent Destailleur
e8b139d1c6 Fix repeated logs and fetch 2019-06-13 22:48:31 +02:00
ATM john
e7d81a68f0 Fix Override Attribute 2019-06-13 22:11:47 +02:00