Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
118,066 Commits 35 Branches 179 Tags 1.7 GiB
5e4edac94d
Commit Graph

4032 Commits

Author SHA1 Message Date
lvessiller
b894136dd9 NEW parent company column and filter in order list 2022-10-03 09:52:46 +02:00
Laurent Destailleur
07966f5e6b Clean code 2022-10-01 14:00:43 +02:00
Alexandre SPANGARO
51aa7e8027 Merge remote-tracking branch 'upstream/develop' into 17p6 2022-10-01 07:52:48 +02:00
Laurent Destailleur
fb28d14097 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-28 21:20:37 +02:00
Laurent Destailleur
98ed321514
Merge branch 'develop' into 17p6 2022-09-28 20:55:43 +02:00
Frédéric France
3a3dad6fb8 Merge remote-tracking branch 'upstream/develop' into pr/dolibit-ut/22136 2022-09-28 20:23:40 +02:00
Laurent Destailleur
52b12ee47d Trans 2022-09-27 14:12:37 +02:00
Laurent Destailleur
edaa111461 Replace use of png file for module image with a font awesome image 2022-09-27 12:05:11 +02:00
Laurent Destailleur
41270d585e css 2022-09-27 11:17:10 +02:00
Alexandre SPANGARO
ef94f2af70 Use isModEnabled 2022-09-25 22:45:10 +02:00
Laurent Destailleur
acaf066d1d
Merge pull request #22011 from SylvainLegrand/PR_Option_for_input_of_customer_or_supplier_references 
Add an option to manage input size for customer / supplier references
 2022-09-25 18:48:55 +02:00
Laurent Destailleur
2a98ff313e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-25 17:12:25 +02:00
Laurent Destailleur
f5e5de1eba Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-09-25 17:12:03 +02:00
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
Alexandre SPANGARO
d06fef47f8 Use isModEnabled 2022-09-25 15:28:36 +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
Alexandre SPANGARO
fc9e6c541e Use isModEnabled 2022-09-25 06:30:33 +02:00
Alexandre SPANGARO
5eaffd64e7 Use isModEnabled 2022-09-25 06:13:22 +02:00
Alexandre SPANGARO
5fc79979bc Use isModEnabled 2022-09-25 06:02:13 +02:00
Alexandre SPANGARO
58ac8d196c Use isModEnabled 2022-09-25 06:01:40 +02:00
priojk
33291b7cc7 FIX #21799 inactive companies cannot be selected 2022-09-24 17:19:52 +02:00
Philippe GRAND
fb9db96ecc update code toward php8 compliance 2022-09-24 14:37:57 +02:00
Laurent Destailleur
e1b5e5033f Clean code of deprecated field 2022-09-23 09:35:17 +02:00
Laurent Destailleur
6fb9a4713c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-21 01:30:40 +02:00
Regis Houssin
f5fe366525 FIX broken feature, wrong fk_parent_line 2022-09-16 15:03:53 +02:00
Laurent Destailleur
91bdaae898 Look and feel v17 2022-09-15 03:08:33 +02:00
Regis Houssin
a3a973466f FIX broken feature, wrong fk_parent_line after cloning object 2022-09-13 15:16:17 +02:00
Laurent Destailleur
209bf00b69 Trans 2022-09-13 00:12:57 +02:00
Laurent Destailleur
a11a33a804 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-11 22:21:18 +02:00
Frédéric France
e96eee56b0 sample deprecated function 2022-09-10 13:55:40 +02:00
Alexandre SPANGARO
6b4bd6c09e FIX #21859 - Don't show html balise on list for private/public note 2022-09-09 15:56:17 +02:00
Frédéric France
1c2a89f52d Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-09 08:09:12 +02:00
Laurent Destailleur
7c7ccc2393 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-09 01:45:59 +02:00
Laurent Destailleur
fb60c100e5 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2022-09-09 01:39:52 +02:00
Laurent Destailleur
3177a065cd Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2022-09-09 01:31:43 +02:00
Frédéric France
da8617e3ff Merge remote-tracking branch 'upstream/develop' into loaddolibarrenv 2022-09-08 18:59:23 +02:00
Laurent Destailleur
ee05abaa27 Clean code 2022-09-08 15:13:16 +02:00
Laurent Destailleur
aa9036a0f5 Clean code 2022-09-08 15:05:51 +02:00
Frédéric France
8d33953142 add comment 2022-09-07 20:08:59 +02:00
Alexandre SPANGARO
9a5927d833 FIX Column label 2022-09-06 05:30:35 +02:00
Laurent Destailleur
760c6e581e
Merge pull request #22060 from grandoc/new_branch_03_09_2022 
Update code
 2022-09-03 11:44:36 +02:00
