Commit Graph

5459 Commits

Author SHA1 Message Date
Laurent Destailleur
a23bae6c96 Work to mke the page perf.php public by default. 2019-07-18 11:10:09 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
42576eb27a Fix status of email templates not visible for non admin users 2019-07-05 17:22:13 +02:00
Laurent Destailleur
5c6684bb73 Fix setup of ticket module 2019-07-05 11:53:33 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
2019-07-04 12:26:17 +02:00
John Botella
a75a2ae8e4 Fix missing hidden input and short label 2019-07-02 15:44:42 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
a7bd734ece Rename ->produit into ->product. Still permissions to rename. 2019-06-24 21:18:49 +02:00
Laurent Destailleur
2e5b4ee4e7 Fix phpcs 2019-06-23 19:32:29 +02:00
Laurent Destailleur
76f394cc43 Fix phpcs 2019-06-22 18:58:14 +02:00
Laurent Destailleur
eb20df8e64 Fix debug save of state into setup 2019-06-22 14:47:46 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00
Laurent Destailleur
ee8ddb5744 Fix link to fix table charset 2019-06-22 13:23:00 +02:00
Laurent Destailleur
9644b9c669
Merge pull request #10932 from tony13tv/patch-6
[CHANGE] Make State available in .odt templates...
2019-06-22 11:26:32 +02:00
Laurent Destailleur
e9a8eb19bb
Update company.php 2019-06-22 11:24:21 +02:00
Laurent Destailleur
3afa4175db
Update company.php 2019-06-22 11:22:04 +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
afb6362317 Fix look and feel v10
Fix link to direct debit payment order
2019-06-20 13:37:06 +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
7afcdb46eb Debug module ticket 2019-06-19 12:10:05 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
a7ca177100 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-14 13:58:19 +02:00
Laurent Destailleur
239e41f6c4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-14 13:57:49 +02:00
Laurent Destailleur
e6b6246fea
Merge pull request #11334 from atm-florianm/8.0_FIX-print-dictionaries-escape
FIX: in edit mode, dictionary inputs do not escape the string inside …
2019-06-14 13:36:06 +02:00
atm-florian.m
787e1319b9 FIX: in edit mode, dictionary inputs do not escape the string inside the 'value' attribute, causing errors if there are any double quotes 2019-06-13 16:21:07 +02:00
Laurent Destailleur
bf6f9dd7ea Fix phpcs 2019-06-12 13:58:48 +02:00
Laurent Destailleur
27a5f1172b
Merge pull request #11322 from aspangaro/10.0_b3
FIX Define company opening hours information
2019-06-12 12:12:02 +02:00
Laurent Destailleur
5554bd231f
Update openinghours.php 2019-06-12 12:11:06 +02:00
Laurent Destailleur
6d5637c389 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/multicurrency.php
	htdocs/core/actions_massactions.inc.php
2019-06-12 12:03:46 +02:00
Laurent Destailleur
2d52537106 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-06-12 10:07:08 +02:00
Alexandre SPANGARO
293048f9fb NEW Define company opening hours information 2019-06-11 22:10:28 +02:00
florian HENRY
beb2a0131c fix travis 2019-06-06 16:11:12 +02:00
Maxime Kohlhaas
9c7c1ddceb Fix multicurrency setup page 2019-06-06 11:20:10 +02:00
florian HENRY
d98ce172ad multicurrency:fix display error message on failed update 2019-06-05 17:26:37 +02:00
Laurent Destailleur
0c331602e8 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-06-04 20:03:51 +02:00
Laurent Destailleur
ab77051317 Fix time delay for purge 2019-06-04 20:03:27 +02:00
Laurent Destailleur
fd50e68f9a Fix look and feel v10 2019-06-04 02:15:52 +02:00
Lionel VESSILLER
439eafb637 NEW add extrafields in warehouses
- create table
- admin extrafields
- object fecth, insert, update and delete extrafields
- card and list
2019-06-03 15:44:17 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
18f1952e2d Fix set of properties 2019-05-22 14:49:18 +02:00
Laurent Destailleur
5707aff7c4 Look and feel v10 2019-05-21 21:52:04 +02:00
Laurent Destailleur
0415edb8cd Fix phpcs 2019-05-21 16:17:32 +02:00
Laurent Destailleur
657bd5c2fe Move module from develop to experimental 2019-05-21 15:50:16 +02:00
Laurent Destailleur
e463b17c15 Fix look and feel v10 2019-05-21 15:31:56 +02:00
Laurent Destailleur
42f5ebed2d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/external_rss.php
	htdocs/admin/system/database-tables.php
	htdocs/admin/tools/export_files.php
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/functions.lib.php
2019-05-21 15:13:25 +02:00
Laurent Destailleur
61ead06950 Fix Injection 2019-05-21 14:35:05 +02:00
Laurent Destailleur
479f8616e1 Fix sanitize data 2019-05-21 14:03:28 +02:00
Laurent Destailleur
ae3605d82d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/pdf.php
	htdocs/core/class/extrafields.class.php
2019-05-20 15:47:06 +02:00