Commit Graph

84917 Commits

Author SHA1 Message Date
Laurent Destailleur
efaea37d61 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/extrafields.class.php
2020-03-30 19:42:53 +02:00
Laurent Destailleur
6ecacb9c29 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:38:07 +02:00
Laurent Destailleur
07d64f47e3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-03-30 19:37:29 +02:00
Laurent Destailleur
7466eaade3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:37:01 +02:00
Laurent Destailleur
9fcbec9f02 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-03-30 19:36:07 +02:00
Laurent Destailleur
06ad21f2e8
Merge pull request #13442 from fappels/9.0_newToken
Improve modulebuilder compatiblity with maintained versions.
2020-03-30 19:35:45 +02:00
Laurent Destailleur
ff44e2d2ac
Merge pull request #13448 from atm-quentin/FIX_missing_array_option_supplier_proposal_to_supplier_order
FIX missing array option
2020-03-30 19:35:20 +02:00
Laurent Destailleur
7c9583011a
Merge pull request #13441 from hgy29/patch-1
FIX: extra date field incorrect check
2020-03-30 19:30:25 +02:00
Laurent Destailleur
1c7ce31207
Merge pull request #13435 from ptibogxiv/patch-316
FIX product get purchase prices
2020-03-30 19:20:32 +02:00
Laurent Destailleur
81b41c932f
Merge pull request #13432 from atm-quentin/FIX_reapro_11
FIX replenish stock to buy
2020-03-30 19:11:34 +02:00
Laurent Destailleur
be3cc164c6 Increase size for unalterable logs record. 2020-03-30 18:41:21 +02:00
Laurent Destailleur
398812afa5 Add field to store version of encoding of line in blockedlog 2020-03-30 17:47:29 +02:00
Laurent Destailleur
39fba83f26 Add a right navigation on list of stripe charges 2020-03-30 15:56:14 +02:00
Laurent Destailleur
a886629d08 Fix lang 2020-03-30 15:00:29 +02:00
Laurent Destailleur
8fdacdf6be Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-30 14:58:51 +02:00
Laurent Destailleur
2b725ad5d5 Update year in demo data 2020-03-30 14:57:56 +02:00
Laurent Destailleur
82dbd546b3 Update year in demo data 2020-03-30 14:57:44 +02:00
atm-quentin
64207ef58d FIX missing array option 2020-03-30 14:18:59 +02:00
Laurent Destailleur
ead99c5976 Enhance updatedemo 2020-03-30 12:12:23 +02:00
Laurent Destailleur
6d732c9ea4 Update demo 2020-03-30 11:39:02 +02:00
Francis Appels
3eda785ca5 Add newline end of file 2020-03-30 10:36:49 +02:00
Francis Appels
076caa11ab Add token functions to improve modulebuilder compatiblity with maintained versions. 2020-03-30 10:28:20 +02:00
Nicolas Bouquet
31fca2897a
FIX: extra date field incorrect check
Small typo fixed, was preventing extra date fields from being processed, leading to denial of object creation
2020-03-30 10:24:42 +02:00
Laurent Destailleur
5b5f4a900c Fix css of buttome of recommended choice 2020-03-29 23:14:51 +02:00
Laurent Destailleur
221776d07d Migrate DoliWamp to use WampServer 3 2020-03-29 23:06:48 +02:00
Laurent Destailleur
e9fbcb45cf Fix trans 2020-03-29 21:24:05 +02:00
Laurent Destailleur
5fad4c8cb4 CSS 2020-03-29 19:41:01 +02:00
Laurent Destailleur
4ed4644c08 Work on generic multilanguage properties 2020-03-29 04:28:23 +02:00
Laurent Destailleur
239732a234 trans 2020-03-29 03:36:34 +02:00
Laurent Destailleur
44f7ba65e4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-29 03:34:23 +02:00
Laurent Destailleur
78bcf280ac CSS 2020-03-29 03:31:49 +02:00
Laurent Destailleur
9b2da5bdae FIX Missing token 2020-03-29 00:56:11 +01:00
Laurent Destailleur
cc35b5e6bd css 2020-03-28 17:49:20 +01:00
Laurent Destailleur
d5b107211f Look and feel v12 2020-03-28 15:20:26 +01:00
Laurent Destailleur
ec83f18944 Move more icon definition into CSS 2020-03-28 13:38:25 +01:00
ptibogxiv
cb7342d4c8
FIX product purchase prices
Fix get datas but don't fix cleandata :( @eldy
2020-03-27 20:07:18 +01:00
Laurent Destailleur
235210b3bc Look and feel v12 2020-03-27 19:26:45 +01:00
Laurent Destailleur
4207d94f53 FIX Bad position of total in column
Conflicts:
	htdocs/fourn/facture/paiement.php
2020-03-27 19:10:01 +01:00
Laurent Destailleur
a4797634d5 FIX Bad position of total in column 2020-03-27 19:08:39 +01:00
Laurent Destailleur
b33552fb6f Fix phpcs 2020-03-27 16:13:53 +01:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Laurent Destailleur
f512e0d161 Fix popup 2020-03-27 12:06:58 +01:00
Laurent Destailleur
975f061b43 Fix popup 2020-03-27 12:06:18 +01:00
Laurent Destailleur
3a9cc532d7 FIX Use getNomURL instead of hard coded link. Fix limit. 2020-03-27 11:56:59 +01:00
Laurent Destailleur
259f23e96b Look and feel v11 2020-03-27 11:56:45 +01:00
Laurent Destailleur
4f83eb59cd FIX Use getNomURL instead of hard coded link. Fix limit. 2020-03-27 11:55:33 +01:00
Laurent Destailleur
fd3d13cfcf Look and feel v11 2020-03-27 11:15:38 +01:00
atm-quentin
96481c3d52 FIX ordered stock already in $stock 2020-03-27 09:43:59 +01:00
Laurent Destailleur
354cb8c1b0 Work on Kanban view for modules 2020-03-27 01:59:17 +01:00
Laurent Destailleur
9379f6fa9d Fix duplicate tooltip 2020-03-26 20:27:49 +01:00