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

549 Commits

Author SHA1 Message Date
gauthier
4c0de74470 FIX : sort by default role makes no sense 2020-03-24 16:27:53 +01:00
Laurent Destailleur
b18d3e5588 Fix var not defined 2020-03-23 15:58:47 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Alexandre SPANGARO
c05ef16e0b Work on split module fournisseur 2020-03-22 05:51:14 +01:00
Laurent Destailleur
bcf17c79ef FIX closing tags 2020-03-22 02:44:00 +01:00
Alexandre SPANGARO
bac099dc60 Merge remote-tracking branch 'upstream/develop' into 12.0_a23 2020-03-19 11:48:21 +01:00
Laurent Destailleur
a76392f944 Responsive 2020-03-17 21:26:25 +01:00
Alexandre SPANGARO
033f796398 Work on split module fournisseur 2020-03-17 14:51:48 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
80f4e625be Fix phpcs 2020-02-05 17:07:42 +01:00
Laurent Destailleur
1875b6a49b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
 2020-02-05 14:53:47 +01:00
Laurent Destailleur
f8daed7f56
Update company.lib.php 2020-02-05 12:49:56 +01:00
ptibogxiv
94fd2b40c7
new fix Count of Stripe payment mode must take test/live into account 
fix error message for if no stripe enabled 0b891d5e0c
 2020-02-05 12:04:27 +01:00
Laurent Destailleur
0b891d5e0c FIX Count of Stripe payment mode must take test/live into account 2020-02-04 19:33:47 +01:00
Laurent Destailleur
bc19f72306 FIX Count of Stripe payment mode must take test/live into account 2020-02-04 19:33:20 +01:00
Laurent Destailleur
622dc7e8d7 Debug v11 2020-01-07 22:01:55 +01:00
Laurent Destailleur
f4d7958ead Fix duplicate record in list of events for projects 2020-01-07 14:16:13 +01:00
Laurent Destailleur
444e2f1130 Fix length of column 2020-01-07 14:01:45 +01:00
Laurent Destailleur
750fa83e96 FIX Bad management of elementtype not llx_actioncomm 2020-01-07 13:49:52 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
138215fc3f Add INVOICE_ALLOW_FREE_REF as a quick hack to solve trouble with non 
european users.
 2019-12-16 22:30:16 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Laurent Destailleur
6d81bc77cb Fix look and feel v11 2019-12-02 11:00:09 +01:00
Laurent Destailleur
790fdc881c # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Maxime Kohlhaas
916954b301 Fix #12371 : access rights on contacts 2019-11-30 14:48:05 +01:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:35:02 +00:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks 
NEW add socialnetworks dictionary
 2019-11-04 21:10:22 +01:00
Laurent Destailleur
6e591d2be0 Fix css 2019-11-04 18:25:32 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
d9ba09bec1
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-12 19:02:24 +02:00
Laurent Destailleur
95305a313d Fix trans 2019-10-11 17:02:35 +02:00
Laurent Destailleur
60bdb3133e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-11 16:57:56 +02:00
Laurent Destailleur
b58c2c38b2 Fix missing token 2019-10-11 16:57:47 +02:00
Frédéric FRANCE
c80d055af3
fix search by roles 2019-10-10 23:51:54 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
297313e7de CSS 2019-10-07 16:01:36 +02:00
Laurent Destailleur
c6c498fd67
Merge pull request #11829 from atm-florian/dev_contactdefault 
NEW : Address/Contact by default on third parties
 2019-10-07 15:27:58 +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
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
stickler-ci
bc32d684a4 Fixing style errors. 2019-10-04 16:12:33 +00:00
florian HENRY
2d3dd9ed3c Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-10-04 18:10:16 +02:00
Frédéric FRANCE
feaa5e2bd0
json query path 2019-10-02 22:15:24 +02:00
Frédéric FRANCE
6d117a501a
Update company.lib.php 2019-10-02 22:11:27 +02:00
Frédéric FRANCE
453ae05030
Update company.lib.php 2019-10-02 22:09:50 +02:00
Frédéric FRANCE
9f7f263f79
fix broken search 2019-10-02 21:49:36 +02:00
Frédéric FRANCE
3afb4355a8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-02 18:59:18 +02:00
florian HENRY
8c9cee1565 resolve conflict 2019-10-02 12:49:38 +02:00
florian HENRY
371ff76f5e resolve copflict 2019-10-02 12:46:35 +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
Frédéric FRANCE
26c34198bf
show contact 2019-10-01 21:38:16 +02:00
florian HENRY
d48f0fa791 resolve conflixt 2019-10-01 18:07:59 +02:00
Laurent Destailleur
b79831ec39
Merge pull request #11952 from aspangaro/11.0_https 
Move Gnu.org to https
 2019-10-01 14:48:21 +02:00
