Commit Graph

85634 Commits

Author SHA1 Message Date
Laurent Destailleur
0a3d570583 Look and feel v12 2020-04-19 14:29:18 +02:00
Laurent Destailleur
d3598380da Fix do not use hard coded link 2020-04-19 14:23:31 +02:00
Laurent Destailleur
200c29bd14 Fix some regression with new architecture for groups 2020-04-19 14:19:34 +02:00
Laurent Destailleur
01f96b35ed Fix reposition 2020-04-18 16:50:36 +02:00
Laurent Destailleur
19815850c0 Look and feel v12
Fix error report
2020-04-18 16:48:49 +02:00
Laurent Destailleur
ae80b09327 Merge pull request #13598 from atm-maxime/new_fields_on_group
New : refactor UserGroup module with new common way
2020-04-18 16:26:58 +02:00
Laurent Destailleur
018cfdf54b FIX Field balance before and after sometimes not visible in bank entries 2020-04-18 16:14:37 +02:00
Laurent Destailleur
de74c447cc Fix sanitize amount 2020-04-18 16:05:26 +02:00
Laurent Destailleur
16806da9b5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-18 15:49:56 +02:00
Laurent Destailleur
f0f28c83cd Add fk 2020-04-18 15:49:40 +02:00
Laurent Destailleur
f6e77fc0ba Merge pull request #13602 from oscim/patch-37
Update llx_commandedet.key.sql
2020-04-18 15:48:53 +02:00
Laurent Destailleur
e050429854 Update llx_commandedet.key.sql 2020-04-18 15:48:45 +02:00
Laurent Destailleur
2f2e3d5057 Merge pull request #13145 from atm-john/12.0_new_extend_retained_warranty
NEW : Extend retained warranty to be  available for all invoices
2020-04-18 15:32:33 +02:00
Laurent Destailleur
5c18404083 Move to jquery 4.0.13 with fix in reponsive
Restore some files modified by error.
2020-04-18 15:15:35 +02:00
Laurent Destailleur
8f7c3fc867 Fix: restore jselect2 4.0.5 (4.0.6 create troubles in responsive) 2020-04-18 14:39:02 +02:00
Laurent Destailleur
47ff3f866a css 2020-04-18 12:54:28 +02:00
Laurent Destailleur
f23266e560 css 2020-04-18 11:40:26 +02:00
Laurent Destailleur
7c6c600225 CSS 2020-04-18 11:38:24 +02:00
Laurent Destailleur
07ce3fc34d Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop 2020-04-18 11:08:21 +02:00
Laurent Destailleur
0ab8c47988 css 2020-04-18 11:07:57 +02:00
Laurent Destailleur
23876684cb Responsive 2020-04-18 11:06:28 +02:00
Laurent Destailleur
13eb1ca28d Fix link 2020-04-18 04:40:33 +02:00
Laurent Destailleur
910aa464d4 Trans 2020-04-18 00:38:37 +02:00
Laurent Destailleur
b0515c626b Look and feel v12 2020-04-18 00:09:24 +02:00
Laurent Destailleur
ee26390f89 Look and feel v12 2020-04-17 19:15:22 +02:00
Laurent Destailleur
6fd34f592d Fix default value 2020-04-17 19:07:30 +02:00
Laurent Destailleur
965bdf733d FIX Can overwrite file if exists in file manager 2020-04-17 13:10:18 +02:00
Laurent Destailleur
024abe8b58 FIX Preview of svg files into file manager 2020-04-17 12:34:35 +02:00
Laurent Destailleur
162cd94138 FIX Keep sort order after deletion of a file into file manager. 2020-04-17 12:32:05 +02:00
Laurent Destailleur
15e3601336 Fix str_replace 2020-04-17 00:49:22 +02:00
Laurent Destailleur
d4c18c79fb Add option WEBSITE_ADD_CSS_TO_BODY to add a CSS on body tag 2020-04-17 00:42:01 +02:00
ATM john
3b4b30ea57 Fix merge remaining lines 2020-04-16 20:33:53 +02:00
ATM john
c334a931de Merge branch 'develop' of github.com:Dolibarr/dolibarr into 12.0_new_extend_retained_warranty 2020-04-16 20:29:54 +02:00
Laurent Destailleur
619014726e Fix char of account of us 2020-04-16 17:19:18 +02:00
Laurent Destailleur
231c1ba9c1 Merge pull request #13614 from Fred-Zweig/develop
Added basic charts of accounts for USA and Canada.
2020-04-16 16:15:28 +02:00
Laurent Destailleur
7b222ec299 Merge pull request #13639 from aspangaro/12.0_a26
Fix : Accountancy - Error on buy accountancy account suggest
2020-04-16 16:15:07 +02:00
Alexandre SPANGARO
b607c83b8a Fix : Accountancy - Error on buy accountancy account suggest 2020-04-16 16:13:52 +02:00
Laurent Destailleur
d176840bfb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-16 16:02:28 +02:00
Laurent Destailleur
3c29a7b8d8 Fix phpcs 2020-04-16 16:02:06 +02:00
Laurent Destailleur
5254a94038 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/ldap.php
	htdocs/commande/class/commande.class.php
	htdocs/commande/index.php
	htdocs/commande/list.php
	htdocs/compta/facture/list.php
	htdocs/expedition/list.php
	htdocs/fourn/commande/list.php
	htdocs/fourn/facture/list.php
	htdocs/loan/list.php
	htdocs/product/class/product.class.php
	htdocs/supplier_proposal/list.php
2020-04-16 15:58:59 +02:00
Laurent Destailleur
01ec8693f2 Trans 2020-04-16 15:48:05 +02:00
Laurent Destailleur
855ac5467c FIX setup of suggested payment mode on proposals and orders 2020-04-16 15:40:16 +02:00
Laurent Destailleur
26022f062f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-04-16 15:24:23 +02:00
Laurent Destailleur
984fa0d5a0 Fix hidden const 2020-04-16 15:24:12 +02:00
Laurent Destailleur
9eb737d02e Trans 2020-04-16 14:49:27 +02:00
Laurent Destailleur
9c77243d66 Trans 2020-04-16 14:47:23 +02:00
Laurent Destailleur
56996b4aa5 trans 2020-04-16 14:42:08 +02:00
Laurent Destailleur
1d0b532437 Fix css 2020-04-16 14:31:30 +02:00
Laurent Destailleur
803b0eb3bd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-16 12:39:45 +02:00
Laurent Destailleur
dd50083a81 Look and feel v12 2020-04-16 12:39:34 +02:00