Commit graph

127111 commits

Author SHA1 Message Date
Alexandre SPANGARO
148ab759d3 Merge branch 'develop' into 20_css_1 2023-12-18 05:04:01 +01:00
Laurent Destailleur
770bc15ca3 Debug v19 2023-12-18 00:02:21 +01:00
Laurent Destailleur
5e28ab0ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 23:54:37 +01:00
Laurent Destailleur
4dc5483b12 Fix warning 2023-12-17 23:54:08 +01:00
Laurent Destailleur
45bfea94a6 Removed not used code 2023-12-17 23:36:18 +01:00
Laurent Destailleur
689ba89b21
Merge pull request #27108 from altairisfr/ORDER_REOPEN_TO_DRAFT_2023
add constant ORDER_REOPEN_TO_DRAFT
2023-12-17 23:27:56 +01:00
Laurent Destailleur
c6e33a89a4 Doc 2023-12-17 23:21:59 +01:00
Laurent Destailleur
b5cce1c718
Merge pull request #27110 from defrance/patch-309
php V8 warning
2023-12-17 23:20:19 +01:00
Laurent Destailleur
abdfd74d25
Merge pull request #27114 from mc2rcanarslan/patch-4
FIX: wrong object field assignment
2023-12-17 23:15:09 +01:00
Laurent Destailleur
3c926883b4
Merge pull request #27115 from JonBendtsen/patch-1
Thirdparty email missing in send message form for ticket #27034
2023-12-17 23:14:51 +01:00
Laurent Destailleur
084d2ee34e
Merge pull request #27119 from frederic34/patch-4
fix phpdoc
2023-12-17 23:11:20 +01:00
Laurent Destailleur
e1b94535f7
Merge pull request #27120 from frederic34/patch-9
clean code
2023-12-17 23:10:31 +01:00
Laurent Destailleur
01a30c55eb
Merge pull request #27122 from frederic34/patch-7
fix warning
2023-12-17 23:09:25 +01:00
Laurent Destailleur
a50bb45d24 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 23:02:03 +01:00
Laurent Destailleur
bb65d9520d Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 23:01:21 +01:00
Laurent Destailleur
22c93cb029 Fix phpcs 2023-12-17 22:59:15 +01:00
Laurent Destailleur
f7772ecb2b Fix phpcs 2023-12-17 22:55:46 +01:00
Laurent Destailleur
6c873e66da Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 22:53:22 +01:00
Laurent Destailleur
191b8f5205 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-12-17 22:51:58 +01:00
Laurent Destailleur
1661534d5a Fix set PROFID1 2023-12-17 22:51:13 +01:00
Laurent Destailleur
0c5769f329 Fix set of PROFID1 2023-12-17 22:50:23 +01:00
Alexandre SPANGARO
b17d2d6004 NEW : llxHeader body css for asset 2023-12-17 22:32:25 +01:00
Laurent Destailleur
98009ea6be Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/compta/bank/class/account.class.php
	htdocs/core/modules/supplier_order/doc/pdf_cornas.modules.php
	htdocs/langs/en_US/recruitment.lang
	htdocs/master.inc.php
	htdocs/projet/contact.php
2023-12-17 22:17:14 +01:00
Laurent Destailleur
64b9414271 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/modulebuilder/template/myobject_list.php
2023-12-17 22:08:40 +01:00
Laurent Destailleur
8cb9bdd852 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
	htdocs/ticket/list.php
2023-12-17 22:06:48 +01:00
Laurent Destailleur
438e922a75 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0
Conflicts:
	htdocs/master.inc.php
2023-12-17 21:49:42 +01:00
Laurent Destailleur
21b7d68f49 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
	htdocs/comm/action/list.php
	htdocs/compta/facture/list.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/product/stock/movement_list.php
	htdocs/product/stock/productlot_list.php
