Commit Graph

89109 Commits

Author SHA1 Message Date
Frédéric FRANCE
4be4f975b0
add new rule 2020-05-21 01:03:03 +02:00
Frédéric FRANCE
ccadb1ec7a
add new rule 2020-05-21 00:47:16 +02:00
Frédéric FRANCE
43dcd9beb5
add new rule 2020-05-21 00:02:33 +02:00
Laurent Destailleur
15f3c97fff Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:59:11 +02:00
Laurent Destailleur
86de0d5e14 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/projet/class/project.class.php
2020-05-20 23:58:32 +02:00
Laurent Destailleur
9e3e8df60f Fix phpcs 2020-05-20 23:56:06 +02:00
Laurent Destailleur
a78bc86465 Trans 2020-05-20 23:51:46 +02:00
Laurent Destailleur
036617570e Doc 2020-05-20 23:46:48 +02:00
Laurent Destailleur
662970f232 Clean sql file 2020-05-20 23:42:28 +02:00
Laurent Destailleur
92cbff7749 Clean code 2020-05-20 23:40:04 +02:00
Laurent Destailleur
64ebc665c7 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:32:59 +02:00
Laurent Destailleur
de11fb2783 Fix phpcs 2020-05-20 23:32:13 +02:00
Laurent Destailleur
482da404f0 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:30:02 +02:00
Laurent Destailleur
7d6cf4c01a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/projet/class/project.class.php
2020-05-20 23:27:45 +02:00
Laurent Destailleur
650bddde0d Fix phpcs 2020-05-20 23:25:10 +02:00
Laurent Destailleur
e1e5d12524 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-20 23:23:17 +02:00
Laurent Destailleur
e42fb1b57d Fix trigger name 2020-05-20 23:15:56 +02:00
Laurent Destailleur
c4d1db263c Fix end of workflow of MO 2020-05-20 23:15:18 +02:00
Frédéric FRANCE
3ea613896e
Update CommandeTest.php 2020-05-20 23:04:38 +02:00
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