lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,950 Commits 43 Branches 150 Tags 886 MiB
0cd0ed3d8a
Commit Graph

1179 Commits

Author SHA1 Message Date
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
f893854986 Fix remove warnings 2019-09-05 14:24:13 +02:00
Laurent Destailleur
3f121f07cc Removed deprecated properties 2019-09-05 13:38:38 +02:00
Laurent Destailleur
621dd83a7f Fix bad link 2019-09-02 04:38:36 +02:00
Laurent Destailleur
ac7d0b5eb6 Fix scrutinizer 2019-09-02 04:12:48 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Laurent Destailleur
d08ed9fbcf FIX column jabberid missing 2019-08-26 16:19:39 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
 2019-08-15 23:39:02 +02:00
Laurent Destailleur
64e52789d6 FIX #11591 FIX #11592 2019-08-15 20:39:47 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Regis Houssin
2c29f041a0 FIX move sql request in INNER JOIN 2019-07-25 18:28:52 +02:00
Regis Houssin
5a82b2bc34 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 10.0_ldap 2019-07-25 18:17:01 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/project.lib.php
 2019-07-25 17:54:14 +02:00
ptibogxiv
c219b62b10
Update contact.class.php 2019-07-24 13:23:24 +02:00
ptibogxiv
ba60e99b45
Update card.php 2019-07-24 13:22:41 +02:00
Regis Houssin
f45175cc9b FIX missing filter by current contact 2019-07-24 09:28:11 +02:00
ptibogxiv
f959341aa8
Update card.php 2019-07-23 14:30:12 +02:00
ptibogxiv
57db12ccdb
Update card.php 2019-07-23 14:10:13 +02:00
ptibogxiv
cc10f5e684
Update card.php 2019-07-23 14:06:51 +02:00
ptibogxiv
46d0137d30
FIx display civility in contact card 2019-07-23 14:04:54 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Regis Houssin
4dab57b494 FIX phpcs 2019-07-13 11:24:25 +02:00
Regis Houssin
b7df4a2cd0 FIX this function can not be private 2019-07-13 11:21:07 +02:00
Laurent Destailleur
bf71731fc9 Fix phpcs 2019-06-19 22:28:33 +02:00
Nicolas ZABOURI
b6bd4119d9 FIX travis Public underscore in load_ldap_info 2019-06-19 09:12:01 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
 2019-06-02 11:49:33 +02:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2 
dol_print_object_info return void
 2019-05-21 22:38:39 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Frédéric FRANCE
c8027ccf1a
Update agenda.php 2019-05-19 09:15:10 +02:00
florian HENRY
0787eee9b8 fix :email collector for event creation 2019-05-18 18:42:46 +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
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
Sof
2154b4a654
FIX : Typo 
$seearch_cti = $search_cti
 2019-04-28 12:09:59 +02:00
atm-quentin
2bc93b9748 NEW public note and private note in contact list sall 2019-04-16 16:19:36 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
84050c888f Fix set of civility label 2019-04-11 18:04:18 +02:00
Laurent Destailleur
9337e48072
Merge branch 'develop' into patch-147 2019-04-11 17:54:29 +02:00
ptibogxiv
42b1ab10d1
Update contact.class.php 2019-04-11 17:04:40 +02:00
ptibogxiv
1f017d4d06
Update contact.class.php 2019-04-11 17:03:07 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
ptibogxiv
013b8a61ec
ADD cilivity label in fetch contact / API 2019-03-29 12:11:50 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Frédéric FRANCE
49cbaed569
Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 14:21:15 +01:00