Philippe GRAND
7997776cbb Update code 2022-09-03 11:12:52 +02:00
Philippe GRAND
4a8f61838d Update code 2022-09-03 11:11:38 +02:00
Philippe GRAND
120fb10738 Update code 2022-09-03 11:09:59 +02:00
Frédéric FRANCE
9150f5102e Merge remote-tracking branch 'upstream/develop' into pr/grandoc/22009 2022-09-02 11:44:45 +02:00
Laurent Destailleur
027e597776
Merge branch 'develop' into productbatch 2022-09-02 10:11:47 +02:00
stickler-ci
9a7ad0a7dc Fixing style errors. 2022-09-01 19:17:42 +00:00
UT from dolibit
33e112eda7
Update list.php 2022-09-01 21:06:30 +02:00
Philippe GRAND
9ba54b502d update code 2022-09-01 09:41:59 +02:00
Sylvain Legrand
a1bae3453a Add an option to manage input size for customer / supplier references 2022-09-01 08:34:22 +02:00
Frédéric France
bb58f3a18f use isModEnabled 2022-08-31 22:38:53 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Philippe GRAND
81c13bcc4c update code 2022-08-31 22:03:33 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Philippe GRAND
52fed85676 update code 2022-08-31 21:59:06 +02:00
Philippe GRAND
b04125f9f9 update code 2022-08-31 21:58:38 +02:00
Philippe GRAND
1b7934062f update code 2022-08-31 21:57:27 +02:00
Philippe GRAND
18fba7a8e7 update code 2022-08-31 21:56:58 +02:00
Philippe GRAND
c86617c7b1 update code 2022-08-31 21:56:30 +02:00
Frédéric France
fc01cc66cd fix php8 warnings 2022-08-31 21:55:55 +02:00
Philippe GRAND
f26b1cccdc update code 2022-08-31 21:55:54 +02:00
Laurent Destailleur
e0b1ad308b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-08-30 19:38:35 +02:00
UT from dolibit
2b59e9261b
Update index.php 2022-08-29 18:58:51 +02:00
Laurent Destailleur
5acd2b0702
Merge pull request #21917 from dolibit-ut/patch-444 
Update card.php
 2022-08-29 00:54:53 +02:00
UT from dolibit
c6c5ddd485
Update commande.class.php 2022-08-27 13:55:27 +02:00
stickler-ci
2ee2dfeea2 Fixing style errors. 2022-08-27 10:26:09 +00:00
UT from dolibit
765b8053cf
Update card.php 2022-08-27 12:21:01 +02:00
Laurent Destailleur
bfb01ae928 Clean code 2022-08-26 18:24:42 +02:00
Laurent Destailleur
af69270a0e NEW Can enter the unit price including the vat 2022-08-26 17:39:41 +02:00
UT from dolibit
1efca018d9
Update list.php 2022-08-24 23:13:27 +02:00
Frédéric France
e78f9a56be use isModEnabled 2022-08-23 20:16:28 +02:00
Frédéric France
86a7a7c8bb use isModEnabled 2022-08-23 20:05:09 +02:00
Frédéric France
4bef0f5745 use isModEnabled 2022-08-23 20:01:34 +02:00
Laurent Destailleur
72c010622b FIX empty with hasRight and add phpunit to avoid this in future 2022-08-14 16:38:20 +02:00
Laurent Destailleur
24b1085639 Clean code. Prepare for inputing prices with taxes 2022-08-13 19:30:26 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
 2022-08-10 13:16:02 +02:00
Regis Houssin
b20144c3d0 FIX php8 compatibility 2022-08-08 11:39:43 +02:00
Laurent Destailleur
654e7bf638
Merge branch 'develop' into FIX---php-V8-user-right-order-card 2022-07-28 14:21:20 +02:00
Anthony Berton
a778a5ff78 and order lib 2022-07-28 11:50:42 +02:00
Anthony Berton
03e265b080 FIX - php V8 user right order card 2022-07-28 11:43:00 +02:00
Anthony Berton
d8ae2361a9 NEW - Add user right order generete doc 2022-07-28 11:29:36 +02:00
Berton Anthony
e77c51eabb conf 2022-07-25 12:18:07 +02:00
Berton Anthony
eb463341b4 ok 2022-07-25 12:17:02 +02:00
Laurent Destailleur
fb96145b49 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 02:05:20 +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
2ce695f939 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-10 19:48:20 +02:00
Laurent Destailleur
9a92c7d9b0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/extrafields.class.php
 2022-07-10 19:28:16 +02:00
Laurent Destailleur
a871aa8f85
Merge pull request #21382 from fboitel/NEW#20650 
NEW #20650 Checkbox column on left for lists
 2022-07-07 21:48:51 +02:00
Christian Foellmann
4c5e05e411 fix page titles 
Conflicts:
	htdocs/compta/bank/annuel.php
	htdocs/contact/list.php
	htdocs/product/stock/movement_list.php
	htdocs/user/list.php
 2022-07-06 19:19:08 +02:00
