lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
87,108 Commits 43 Branches 150 Tags 886 MiB
81fbb80823
Commit Graph

264 Commits

Author SHA1 Message Date
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Laurent Destailleur
22a14e7bf7 Fix closig tag 2019-10-22 15:40:29 +02:00
Laurent Destailleur
e261d63295 NEW Can add a button "Create" after combo of object with modulebuilder. 2019-10-21 14:44:39 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
f85899742b
Merge pull request #12153 from frederic34/Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
 2019-10-17 17:48:42 +02:00
Laurent Destailleur
5a5f4c3d72 Look and feel v11 2019-10-17 16:59:26 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
b60ddc255c Removed useless html tags 2019-10-16 14:17:53 +02:00
Laurent Destailleur
e1521b6c7d Fix phpcs 2019-10-16 12:31:44 +02:00
Laurent Destailleur
517fcf45d1 Look and feel v11 2019-10-16 11:23:06 +02:00
Frédéric FRANCE
d1d9b1ed85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-15 09:39:57 +02:00
Frédéric FRANCE
2d3a6d2108
Update card.php 2019-10-13 06:05:21 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
Laurent Destailleur
3acf7211c3
Merge pull request #11847 from ptibogxiv/patch-257 
NEW: Option to allow to create members from third-party
 2019-10-08 15:08:34 +02:00
Laurent Destailleur
eba3d96293
Update card.php 
NEW Add option MEMBER_CAN_CONVERT_CUSTOMERS_TO_MEMBERS
 2019-10-07 20:36:48 +02:00
Frédéric FRANCE
ec8569dd85
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-06 15:56:21 +02:00
Laurent Destailleur
866dcf18fe Look and feel v11 2019-10-06 15:34:22 +02:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 18:59:18 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Laurent Destailleur
ba7a288abb Fix colspan and columns of contact of thirdparties 2019-10-01 23:28:13 +02:00
Frédéric FRANCE
aca9d92db8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-01 22:03:33 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Frédéric FRANCE
b87610adcc
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-09-30 19:34:35 +02:00
Laurent Destailleur
df1a23ed76 Code comment 2019-09-30 13:04:01 +02:00
Frédéric FRANCE
6c8dc75c96
socialnetworks for thirdparties 2019-09-29 11:20:23 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
stickler-ci
2e63e7bc27 Fixing style errors. 2019-09-08 18:17:51 +00:00
ptibogxiv
e37875f70a
Update card.php 2019-09-08 20:16:05 +02:00
ptibogxiv
1368236d29
Update card.php 2019-09-08 20:15:05 +02:00
Laurent Destailleur
ddae5315f1 Updat fontawesome to 5.10.2 2019-09-02 16:13:11 +02:00
Laurent Destailleur
34f78c555d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-30 20:55:35 +02:00
Laurent Destailleur
db69a07bc4 FIX Option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION 2019-07-30 15:21:26 +02:00
Laurent Destailleur
d6d1b29257 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-21 16:15:32 +02:00
Laurent Destailleur
904e399293 Fix wrong nb of parmaeters 2019-07-20 16:25:57 +02:00
Laurent Destailleur
f368ef377b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/class/societe.class.php
 2019-07-20 16:02:15 +02:00
Laurent Destailleur
6bc38acb56 Fix assignation 2019-07-20 16:01:28 +02:00
Laurent Destailleur
2e68488231 Enhance scan using phpstan 2019-07-20 15:53:46 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
3cffd70ed3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/prelevement/create.php
	htdocs/core/class/commonobject.class.php
	htdocs/expedition/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/commande/dispatch.php
	htdocs/fourn/product/list.php
	htdocs/opensurvey/index.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
 2019-07-18 18:09:37 +02:00
John Botella
70ff806fdf fix fourn code preload 2019-07-16 10:46:58 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
8330078de1 Fix default value 2019-06-17 12:33:09 +02:00
Laurent Destailleur
2218994958 FIX Duplicate encoding on error message 2019-05-29 09:51:45 +02:00
Laurent Destailleur
2b90df6f80 Fix responsive 2019-05-22 16:08:21 +02:00
Laurent Destailleur
0bd47a3f50 Fix responsive 2019-05-22 15:58:44 +02:00
Laurent Destailleur
22e897b1a1 Clean and prepare code to fix a SQL injection 2019-05-21 17:22:38 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button 
NEW : look and feel title button
 2019-05-18 16:04:47 +02:00
Norbert Penel / OSCSS
5ddf16685f fix missing traduction on societe 
a translation key was missing
 2019-05-18 00:25:46 +02:00