Laurent Destailleur
6ebd060315 Use php var with same name than html var 2019-10-01 11:23:38 +02:00
Laurent Destailleur
0828000626
Merge pull request #12005 from laudeco/feature/filter_contacts 
working solution about filtering the contacs of one company
 2019-10-01 11:19:29 +02:00
Laurent Destailleur
0f4f5d47f2
Update company.lib.php 2019-10-01 11:18:53 +02:00
Laurent Destailleur
955d9daf38
Update company.lib.php 2019-10-01 11:18:14 +02:00
stickler-ci
5e075d5d30 Fixing style errors. 2019-10-01 06:39:26 +00:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Laurent Destailleur
b390cff172 Fix css 2019-09-30 17:22:22 +02:00
florian HENRY
885d958e63 Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault 2019-09-27 20:12:09 +02:00
Laurent De Coninck
040e7bdfdf working solution about filtering the contacs of one company 2019-09-25 18:24:36 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
9f6fe0bf5a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/orders.lang
 2019-09-14 18:27:58 +02:00
Laurent Destailleur
584549df11 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:25:31 +02:00
Laurent Destailleur
697b25aa82 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-09-14 18:24:00 +02:00
Laurent Destailleur
56e070cd7f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/accountancy/index.php
 2019-09-14 18:23:20 +02:00
Frédéric FRANCE
0d3a2f800b
fix colspan in show_project 2019-09-12 21:39:57 +02:00
florian HENRY
6c20fbafdf add trigger files 2019-09-03 17:04:42 +02:00
florian HENRY
d811de4da2 let only triggers part 2019-09-02 22:01:48 +02:00
florian HENRY
405c92640c on going 2019-09-02 14:47:32 +02:00
florian HENRY
b535bc0cb9 start dev 2019-09-02 11:27:04 +02:00
Laurent Destailleur
3339f89fc5 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/api/class/api_login.class.php
	htdocs/dav/fileserver.php
 2019-08-22 12:45:23 +02:00
Laurent Destailleur
27cd6cd308 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/fournisseurs.php
	htdocs/stripe/payment.php
 2019-08-22 12:39:07 +02:00
Laurent Destailleur
b06dab6930 Fix add option to restore backward compatibility 2019-08-22 00:44:28 +02:00
Laurent Destailleur
d304749eca Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-19 10:19:14 +02:00
Laurent Destailleur
18886c701d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/core/lib/company.lib.php
 2019-08-19 00:02:26 +02:00
Laurent Destailleur
3a0057f6a3 FIX too many record in sql request. Whena criteria is a filter, we must 
use an inner join.
 2019-08-18 23:59:24 +02:00
Laurent Destailleur
bf55733678 NEW Replace the "info" tab on contract with the more complete "agenda" 
tag.
 2019-07-23 02:45:31 +02:00
Laurent Destailleur
a4cd7772ef Fix title 2019-06-22 12:02:41 +02:00
Laurent Destailleur
cb057e9c6d NEW Add hidden option to be ready for BREXIT 2019-06-20 12:32:14 +02:00
Laurent Destailleur
900e860f6d Fix list of events for BOM module 2019-06-12 19:32:29 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Frédéric FRANCE
135df4b3ce
Usage of ELSE IF is discouraged; use ELSEIF instead 2019-03-18 11:24:56 +01:00
Laurent Destailleur
0afbd70c2c
Merge pull request #10833 from grandoc/new_branch_14_03_2019 
update with html5 compliant code
 2019-03-14 18:04:06 +01:00
Philippe GRAND
63b1a1459b update with html5 compliant code 2019-03-14 14:09:54 +01:00
Lionel VESSILLER
bf5b482f3d Fix replace TRUE and FALSE for php checkstyle and aliasing label instead of note in SQL request 2019-03-06 09:05:07 +01:00
Lionel VESSILLER
9b797eb980 Fix sort by field in all events (action and emailing type) and fix multiple contacts in one event 2019-03-05 14:55:04 +01:00
Lionel VESSILLER
cdc2c5ae77 Company Lib : Fix contact events with no thirdparty 2019-02-21 09:49:46 +01:00
Lionel VESSILLER
d10c5cab34 Company Lib : Fix url for emailing type event (link to emailing card) 2019-02-20 15:14:50 +01:00
Laurent Destailleur
a7af1b1765 Remove deprecated code 2019-02-14 16:29:13 +01:00
Frédéric FRANCE
154ba78ee7
Update company.lib.php 2019-02-13 22:43:12 +01:00
Laurent Destailleur
a6dde3d6bd
Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Frédéric FRANCE
03701fa091
psr2 2019-02-02 18:25:01 +01:00
Laurent Destailleur
e18bd6f986
Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
e72d6c50e6
Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +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
Laurent Destailleur
f30a3d59ba
Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +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
ldestailleur
451b3e30cc Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/company.lib.php
	htdocs/core/lib/functions.lib.php
	htdocs/langs/en_US/cashdesk.lang
 2019-01-04 19:36:20 +01:00
