Commit Graph

76686 Commits

Author SHA1 Message Date
Laurent Destailleur
b111636ed0 Fix trans 2019-06-20 18:32:25 +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
Laurent Destailleur
495604fa83 Fix phpunit 2019-06-20 18:16:49 +02:00
Laurent Destailleur
e28bf71964 Fix error management of warehouse->delete 2019-06-20 18:15:14 +02:00
Laurent Destailleur
d47cf87c00 Look and feel v10 2019-06-20 17:59:28 +02:00
Laurent Destailleur
6b5d477476 Fix search criteria lost after a delete 2019-06-20 17:14:04 +02:00
Laurent Destailleur
c521b9b8f8 Fix dispatch in ledger table of withdraw / direct debit payment 2019-06-20 16:58:51 +02:00
Laurent Destailleur
faadae8157 Code comment 2019-06-20 15:59:45 +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
4f9aa4caac Fix phpcs 2019-06-20 13:53:31 +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
afb6362317 Fix look and feel v10
Fix link to direct debit payment order
2019-06-20 13:37:06 +02:00
Laurent Destailleur
add36777ff Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 12:35:04 +02:00
Laurent Destailleur
bff6260983 Fix syntax error 2019-06-20 12:34: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
6e069385bc Update doc 2019-06-20 12:32:38 +02:00
Laurent Destailleur
cb057e9c6d NEW Add hidden option to be ready for BREXIT 2019-06-20 12:32:14 +02:00
Laurent Destailleur
1a6dc83d4c Fix: default accounting account for eec and export sales were not used. 2019-06-20 12:25:58 +02:00
Laurent Destailleur
c0aabaa3cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 04:11:08 +02:00
Laurent Destailleur
d15a300f02 Removed not used var 2019-06-20 04:10:58 +02:00
Laurent Destailleur
06e5fbd649
Merge pull request #11132 from ptibogxiv/patch-174
NEW add API shipment mode dictionnary
2019-06-20 03:56:59 +02:00
Laurent Destailleur
77a45b878b Fix migration 2019-06-20 03:56:42 +02:00
Laurent Destailleur
40023c8ba2
Merge branch 'develop' into patch-174 2019-06-20 03:56:29 +02:00
Laurent Destailleur
5fe91afdc2
Update 9.0.0-10.0.0.sql 2019-06-20 03:54:50 +02:00
Laurent Destailleur
5d4d02f3b2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:54:20 +02:00
Laurent Destailleur
5f32b5e23e Prepare v11 alpha 2019-06-20 03:54:11 +02:00
Laurent Destailleur
d8c2007d92 Prepare v11 alpha 2019-06-20 03:53:33 +02:00
Laurent Destailleur
e64a4510d1
Merge pull request #11211 from atm-john/New_look_and_feel_form_validation
NEW: look and feel -> css for html5 ::invalid pseudo element
2019-06-20 03:48:56 +02:00
Laurent Destailleur
4a101a8e9f
Merge pull request #11161 from hregis/develop_bug
NEW add "printBucktrackInfo" hook, an external module can add info
2019-06-20 03:48:24 +02:00
Laurent Destailleur
0639313503
Merge branch 'develop' into develop_bug 2019-06-20 03:47:45 +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
001da8b2fc Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 03:44:54 +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
26c12c61a7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-20 03:39:56 +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
980239e617
Merge pull request #11362 from aspangaro/10.0_index
Responsive on project index
2019-06-20 03:35:13 +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
e99cf13ccf
Merge pull request #11225 from ATM-Nicolas/new_propal_list_column
NEW Add hidden option PROPOSAL_SHOW_INVOICED_AMOUNT (not reliable if one invoice is done on several order or several proposal)
2019-06-20 03:27:45 +02:00
Laurent Destailleur
3faa0012a1
Merge pull request #11358 from hregis/10.0
FIX add v10 in virtualmin script
2019-06-20 03:24:48 +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
382ec1a106
Merge pull request #11254 from andreubisquerra/master
Basic phone layout for Restaurants in TakePOS
2019-06-20 03:14:23 +02:00
Laurent Destailleur
47430d358d
Merge pull request #11356 from ptibogxiv/patch-191
NEW list of measuring units API
2019-06-20 03:13:28 +02:00