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

Merge 14ea73c1aa into a2bf0b5b02

Browse Source
This commit is contained in:
Frédéric FRANCE 2025-02-20 11:11:33 +01:00 committed by GitHub
commit 73844106af
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
htdocs/core/lib/tax.lib.php
View File

@ -109,7 +109,50 @@ function tax_prepare_head(ChargeSociales $object)
* @param 'sell'|'buy' $direction 'sell' or 'buy'
* @param int<0,12> $m Month
* @param int<0,4> $q Quarter
* @return int<-3,-1>|array<int|string,array{totalht:float,vat:float,localtax1:float,localtax2:float,dtotal_ttc:float[],dtype:int[],datef:int[],datep:int[],company_name:string[],company_id:int[],company_alias:string[],company_email:string[],company_tva_intra:string[],company_client:int[],company_fournisseur:int[],company_customer_code:string[],company_supplier_code:string[],company_customer_accounting_code:string[],company_supplier_accounting_code:string[],company_status:int[],user_id:int[],drate:string[],ddate_start:int[],ddate_end:int[],facid:int[],facnum:string[],type:int[],ftotal_ttc:float[],descr:string[],totalht_list:string[],vat_list:float[],localtax1_list:float[],localtax2_list:float[],pid:int[],pref:string[],ptype:int[],payment_id:int[],payment_ref:string[],payment_amount:float[]}> Array with details of VATs (per third party), -1 if no accountancy module, -2 if not yet developed, -3 if error
* @return int<-3,-1>|array<
* int|string,
* array{
* totalht:float,
* vat:float,
* localtax1:float,
* localtax2:float,
* dtotal_ttc:float[],
* dtype:int[],
* datef:int[],
* datep:int[],
* company_name:string[],
* company_id:int[],
* company_alias:string[],
* company_email:string[],
* company_tva_intra:string[],
* company_client:int[],
* company_fournisseur:int[],
* company_customer_code:string[],
* company_supplier_code:string[],
* company_customer_accounting_code:string[],
* company_supplier_accounting_code:string[],
* company_status:int[],
* user_id:int[],
* drate:string[],
* ddate_start: int[],
* ddate_end: int[],
* facid: int[],
* facnum: string[],
* type: int[],
* ftotal_ttc: float[],
* descr: string[],
* totalht_list: string[],
* vat_list: float[],
* localtax1_list: float[],
* localtax2_list: float[],
* pid: int[],
* pref: string[],
* ptype: int[],
* payment_id: int[],
* payment_ref: string[],
* payment_amount: float[]
* }
* > Array with details of VATs (per third party), -1 if no accountancy module, -2 if not yet developed, -3 if error
*/
function tax_by_thirdparty($type, $db, $y, $date_start, $date_end, $modetax, $direction, $m = 0, $q = 0)
{

27
htdocs/ticket/class/ticket.class.php
View File

@ -291,6 +291,33 @@ class Ticket extends CommonObject
*/
// BEGIN MODULEBUILDER PROPERTIES
/**
* @var array<
* string,
* array{
* type: string,
* label: string,
* enabled: int<0, 2>|string,
* position: int,
* notnull?: int,
* visible: int<-2, 5>|string,
* noteditable?: int<0, 1>,
* default?: string,
* index?: int,
* foreignkey?: string,
* searchall?: int<0, 1>,
* isameasure?: int<0, 1>,
* css?: string,
* csslist?: string,
* help?: string,
* showoncombobox?: int<0, 2>,
* disabled?: int<0, 1>,
* arrayofkeyval?: array<int|string, string>,
* comment?: string,
* validate?: int<0, 1>
* }
* >
*/
public $fields = array(
'rowid' => array('type' => 'integer', 'label' => 'TechnicalID', 'visible' => -2, 'enabled' => 1, 'position' => 1, 'notnull' => 1, 'index' => 1, 'comment' => "Id"),
'entity' => array('type' => 'integer', 'label' => 'Entity', 'visible' => 0, 'enabled' => 1, 'position' => 5, 'notnull' => 1, 'index' => 1),