Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
112,045 Commits 36 Branches 189 Tags
55b51b94f11c89c0d3f116ccce7b1b01a94171ab
Commit Graph

701 Commits

Author SHA1 Message Date
Laurent Destailleur
86091c3fde Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-25 17:01:44 +02:00
Laurent Destailleur
118b975f91 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-25 11:56:05 +02:00
priojk
33291b7cc7 FIX #21799 inactive companies cannot be selected 2022-09-24 17:19:52 +02:00
Regis Houssin
f5fe366525 FIX broken feature, wrong fk_parent_line 2022-09-16 15:03:53 +02:00
Regis Houssin
b20144c3d0 FIX php8 compatibility 2022-08-08 11:39:43 +02:00
Laurent Destailleur
204bf2e618 Update card.php 2022-07-11 10:54:23 +02:00
This Charlène
796f718012 Update card.php 2022-07-11 07:14:46 +02:00
This Charlène
8be15e8e27 php v8 fix warning 
missing and bad name variables
 2022-07-11 07:11:45 +02:00
Laurent Destailleur
76e3c10c06 Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
bc81f372ac Merge pull request #21362 from bb2a/FIX---Cancel-order 
FIX - Right close order
 2022-06-27 11:46:55 +02:00
Laurent Destailleur
a1f974f356 Merge pull request #21374 from aspangaro/17p2 
Look & Feel v16 - Align amount to right on card
 2022-06-27 11:39:31 +02:00
Alexandre SPANGARO
11a1273211 PHP8 warning & typo on key 2022-06-25 07:13:15 +02:00
Alexandre SPANGARO
cadf8ebe29 Look & Feel v16 - Align amount to right on card 2022-06-25 06:55:10 +02:00
BB2A Anthony Berton
0d00c4b26d FIX 2022-06-23 15:34:45 +02:00
Laurent Destailleur
2370ff4dfc Clean code 2022-06-14 21:00:05 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Frédéric France
3fdbce7a31 use isModEnabled function 2022-06-11 09:46:28 +02:00
Frédéric France
5dcfc28913 use isModEnabled function 2022-06-09 22:41:59 +02:00
BENKE Charlene
2ad50b77b7 php V8 warning 2022-05-27 16:34:56 +02:00
Laurent Destailleur
259a292704 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-24 16:33:24 +02:00
Laurent Destailleur
34199cf0fb Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/core/modules/modRecruitment.class.php
 2022-05-24 16:31:45 +02:00
Laurent Destailleur
324721ac1e Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/card.php
	htdocs/core/tpl/list_print_total.tpl.php
	htdocs/fichinter/list.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2022-05-22 12:54:40 +02:00
Eric Seigne
4a222fe5d5 fix potential warning ($conf->ficheinter->enabled) 2022-05-22 01:38:32 +02:00
Frédéric FRANCE
243dfacb15 Update card.php 2022-05-19 12:46:15 +02:00
Frédéric FRANCE
ad3276b579 Update card.php 2022-05-19 12:42:15 +02:00
Frédéric FRANCE
2114e51b0e Update card.php 2022-05-19 12:34:54 +02:00
Frédéric FRANCE
e44e9d812a Update card.php 2022-05-19 12:28:50 +02:00
Laurent Destailleur
2e15a14c14 css 2022-05-18 00:10:44 +02:00
Laurent Destailleur
720a09dacb Fix regression 2022-05-09 15:57:10 +02:00
Laurent Destailleur
522c092aeb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-05-09 09:26:10 +02:00
Laurent Destailleur
b3b6337c4c Merge branch 'develop' into NEW_deposit_payment_terms 2022-05-08 23:09:06 +02:00
Laurent Destailleur
a99e647348 Merge pull request #20658 from Hystepik/develop#1 
NEW #20653 edit discount pourcentage for all lines in one shot
 2022-05-04 01:20:49 +02:00
Laurent Destailleur
708d3610a5 Look and feel v16 2022-04-29 13:04:29 +02:00
lmarcouiller
1ccf209c47 Close #20653 : edit discount pourcentage 2022-04-15 14:31:44 +02:00
BB2A Anthony Berton
d154696c32 morecss select_compagny 2022-04-13 16:15:07 +02:00
Gauthier PC portable 024
83e8e07416 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-04-08 09:25:08 +02:00
Laurent Destailleur
4693ef42bd Enhance responsive 2022-04-07 11:18:56 +02:00
GregM
4fb62ee15a replacing to dolGetButtonAction on Commande card 2022-03-22 12:04:51 +01:00
Gauthier PC portable 024
5b715978e4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW/addline_with_position_choice_develop 2022-03-10 10:02:57 +01:00
Marc de Lima Lucio
4efcbe8799 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:23:52 +01:00
Marc de Lima Lucio
1993a8d7b1 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into NEW_deposit_payment_terms 2022-03-08 15:07:37 +01:00
Laurent Destailleur
54ecf1f98c # WARNING: head commit changed in the meantime 
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
 2022-03-07 15:24:08 +01:00
Frédéric FRANCE
9d1bcbe55a Fix wrong upload dir 
introduced here https://github.com/Dolibarr/dolibarr/pull/19165
 2022-03-04 18:17:23 +01:00
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
f8a5749fc4 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-25 19:00:10 +01:00
Laurent Destailleur
73b04deb19 Fix error management. 2022-02-23 00:17:49 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
aad292b41b Merge pull request #20074 from altairisfr/fix_parentline_13.0 
More generic management of parentline
 2022-02-16 20:25:04 +01:00
Christophe Battarel
6c6c854eae fix parent line on create with origin 2022-02-15 10:23:43 +01:00