Laurent Destailleur
7d2d12348c Fix popup 2019-05-10 14:27:48 +02:00
Laurent Destailleur
0e7be8365c Fix size of box 2019-05-10 14:22:07 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
Laurent Destailleur
ba9cceeee5 Fix phpcs 2019-04-05 19:42:56 +02:00
Laurent Destailleur
21b9836508 FIX default value of language of thirdparty 
Conflicts:
	htdocs/societe/card.php
 2019-04-04 11:08:13 +02:00
Laurent Destailleur
3fb97de996 Fix default value of language of thirdparty 2019-04-04 11:05:15 +02:00
Laurent Destailleur
c148157566 Remove duplicate translation keys 2019-03-24 23:29:22 +01:00
Laurent Destailleur
dabccb7967 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/fourn/facture/paiement.php
 2019-03-16 20:12:53 +01:00
Laurent Destailleur
8adc333823 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-16 19:41:50 +01:00
Maxime Kohlhaas
68945c7d51 Fix #10177 2019-03-16 09:11:43 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00
Frédéric FRANCE
8b090c165e
replace html code by html5 in societe 2019-02-23 21:18:44 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
florian HENRY
f0f0b69d87 add comment 2019-02-06 10:59:24 +01:00
florian HENRY
3f6187fe12 remove useless parameters 2019-02-06 10:58:40 +01:00
florian HENRY
3f20cae6d3 NEW: setup default thridparty type (customer or prospect/customer) 2019-02-06 10:54:11 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Philippe GRAND
73606c85b3 update with html5 compliant code 2019-01-21 10:08:20 +01:00
Laurent Destailleur
5d0ff28556 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/societe/card.php
 2019-01-08 01:56:03 +01:00
Laurent Destailleur
d2f6899346 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
	htdocs/admin/defaultvalues.php
	htdocs/societe/card.php
 2019-01-08 01:53:00 +01:00
Laurent Destailleur
087a4400b0 FIX Default value on sales representative on third party creation 2019-01-08 01:05:42 +01:00
Laurent Destailleur
4a4bf3273b Experiment disabling of creation of contact+thirdparty with hidden 
option THIRDPARTY_SUGGEST_ALSO_ADDRESS_CREATION
 2018-12-16 13:22:38 +01:00
Laurent Destailleur
2011afe6fb
Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
611ccc4a9a
Merge branch 'develop' into fieldlabel 2018-12-14 15:42:01 +01:00
Laurent Destailleur
7c22504252 Fix position of field must be ssame between create/edit/view 2018-11-27 09:22:59 +01:00
Laurent Destailleur
a2c9fefee0 Fix do not show tool to check european vat if country is not in EEC 2018-11-17 00:40:39 +01:00
Frédéric FRANCE
12dcda7e02
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-15 22:01:36 +01:00
Frédéric FRANCE
731d19a29b
add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00
Frédéric FRANCE
09efde4901
Merge remote-tracking branch 'upstream/develop' into fieldlabel 2018-11-09 18:13:59 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
c5231112c5 Fix regression with old canvas 2018-11-07 12:22:12 +01:00
Frédéric FRANCE
c92a2084f1
remove fieldlabel and add fieldeditkey 2018-10-27 14:50:27 +02:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
9c7ec434b7
remove fieldlabel and add fieldeditkey 2018-10-27 13:48:30 +02:00
Laurent Destailleur
461bd76f70 Fix customer and supplier code name 
Fix bill time flag must be visible only if option on
 2018-10-26 23:27:29 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
53b099858f FIX cutomer or supplier categories visible or not when required 2018-10-12 12:04:04 +02:00
Laurent Destailleur
98b1e13ed7 Work on module socialnetworks 2018-09-26 16:55:46 +02:00
Laurent Destailleur
436deea4c5 Code comment 2018-09-24 10:26:49 +02:00
Laurent Destailleur
ad6895aa2e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-24 10:23:09 +02:00
Ferran Marcet
d6d58b1f68 FIX #9432 2018-09-21 10:18:54 +02:00
Ferran Marcet
1a7b38f22a FIX #9432 2018-09-21 10:14:23 +02:00
Ferran Marcet
4597cd44e5 FIX #9432 2018-09-20 17:52:44 +02:00
Laurent Destailleur
d35687c8b3 Work on module social network 2018-09-19 01:45:56 +02:00
Laurent Destailleur
f5074f4962 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 18:12:17 +02:00
Laurent Destailleur
50478b1bd4 FIX capital must be empty and not 0 if undefined 2018-09-12 15:21:11 +02:00