Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
130,797 Commits 36 Branches 189 Tags
a2c92f183cc54c35013469638780c28e65df0b51
Commit Graph

2230 Commits

Author SHA1 Message Date
Laurent Destailleur
6ea48ac22a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-11-17 12:02:21 +01:00
MDW
c4542895d7 Fix recurrent supplier invoice generation (title) (#26601) 2023-11-16 15:43:48 +01:00
Christian Humpel
d567bdaa53 Integrate 'sqlfilterlines' in API for supplierorders. (#26613) 
Co-authored-by: christian.humpel <christian.humpel@gmail.com>
 2023-11-16 15:00:13 +01:00
thibdrev
1ba7d135e0 delete method isReconciled() because it is now inherited (#26591) 2023-11-14 14:29:25 +01:00
Laurent Destailleur
c6c7b6692d Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-13 15:33:32 +01:00
Laurent Destailleur
7659bba97a Fix bad delete of lines into llx_ecm_files 2023-11-13 12:24:47 +01:00
thibdrev
86bad02b9d FIX #26553 Supplier invoice - Do not display the delete button for reconciled payment (#26554) 
* do not display delete button if payment is reconciled

* add isReconciled() function

* phpcs fix: replace spaces by tab

* phpcs fix: Whitespace found at end of line

* phpcs
 2023-11-12 23:41:59 +01:00
Laurent Destailleur
ccfaaeb03b Debug v19 2023-11-08 16:25:49 +01:00
Laurent Destailleur
56bb63c388 Debug v19 2023-11-06 16:29:00 +01:00
Laurent Destailleur
127de7e7d8 FIX On object validation, ecm index are not updated for uploaded files 2023-11-01 16:17:54 +01:00
Laurent Destailleur
74e1ec4099 FIX On object validation, ecm index are not updated for uploaded files 2023-10-31 19:28:11 +01:00
Laurent Destailleur
a0c5dffacb Fix must update facture_fourn_rec when merging thirdparties 2023-10-31 18:18:15 +01:00
Mohamed DAOUD
08ef416958 New: Adding the PDF option displaying the product's barcode number (#26345) 
* Add a PDF option to show barcode number of product

* Add space before and after IF keyword

* fix error phpcs

* add barcode label before barcode number

* Use outputlangs and not langs

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-30 03:13:12 +01:00
Laurent Destailleur
a318031034 QUAL Standardize code. Renamed ID of user properties into ->user_xxx_id 2023-10-24 11:37:29 +02:00
Pascal Hubrecht
0628dd057d FIX #26291 (#26292) 2023-10-20 12:53:03 +02:00
Laurent Destailleur
2a21a166d9 Fix warning 2023-10-20 03:05:40 +02:00
Laurent Destailleur
371dd4551a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-20 03:03:24 +02:00
MDW
e7c49922a6 Fix some items detected by phan (see #26262) (#26264) 
* Fix some items detected by phan (see #26262)

* Update fournisseur.facture-rec.class.php

* Update fournisseur.facture-rec.class.php

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-20 02:28:51 +02:00
sonikf
732fb2fa04 NEW: Invoice subtypes for customers and vendors (#26233) 
* NEW: Invoice subtypes for customers and vendors

* fix PHPCS

* fix PHPCS

* fix PHPCS

* fix PHPCS

* fix possible SQL Injection

* remove hardcoded tests

* remove hardcoded tests

* fix travis ci error
 2023-10-18 02:33:14 +02:00
Ferran Marcet
6791a99527 Fix: Not loading thirdparty on supplier payment (#26235) 2023-10-17 15:44:57 +02:00
Laurent Destailleur
2cfa9f8290 Debug v19 2023-10-17 15:43:56 +02:00
Laurent Destailleur
b37a438067 The property ->user_validation to store ID of user validating has been 
renamed into ->user_validation_id.
 2023-10-17 11:10:25 +02:00
Laurent Destailleur
f18529f944 Clean code 2023-10-17 10:52:19 +02:00
Laurent Destailleur
fb8b4acdbf The duplicated and deprecated property ->date_livraison that was renamed 
into ->delivery_date has been completely removed.
 2023-10-17 10:36:11 +02:00
Laurent Destailleur
4f4ede2e32 Fix php8.2 warnings 2023-10-15 18:14:14 +02:00
Laurent Destailleur
df454003da FIX php8.2 2023-10-09 15:44:57 +02:00
Laurent Destailleur
f450e23ce6 Clean code: set_paid is deprecated. Replaced with setPaid. 2023-10-09 10:22:49 +02:00
Laurent Destailleur
f0d536ec20 Merge pull request #26139 from artis-auxilium/global_to_function2 
Fix: Change access to $conf->global to function getDolGlobal
 2023-10-09 09:31:12 +02:00
Dev2a
fcd4c4e429 Fix: Change access to $conf->global to function getDolGlobal (automatique) 2023-10-08 23:19:49 +02:00
Laurent Destailleur
9d466793fa Merge pull request #24760 from NextGestion/dolibarr_fixbugs 
NEW Can restore product in stock when deleting the supplier invoice
 2023-10-08 21:58:55 +02:00
Guillaume Wauquier
3b6f4f717c FIX : Update api_supplier_orders.class.php 
Constat : L'api ne renvoie pas le même resultat que l'interface dolibarr. la construction de la requete est incorrecte.

Requete obtenu avant correctif:
SELECT t.rowid, sc.fk_soc, sc.fk_user, t.fk_soc
FROM llx_commande_fournisseur as t,
     llx_societe_commerciaux as sc
WHERE t.entity IN (1) AND t.fk_soc = sc.fk_soc AND t.rowid = sc.fk_soc AND sc.fk_user = 4
ORDER BY t.rowid ASC
LIMIT 101

Le t.rowid = sc.fk_soc compare des endives et des parpaings. => suppression de la ligne 143 à 145.

Et ensuite correction des conditionnelles pour construire une requete correcte.
 2023-10-03 19:37:43 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +02:00
Laurent Destailleur
b8bd760e28 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-10-01 16:06:58 +02:00
Laurent Destailleur
d5443010f2 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-10-01 16:04:16 +02:00
pascal
b271695b3e update phpdoc 2023-09-28 18:00:17 +02:00
pascal
dbfa676e48 FIX #25230 2023-09-28 17:53:23 +02:00
Laurent Destailleur
b9336c024a Merge pull request #25566 from hansemschnokeloch/rest-extra 
Add filter to restrict the data returned
 2023-09-27 00:56:51 +02:00
Laurent Destailleur
7846947f0c Fix ref_supplier must be null if not defined 2023-09-26 23:24:14 +02:00
pascal
80f060c771 fix tab indentation 2023-09-26 18:43:25 +02:00
pascal
871f896962 implementation of properties filter 2023-09-26 18:04:48 +02:00
Laurent Destailleur
68f90319e0 Clean code 2023-09-22 03:24:48 +02:00
Laurent Destailleur
257a961a93 Fix error management 2023-09-22 02:32:23 +02:00
Laurent Destailleur
e9f80875b7 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-22 01:19:49 +02:00
Laurent Destailleur
94f4521f19 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
	htdocs/commande/class/commandestats.class.php
 2023-09-21 19:30:02 +02:00
Laurent Destailleur
cd69bd6cba Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-09-21 19:23:24 +02:00
Laurent Destailleur
a8f10304d0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-09-21 19:22:48 +02:00
Laurent Destailleur
c1c7aedd2c Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-09-21 19:22:21 +02:00
tnegre
08bb3c1a84 FIX : could not delete a fourn commande row if a commande ligne is linked 2023-09-21 14:20:23 +02:00
Laurent Destailleur
69e7f0f1f3 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-19 20:07:36 +02:00
Laurent Destailleur
8f002a2310 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-19 18:14:27 +02:00