ldestailleur
7c1ed5b913 FIX #9972 #10297 2019-01-03 13:28:35 +01:00
Laurent Destailleur
35debd06fb List of events show user firstname by default 2018-12-23 01:28:36 +01:00
Laurent Destailleur
cd3716ff9f Dolibarize module ticket 2018-12-08 16:37:41 +01:00
Laurent Destailleur
a8009d4a72
Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources 
FIX Work with new table actioncomm_resources and multiple contact affectation
 2018-12-01 16:16:50 +01:00
Laurent Destailleur
9ac984af76
Update company.lib.php 2018-12-01 16:15:34 +01:00
Laurent Destailleur
f3ce49806d
Update company.lib.php 2018-11-29 11:15:27 +01:00
oscim
f5ebcca475
error space after comment 2018-11-26 15:47:51 +01:00
oscim
2af24903e9
Update company.lib.php 
Fix list in  agenda for tab customer / provider , no thirdparty selected because name of class is not Societe
 2018-11-26 10:53:34 +01:00
François J
a5777d30e1 Fix Contact Agenda events filter when no Third Party 
Handle case where the contact is not linked to any third party.
 2018-11-16 10:09:25 +01:00
François J
10dd5652ee Add SELECT DISTINCT to show_actions_done() SQL request 2018-11-12 12:34:25 +01:00
François J
9a6a3d8df4 Join llx_actioncomm_resources only if we have a contact object. 2018-11-12 12:20:07 +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
3e844db74f Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fichinter/stats/index.php
 2018-11-08 20:19:28 +01:00
Laurent Destailleur
9a31a61c9d FIX #9971 2018-11-08 20:05:01 +01:00
Laurent Destailleur
588de2cc86 Fix filter on entity on project 2018-11-08 18:45:02 +01:00
Laurent Destailleur
c55f83b0b7 Fix multicompany filter missing 2018-11-08 11:25:29 +01:00
François J
121297b5bd SQL Join actioncomm_resources 2018-11-07 17:10:51 +01:00
François J
aea01b3208 NEW Work with new table actioncomm_resources and multiple contact affectation 2018-11-07 17:04:18 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Alexandre SPANGARO
a5ebcff2ee Fix lettering function 2018-10-16 22:27:34 +02:00
Laurent Destailleur
1d04ce2185 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2018-10-09 17:07:32 +02:00
Laurent Destailleur
01c32525df Merge 2018-10-09 17:06:08 +02:00
florian HENRY
68c99d01a7 OMG!!!! var_dump.... 2018-10-05 10:35:32 +02:00
Laurent Destailleur
2aca9cb394
Update company.lib.php 2018-10-04 17:44:47 +02:00
florian HENRY
e95921eb93 better test 2018-10-04 09:47:04 +02:00
florian HENRY
7f4f27ebfe indent 2018-10-04 09:45:12 +02:00
florian HENRY
292dab192b FIX : #9161 2018-10-04 09:42:11 +02:00
florian HENRY
d09bbe4690 NEW : add event tab on resource card 2018-10-03 21:13:02 +02:00
Laurent Destailleur
3be13f0cb6 Fix css 2018-09-21 11:45:04 +02:00
Frédéric FRANCE
aec1f779ff
reduce complexity of company lib 2018-09-16 21:40:28 +02:00
Philippe GRAND
50a26aaf16 fix merge 2018-09-04 14:33:34 +02:00
Laurent Destailleur
540999faa5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/lib/company.lib.php
 2018-09-03 14:06:51 +02:00
Laurent Destailleur
6641a05744 Fix missing class 2018-09-03 11:59:19 +02:00
Philippe GRAND
4fba7cdf45 fix : Class Contact not found in htdocs/core/lib/company.lib.php on line 1496 2018-09-03 09:45:06 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Laurent Destailleur
37ca3ff230 Fix separator 2018-08-14 20:51:24 +02:00