Commit Graph

88624 Commits

Author SHA1 Message Date
Frédéric FRANCE
86e220dd40
Update ActionCommTest.php 2020-05-20 23:00:52 +02:00
Frédéric FRANCE
358054908f
Update AccountingAccountTest.php 2020-05-20 22:59:23 +02:00
Laurent Destailleur
d66f54d06d Clean home page 2020-05-20 22:45:43 +02:00
Frédéric FRANCE
e7714acc77
Update paymentloan.class.php
same picto in loan
2020-05-20 20:19:00 +02:00
Frédéric FRANCE
16cc946608
Update datapolicycron.class.php 2020-05-20 20:13:42 +02:00
Laurent Destailleur
954d928467 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 20:11:13 +02:00
Laurent Destailleur
cce72ad8d6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/tpl/objectline_title.tpl.php
	htdocs/langs/en_US/bills.lang
	htdocs/projet/class/project.class.php
2020-05-20 20:10:48 +02:00
Laurent Destailleur
6f52c62f2a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/bills.lang
2020-05-20 19:53:28 +02:00
Laurent Destailleur
434341316b suggest some fix to debug situation invoices 2020-05-20 19:51:04 +02:00
Frédéric FRANCE
365f85dcea
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-20 18:28:55 +02:00
Anthony Berton
aa275f2a79
Delete html.form.class.php 2020-05-20 14:58:01 +02:00
Anthony Berton
f32767239b Merge branch 'PRODUCT_PRICE_BASE_TYPE' of https://github.com/bb2a/dolibarr into PRODUCT_PRICE_BASE_TYPE 2020-05-20 14:50:45 +02:00
Anthony Berton
15805562d1 Update html.form.class.php 2020-05-20 14:50:40 +02:00
altairis
55def0248c fix missing rollbacks 2020-05-20 14:37:35 +02:00
Laurent Destailleur
3b7f3cf76a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 13:20:12 +02:00
Laurent Destailleur
00f189c921 Introduce button to allow migration of files from old version at once 2020-05-20 13:19:32 +02:00
Laurent Destailleur
88c939562e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 12:39:01 +02:00
Laurent Destailleur
66df82f9e0 Better management of absolute url for canonical link tag 2020-05-20 12:38:38 +02:00
Laurent Destailleur
2f7786f50f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 10:37:43 +02:00
Laurent Destailleur
51ed77fbf7 Fix 2020-05-20 09:59:01 +02:00
Laurent Destailleur
c5e341883d Fix popup of supplier invoice 2020-05-19 23:22:40 +02:00
Laurent Destailleur
18ec65b4af Fix: action on an ID must not include test on entity. 2020-05-19 22:06:17 +02:00
Laurent Destailleur
2ba9d7f288 Fix translation 2020-05-19 21:38:42 +02:00
Frédéric FRANCE
cd240efadf
Update entrepot.class.php 2020-05-19 21:28:47 +02:00
stickler-ci
0ac82797e7 Fixing style errors. 2020-05-19 19:14:20 +00:00
Frédéric FRANCE
f2ac1992cd
Merge branch 'develop' into entrepotlibelle 2020-05-19 21:13:33 +02:00
Frédéric FRANCE
fd7a5473a7
Merge remote-tracking branch 'upstream/develop' into free_email 2020-05-19 21:08:15 +02:00
Laurent Destailleur
346082b153 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-19 19:59:24 +02:00
Laurent Destailleur
00d7947ee8 Fix link replaced twice 2020-05-19 19:55:28 +02:00
atm-lena
bf9756b8c4 Add Hook "Massstockmove" 2020-05-19 16:05:13 +02:00
altairis
80c56b3017 manage stock on edit and delete dispatched lines 2020-05-19 15:59:03 +02:00
atm-lena
e042807b32 Add $this to parameters 2020-05-19 15:58:16 +02:00
gauthier
f3582d891a FIX : We must only rename current bank receipt 2020-05-19 15:35:37 +02:00
atm-lena
3f28c9a461 Add parameters to hook 2020-05-19 15:31:37 +02:00
atm-lena
987fb806c6 Exclude array param 2020-05-19 15:24:53 +02:00
Anthony Berton
702627155c
Merge branch 'develop' into PRODUCT_PRICE_BASE_TYPE 2020-05-19 15:20:18 +02:00
atm-lena
f518bafda9 11.0 - Add Hook "SelectWarehouses" 2020-05-19 15:17:06 +02:00
altairis
b79a30c0f9 edit and delete dispatched lines 2020-05-19 14:18:06 +02:00
atm-quentin
d61cef28d7 NEW conf to allow show full arbo in getnomurl 2020-05-19 11:16:04 +02:00
altairis
24ff047ad7 add tracking number 2020-05-19 10:34:55 +02:00
altairis
cbc567b920 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2020-05-19 10:27:27 +02:00
atm-quentin
e39774a508 add more hook param 2020-05-19 10:05:26 +02:00
atm-quentin
f073b7023a FIX missing GetNomURL Hook in warehouse class 2020-05-19 09:52:33 +02:00
Alexandre SPANGARO
1f46c57c0b NEW Add employee in expense report binding page 2020-05-19 09:36:07 +02:00
stickler-ci
f0bb7d233f Fixing style errors. 2020-05-19 06:29:23 +00:00
Tobias Sekan
0cba74277a
Update agenda.lang 2020-05-19 08:19:14 +02:00
Tobias Sekan
7fd6151c43
Add massactions for event list 2020-05-19 08:18:38 +02:00
Tobias Sekan
223224d12c
Add function to update the event percent + const 2020-05-19 08:07:21 +02:00
Tobias Sekan
cb9cbfb922
Merge pull request #24 from Dolibarr/develop
pull from develop
2020-05-19 07:59:08 +02:00
Laurent Destailleur
2d0abebca3 CSS 2020-05-19 04:40:08 +02:00