2023-12-17 21:49:08 +01:00
Laurent Destailleur
a342ef5ecf Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-12-17 21:37:44 +01:00
Laurent Destailleur
9160d49625
Merge pull request #27125 from atm-lena/17.0_FIX_Issue26045
17.0 fix issue 26045
2023-12-17 21:36:55 +01:00
Laurent Destailleur
2b6ec12218
Merge pull request #27127 from Hystepik/fix-funnel-graph
Fix funnel of prospection display
2023-12-17 21:33:17 +01:00
Laurent Destailleur
0b3f93930d
Merge pull request #27129 from jyhere/patch-7
FIX: product association clone
2023-12-17 21:29:01 +01:00
Laurent Destailleur
6802c0f364
Merge pull request #27131 from frederic34/patch-8
fix phpdoc
2023-12-17 21:28:14 +01:00
Laurent Destailleur
de69e82c0a
Merge pull request #27133 from frederic34/patch-13
fix initAsSpecimen values
2023-12-17 21:27:57 +01:00
Laurent Destailleur
c128bd02aa
Merge pull request #27134 from frederic34/patch-14
fix return value
2023-12-17 21:27:35 +01:00
Laurent Destailleur
ca16b212dc
Merge pull request #27135 from frederic34/patch-15
fix set values
2023-12-17 21:25:24 +01:00
Laurent Destailleur
fd1e723b6e
Merge pull request #27136 from frederic34/patch-16
add phpdoc in subclass
2023-12-17 21:24:55 +01:00
Laurent Destailleur
8157b7a334
Merge pull request #27137 from frederic34/patch-17
fix phpdoc
2023-12-17 21:23:40 +01:00
Laurent Destailleur
a00099ed16 Fix sql standard 2023-12-17 21:20:11 +01:00
Laurent Destailleur
9f621d0ff5
Merge pull request #27138 from frederic34/patch-18
fix phpdoc
2023-12-17 20:58:05 +01:00
Laurent Destailleur
afdb24324a
Merge pull request #27140 from frederic34/patch-20
fix defaults values
2023-12-17 20:57:34 +01:00
Laurent Destailleur
44b2f9067d
Merge pull request #27142 from frederic34/patch-22
fix default value
2023-12-17 20:56:28 +01:00
Laurent Destailleur
f38fad5023
Merge pull request #27143 from frederic34/patch-23
fix default value
2023-12-17 20:55:44 +01:00
Laurent Destailleur
625aa2fa6b
Merge pull request #27146 from atm-john/issue_265856_part_002
NEW : llxHeader body css for modulebuilder see #26856
2023-12-17 20:55:20 +01:00
Laurent Destailleur
b3762798a7
Merge pull request #27149 from alexandre-janniaux/commande-test-create-soc/1
FIX: CommandeTest: fix create when no company exists
2023-12-17 20:54:23 +01:00
Laurent Destailleur
a9bdab922b
Merge pull request #27150 from alexandre-janniaux/companybankaccounttest-societe/1
FIX: CompanyBankAccountTest: fix create when no societe exists
2023-12-17 20:54:07 +01:00
Laurent Destailleur
f6d1d61d69
Merge pull request #27151 from alexandre-janniaux/contrattest-create-societe/1
FIX: ContratTest: fix create when no societe exists
2023-12-17 20:53:50 +01:00
Alexandre Janniaux
f728bda625 ContratTest: add more error context 2023-12-17 16:06:06 +01:00
Alexandre Janniaux
c2c99ab2b8 FIX: ContratTest: fix create when no societe exists
The testContratCreate() is using the default value for Contrat::socid,
which is defined by Contrat::initAsSpecimen to `0`. But if no companies
have been created, the test will fail with the following error:

    Failed asserting that 0 is less than -1.

Or with the additional logging:

    UnknownError: ERROR:  23503: insert or update on table "llx_contrat" violates foreign key constraint "fk_contrat_fk_soc"
    DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                                        
    SCHEMA NAME:  public                                                                                                    
    TABLE NAME:  llx_contrat                                                                                                
    CONSTRAINT NAME:  fk_contrat_fk_soc                                                                                     
    LOCATION:  ri_ReportViolation, ri_triggers.c:2596 -,                                                                    
    Failed asserting that 0 is less than -1.

The test doesn't really depends on specific test data so we can create
the company directly instead.
2023-12-17 16:06:05 +01:00
Alexandre Janniaux
da3b4d10df FIX: CompanyBankAccountTest: fix create when no societe exists
The testCompanyBankAccountCreate() is using the default value for
CompanyBankAccount::socid, which is defined by
CompanyBankAccount::initAsSpecimen to `0`. But if no companies have been
created, the test will fail with the following error:

    Failed asserting that 0 is less than -1.

Or with the additional logging:

    ERROR:  23503: insert or update on table "llx_societe_rib" violates foreign key constraint "llx_societe_rib_fk_societe"                                                   
    DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                                                                                          
    SCHEMA NAME:  public                                                                                                                                                      
    TABLE NAME:  llx_societe_rib                                                                                                                                              
    CONSTRAINT NAME:  llx_societe_rib_fk_societe                                                                                                                              
    LOCATION:  ri_ReportViolation, ri_triggers.c:2596, ERROR:  23503: insert or update on table "llx_societe_rib" violates foreign key constraint "llx_societe_rib_fk_societe"
    DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                                                                                          
    SCHEMA NAME:  public                                                                                                                                                      
    TABLE NAME:  llx_societe_rib                                                                                                                                              
    CONSTRAINT NAME:  llx_societe_rib_fk_societe                                                                                                                              
    LOCATION:  ri_ReportViolation, ri_triggers.c:2596                                                                                                                         
    Failed asserting that 0 is less than -1.

The test doesn't really depends on specific test data so we can create
the company directly instead.
2023-12-17 15:55:26 +01:00
Alexandre Janniaux
0cc1cfc1ee FIX: CommandeTest: fix create when no company exists
The testCommandeCreate() is using the default value for Commande::socid,
which is defined by Command::initAsSpecimen to `0`. But if no companies
have been created, the test will fail with the following error:

    Failed asserting that 0 is less than -1.

Or with the additional logging:

    ERROR:  23503: insert or update on table "llx_commande" violates foreign key constraint "fk_commande_fk_soc"
    DETAIL:  Key (fk_soc)=(1) is not present in table "llx_societe".                                            
    SCHEMA NAME:  public                                                                                        
    TABLE NAME:  llx_commande                                                                                   
    CONSTRAINT NAME:  fk_commande_fk_soc                                                                        
    LOCATION:  ri_ReportViolation, ri_triggers.c:2596,                                                          
    Failed asserting that 0 is less than -1.

The test doesn't really depends on specific test data so we can create
the company directly instead.
2023-12-17 15:45:25 +01:00