Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
96,756 Commits 36 Branches 189 Tags
49faedae6fef9775b889a063921ee252aa06ffad
Commit Graph

2761 Commits

Author SHA1 Message Date
Laurent Destailleur
d8aa5f5eab Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-03-20 12:43:07 +01:00
Laurent Destailleur
3d3a7bfd37 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/element.php
	htdocs/projet/tasks.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/note.php
	htdocs/projet/tasks/task.php
	htdocs/projet/tasks/time.php
 2021-03-20 12:42:46 +01:00
Laurent Destailleur
7f6044c52e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/projet/card.php
	htdocs/projet/contact.php
	htdocs/projet/tasks/comment.php
	htdocs/projet/tasks/contact.php
	htdocs/projet/tasks/document.php
	htdocs/projet/tasks/task.php
 2021-03-20 12:18:40 +01:00
Frédéric FRANCE
bae1770176 uniformise comments to remove nested comments 2021-03-20 10:00:24 +01:00
Robin
26dc897042 Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0 
htdocs/projet/card.php
 2021-03-19 11:12:49 +01:00
Robin
d852816101 FIX: fix checkbox displayed according to module project setup parameters 2021-03-19 09:54:11 +01:00
Frédéric FRANCE
e7ad9f1290 fix project replace projet 2021-03-18 20:55:47 +01:00
Frédéric FRANCE
c43d3dff92 fix project replace projet 2021-03-18 20:51:40 +01:00
Robin
b3757a6f69 FIX: fix checkbox displayed according to module project setup parameters - work in progress 2021-03-18 11:07:48 +01:00
Frédéric FRANCE
a420d0acbd fix php8 warnings 2021-03-17 18:40:11 +01:00
Frédéric FRANCE
efaa2be3b8 fix php8 warnings 2021-03-17 18:38:24 +01:00
Laurent Destailleur
e366d2c379 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/export_files.php
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/cron/list.php
	htdocs/filefunc.inc.php
	test/phpunit/FilesLibTest.php
 2021-03-16 14:57:04 +01:00
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
 2021-03-16 14:50:06 +01:00
Laurent Destailleur
87ab711a0f Merge pull request #16707 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-16 10:34:55 +01:00
Laurent Destailleur
c84395281e Merge pull request #16716 from frederic34/patch-13 
fix php8 warning
 2021-03-16 10:30:54 +01:00
Alexandre SPANGARO
f8703a0691 Translation "Generated documents" 2021-03-16 04:04:33 +01:00
Alexandre SPANGARO
4fd24c6855 Translation "Generated documents" 2021-03-16 04:04:18 +01:00
Frédéric FRANCE
89219fe7fa fix php8 warning 2021-03-15 21:13:15 +01:00
Florian HENRY
177a6bfe4f conference or booth card and list ok 2021-03-15 20:20:53 +01:00
Florian HENRY
17c49e6ce9 ongoinf card and list 2021-03-15 18:06:23 +01:00
Laurent Destailleur
8d3ed71f5f Merge pull request #16682 from frederic34/patch-3 
fix php8 warning
 2021-03-15 13:28:50 +01:00
Laurent Destailleur
7d1e18f5ab Merge pull request #16625 from FHenry/dev_EventOrganisation 
new: working on conference or booth object and event type #FoundationFunding
 2021-03-15 11:37:57 +01:00
Frédéric FRANCE
cc25fb727b fix php8 warning 2021-03-15 11:25:23 +01:00
Laurent Destailleur
cbaaff799b Merge pull request #16643 from dolibit-ut/patch-72 
Update card.php
 2021-03-15 11:14:26 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
12f50a76d7 Fix yogosha #5627 2021-03-14 11:48:39 +01:00
UT from dolibit
83c6e5f8e7 Update card.php 
at $help_url  add  DE:Modul_Projekte
 2021-03-13 15:19:09 +01:00
Frédéric FRANCE
815a7683a2 force getnextref if project create fail 2021-03-12 16:48:43 +01:00
Florian HENRY
862926316a working on list 2021-03-11 19:09:42 +01:00
Florian HENRY
3af4f3fbca Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation_draft 2021-03-11 16:59:08 +01:00
Laurent Destailleur
8babacfe55 Look and feel v14 2021-03-09 19:10:41 +01:00
Laurent Destailleur
d56890de17 Fix phpcs 2021-03-04 17:24:58 +01:00
Laurent Destailleur
7d20df8054 Merge pull request #16177 from atm-gauthier/NEW/add_real_payments_on_salaries 
NEW Salary payment request and Salary payment are 2 different steps in workflow on Salary payment recording
 2021-03-04 16:53:54 +01:00
Laurent Destailleur
87da30d2d9 Update tasks.php 2021-03-04 16:50:39 +01:00
lmarcouiller
e94f703f5d Fix #16523 : return to backward compatibility 2021-03-04 10:33:18 +01:00
lmarcouiller
500f192a05 Fix #16523 : New column Contact assigned 2021-03-04 10:15:41 +01:00
Florian HENRY
de4a76a266 ongoung 2021-03-03 22:00:23 +01:00
Gauthier PC portable 024
6da28f5e44 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-03-01 11:12:03 +01:00
Frédéric FRANCE
a82df7e6ea code syntax project 2021-02-26 18:49:22 +01:00
Gauthier PC portable 024
e598b49545 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 15:33:36 +01:00
Frédéric FRANCE
cb1e36de9c really fix typo 2021-02-26 12:58:41 +01:00
Laurent Destailleur
5ac6fa1ed6 Merge pull request #16400 from frederic34/patch-2 
fix typo
 2021-02-26 12:56:30 +01:00
Gauthier PC portable 024
c996871f98 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-26 11:50:18 +01:00
Laurent Destailleur
ebb4f03788 Prepare public page for autocreate contact-lead 2021-02-24 12:19:28 +01:00
Gauthier PC portable 024
c0160a5f3b Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-23 15:20:15 +01:00
Frédéric FRANCE
00f10d1850 fix typo 2021-02-23 13:33:27 +01:00
Florian HENRY
f800e86e61 Merge branch 'dev_EventOrganisation_draft' of github.com:FHenry/dolibarr into dev_EventOrganisation_draft 2021-02-22 21:01:22 +01:00
Florian HENRY
c9a51d971d rename column 2021-02-22 21:00:54 +01:00
Gauthier PC portable 024
939d406ab1 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/add_real_payments_on_salaries 2021-02-22 09:10:24 +01:00
stickler-ci
565fb392b4 Fixing style errors. 2021-02-21 11:36:58 +00:00