2
0
forked from Wavyzz/dolibarr
Commit Graph

1881 Commits

Author SHA1 Message Date
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
98f4f0b1c9 Merge 2021-10-25 11:52:24 +02:00
Laurent Destailleur
f2cd7a7a56 Removed the div class="ficheaddleft" 2021-10-24 00:37:37 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Frédéric FRANCE
46c4f28478 fix multiple warnings 2021-10-22 22:15:59 +02:00
Laurent Destailleur
12d211815b Debug v15 2021-10-19 21:38:36 +02:00
Laurent Destailleur
c40a73162e Look and feel v15 2021-10-18 21:20:58 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
f8010dfcbc Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/reception/list.php
	htdocs/takepos/pay.php
2021-10-16 13:01:03 +02:00
Laurent Destailleur
4e9c7c9efb FIX Attachment of pdf into shipment when sending email 2021-10-11 20:04:45 +02:00
Florian HENRY
677002e834 fix travis 2021-10-07 20:20:29 +02:00
Laurent Destailleur
520a4f55f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
2021-10-06 18:34:03 +02:00
Laurent Destailleur
cb84eef6dc Update shipment.php 2021-10-06 16:13:02 +02:00
Laurent Destailleur
4208964153 Merge branch 'develop' into patch-10 2021-10-06 16:09:54 +02:00
Laurent Destailleur
fa57191702 Fix regressions 2021-09-27 20:09:43 +02:00
Laurent Destailleur
d4cc60640b Clean code 2021-09-27 15:41:58 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
d38c3028eb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
2021-09-23 02:41:53 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
2021-09-20 17:15:12 +02:00
ksar
131677a5ea FIX #18735
File preview is not working
2021-09-20 11:50:10 +02:00
Laurent Destailleur
6af9f3b142 Fix css 2021-09-19 21:18:30 +02:00
Laurent Destailleur
3dc3214047 CSS 2021-09-19 21:13:27 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
0749d01c5a Fix add action delete* as sensitive action 2021-09-18 22:04:41 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
62b721a904 Add deletecontact as sentitive action
Replace dol_buildpath with DOL_URL_ROOT
2021-09-18 19:34:46 +02:00
Laurent Destailleur
8909702619 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/bom/class/bom.class.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/eventorganization.lang
	htdocs/product/class/productfournisseurprice.class.php
2021-09-16 13:40:05 +02:00
Laurent Destailleur
5b07be0179 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/holiday/list.php
2021-09-16 13:33:49 +02:00
Laurent Destailleur
724badb522 Fix deletion of shipment when there is batch record 2021-09-15 13:29:19 +02:00
Laurent Destailleur
11b6259130 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/langs/en_US/admin.lang
2021-09-10 11:40:45 +02:00
lainwir3d
63abe2f1ff FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary. 2021-09-09 19:56:28 +04:00
Laurent Destailleur
ee066ad725 Cast sql var 2021-09-03 21:25:43 +02:00
Frédéric FRANCE
18d61574d3 fix tooltip info 2021-09-02 12:40:05 +02:00
Laurent Destailleur
e71ff148ba Fix phpcs 2021-08-28 18:42:26 +02:00
Laurent Destailleur
fb8723d884 Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
replace remaining SubmitCancel buttons
2021-08-28 18:39:06 +02:00
Laurent Destailleur
c1d3ddf10b Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-28 18:31:06 +02:00
Laurent Destailleur
bb94ea7334 Fix debug car reception: Fill/reset link, colspan, translation 2021-08-28 17:24:05 +02:00
stickler-ci
e60cf96c8e Fixing style errors. 2021-08-28 14:35:01 +00:00
Laurent Destailleur
31ca781236 Update card.php 2021-08-28 16:34:38 +02:00
stickler-ci
2ddebc123a Fixing style errors. 2021-08-28 14:32:44 +00:00
Laurent Destailleur
faf1d52d91 Update card.php 2021-08-28 16:32:22 +02:00
stickler-ci
74ed754fcc Fixing style errors. 2021-08-28 07:22:25 +00:00
henrynopo
c219b8f576 Update card.php 2021-08-28 15:19:45 +08:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Laurent Destailleur
3b6559b1a6 Clean code by adding cast int. 2021-08-27 18:53:45 +02:00
Laurent Destailleur
2f225ee7e5 Clean code by adding cast int. 2021-08-27 16:33:03 +02:00
henrynopo
2c7a788678 Update shipment.php 2021-08-27 11:09:10 +08:00
henrynopo
a0c9cf2d8d Update card.php 2021-08-26 12:31:20 +08:00