Laurent Destailleur
76e3c10c06
Revert "fix page titles" 2022-07-06 15:56:04 +02:00
Laurent Destailleur
bd28a7e038 Debug v16 2022-07-03 12:54:58 +02:00
Laurent Destailleur
4c4e081997 Debug v16 2022-06-28 13:09:53 +02:00
Christian Foellmann
89d1389e2d fix page titles 2022-06-27 12:48:04 +02:00
Laurent Destailleur
0d25e3d236
Merge pull request #21392 from bb2a/FIX---php-V8-order-liste 
FIX - php V8 order liste
 2022-06-27 12:20:31 +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
BB2A Anthony Berton
2208d39b39 FIX - php V8 order liste 2022-06-27 11:29:15 +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
Faustin
10a9ab5ed1 NEW #20650 enabled checkcolumn on left for commande list 2022-06-24 13:56:24 +02:00
BB2A Anthony Berton
0d00c4b26d FIX 2022-06-23 15:34:45 +02:00
Laurent Destailleur
4b79d91437 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-06-23 12:35:24 +02:00
BENKE Charlene
710e556845
fix $fk_product instead $this->fk_product 
$fk_product not present on $commande object
 2022-06-20 16:07:22 +02:00
GregM
d370571963 FIX class center linkedObjectblock order date 2022-06-20 14:59:13 +02:00
Laurent Destailleur
28234c6f44
Merge pull request #21276 from badre-agtaib/scru4 
FIX bug :The properties product_tosell & product_tobuy do not exist on OrderLine
 2022-06-15 11:05:34 +02:00
bagtaib
22152dd254 declaring the propreties product_tosell & product_tobuy 2022-06-15 00:50:34 +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
bagtaib
267a6f908d The properties product_tosell & product_tobuy do not exist on OrderLine 2022-06-14 17:26:18 +02:00
Laurent Destailleur
f261846990 Fix look and feel v16 2022-06-14 10:21:10 +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
Laurent Destailleur
f5705e89a8
Merge branch 'develop' into patch-195 2022-06-01 22:03:19 +02:00
lmarcouiller
2d13b47441 fix php8.0 warnings 2022-05-31 11:36:54 +02:00
BENKE Charlene
2ad50b77b7
php V8 warning 2022-05-27 16:34:56 +02:00
Laurent Destailleur
4c10c04f9f
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search 
FIX : regression select extrafield search + fix function name
 2022-05-24 21:55:33 +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
Regis Houssin
6372bea326 FIX php8 warning 2022-05-22 00:14:01 +02:00
Laurent Destailleur
2c2544d471 Fix scrutinizer 2022-05-21 15:31:08 +02:00
Laurent Destailleur
7c9d360019
Merge pull request #20937 from atm-maxime/fix_date_creation_visible 
Fix : date_creation must have visible=-2
 2022-05-21 10:34:01 +02:00
Maxime Kohlhaas
755bce9fe1 Fix : date_creation must have visible=-2 2022-05-21 00:22:47 +02:00
Maxime Kohlhaas
cff5ec8605 Fix : fields must check module enabled 2022-05-21 00:08:18 +02:00
Laurent Destailleur
4162a02cc1 Fix deprecated remise must be remove from insert 2022-05-20 20:10:45 +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
7fd3bb0aae Remove deprecated code 2022-05-19 12:08:03 +02:00
Laurent Destailleur
38aced687b Fix scrutinizer 2022-05-18 23:52:43 +02:00
Laurent Destailleur
2e15a14c14 css 2022-05-18 00:10:44 +02:00
Laurent Destailleur
a483af70df Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/contrat/index.php
 2022-05-17 23:27:11 +02:00
Laurent Destailleur
c475789433 Debug v16 2022-05-17 23:23:50 +02:00
stickler-ci
f70a9ad04c Fixing style errors. 2022-05-11 13:42:27 +00:00
Gauthier PC portable 024
da2a8a59f3 Merge branch '14.0_NEW_rang_on_api_put_line' of github.com:atm-gauthier/dolibarr into NEW/can_update_rank_on_api_put_function 2022-05-11 14:38:16 +02:00
Gauthier PC portable 024
b053dee279 NEW : update rank line is possible on API for orders propal and supplier invoice 2022-05-11 14:26:21 +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
6592eb5d73 Debug for php 8.1 2022-05-08 18:25:22 +02:00
Philippe GRAND
2467dd0615 fix : do not display html tags into list 2022-05-04 09:18:46 +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
fa7254be9a Fix picto and perm 2022-05-03 17:05:14 +02:00
Laurent Destailleur
fa8ce6e4fd
Merge pull request #20710 from fappels/develop_confirm_createbills 
Move massaction 'confirm_createbills' from actions_massactions.inc.php to commande/list.php
 2022-04-29 17:19:18 +02:00
Laurent Destailleur
708d3610a5 Look and feel v16 2022-04-29 13:04:29 +02:00
Francis Appels
e9cfb9b69c Improve error handling confirm_billcreate 2022-04-25 11:24:09 +02:00