Commit Graph

95184 Commits

Author SHA1 Message Date
Frédéric FRANCE
8a69fa0d35
code syntax expensereport directory 2021-02-25 22:45:02 +01:00
Laurent Destailleur
f7c119e48c Fix json decode 2021-02-24 13:02:36 +01:00
Laurent Destailleur
22208b622f WIP Add lead 2021-02-24 12:55:24 +01:00
Laurent Destailleur
ebb4f03788 Prepare public page for autocreate contact-lead 2021-02-24 12:19:28 +01:00
Laurent Destailleur
3a0b762a6e Var not defined 2021-02-24 12:01:58 +01:00
Laurent Destailleur
566a0ba785 Code comment 2021-02-24 11:42:55 +01:00
Laurent Destailleur
4f1f17fedc Fix GETPOST instead of POST 2021-02-24 11:37:20 +01:00
Laurent Destailleur
d4a78bf7c6 Removed useless field 2021-02-24 10:24:54 +01:00
Laurent Destailleur
2642e1d1b3 Code syntax 2021-02-23 15:35:16 +01:00
Laurent Destailleur
0009ce1646 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-23 14:49:23 +01:00
Laurent Destailleur
888c072af0 NEW Can set a percentage when creating an invoice from another object 2021-02-23 14:48:54 +01:00
Laurent Destailleur
822bfc957c
Merge pull request #16368 from FHenry/dev_EventOrganisation_draft
NEW : Tab on project for Event Organization #FoundationFunding
2021-02-23 12:09:00 +01:00
Laurent Destailleur
0a0299c085
Merge pull request #16392 from frederic34/patch-3
css
2021-02-23 12:07:01 +01:00
Laurent Destailleur
7ae50cf2e5
Merge pull request #16390 from frederic34/patch-2
fix propal fetch
2021-02-23 12:05:51 +01:00
Laurent Destailleur
a70a58f7ad
Merge pull request #16391 from frederic34/assetcodesyntax
code syntax
2021-02-23 12:01:10 +01:00
Laurent Destailleur
7d0d51411b
Merge pull request #16394 from daraelmin/daraelmin-patch-3
Fix #16096 missing CSRF token and use post instead get
2021-02-23 11:05:29 +01:00
Frédéric FRANCE
9f6c2f3eaa
css 2021-02-23 00:14:11 +01:00
Frédéric FRANCE
337689d5d2
code syntax 2021-02-22 21:36:42 +01:00
Florian HENRY
fa65956801 Merge branch 'develop' into dev_EventOrganisation_draft 2021-02-22 21:02:22 +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
Frédéric FRANCE
926a88ff51
Update propal.class.php 2021-02-22 21:00:24 +01:00
Frédéric FRANCE
bb276566c6
code syntax 2021-02-22 19:05:32 +01:00
Frédéric FRANCE
5199e3da5b
code syntax 2021-02-22 18:50:45 +01:00
Frédéric FRANCE
95524abd22
code syntax 2021-02-22 18:38:03 +01:00
Frédéric FRANCE
6f93deae40
fix propal fetch 2021-02-22 18:21:12 +01:00
Laurent Destailleur
27d47a855f
Merge pull request #16385 from frederic34/installinc
remove space and code syntax
2021-02-22 17:43:49 +01:00
daraelmin
29b1f10fd4
Fix #16096 #16085 missing CSRF token 2021-02-22 17:33:54 +01:00
Frédéric FRANCE
031d911179
Merge remote-tracking branch 'upstream/develop' into installinc 2021-02-22 16:28:54 +01:00
Laurent Destailleur
9e5e31dec9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:33 +01:00
Laurent Destailleur
f6080d45fa Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 16:21:26 +01:00
Laurent Destailleur
b674ebad88 Responsive 2021-02-22 16:21:05 +01:00
Laurent Destailleur
7fd2ac6618 Fix link to show line in pending account 2021-02-22 16:20:13 +01:00
Laurent Destailleur
912f9f9bdb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/contact/card.php
	htdocs/core/actions_massactions.inc.php
2021-02-22 15:54:24 +01:00
Laurent Destailleur
eee936b91c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-22 15:51:16 +01:00
Laurent Destailleur
c010cab47e Fix translation of default value for contacts 2021-02-22 15:51:00 +01:00
stickler-ci
eac95a1a29 Fixing style errors. 2021-02-22 14:18:47 +00:00
Frédéric FRANCE
858a65a173
code syntax 2021-02-22 15:18:01 +01:00
Frédéric FRANCE
93aa12a573
remove space and code syntax 2021-02-22 14:41:20 +01:00
Laurent Destailleur
7677edf41d
Merge pull request #16357 from bb2a/ADD_SUBSTITUTION_DELIVRY_DATE
Add substitution for delivry date
2021-02-22 14:23:37 +01:00
Laurent Destailleur
2346d8e12d
Merge pull request #16371 from frederic34/patch-2
add log for token reclaimed
2021-02-22 14:22:44 +01:00
Laurent Destailleur
9b6c7ee841
Merge pull request #16384 from frederic34/boxpropale
fix propal sqls
2021-02-22 14:19:37 +01:00
Laurent Destailleur
1c9eac8bd5
Merge pull request #16380 from frederic34/membersubscription
complete doaction hook
2021-02-22 14:18:38 +01:00
Laurent Destailleur
acf067d7f0
Merge pull request #16382 from defrance/patch-164
fix Notice error on install
2021-02-22 14:16:00 +01:00
Laurent Destailleur
40d23c5082
Update inc.php 2021-02-22 14:15:06 +01:00
Frédéric FRANCE
84a5f69834
fix propal sqls 2021-02-22 13:14:13 +01:00
BENKE Charlene
8c95bc399a
fix Notice error on install 2021-02-22 13:12:06 +01:00
Laurent Destailleur
eed2974e9e
Merge pull request #16381 from frederic34/patch-3
fix box activity
2021-02-22 12:44:53 +01:00
Frédéric FRANCE
58f301389c
fix box activity 2021-02-22 12:08:22 +01:00
Laurent Destailleur
122538ca51 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-02-22 11:51:55 +01:00