Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
131,602 Commits 36 Branches 189 Tags
2b5ea3fa7429b217b51ce43d65eb2d78426e12c1
Commit Graph

2252 Commits

Author SHA1 Message Date
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
Laurent Destailleur
336927ad70 Fix link to create puchase order from sale order 2023-09-19 18:10:47 +02:00
Laurent Destailleur
39dd702145 Fix warning in option WORKFLOW_CAN_CREATE_PURCHASE_ORDER_FROM_SALE_ORDER 2023-09-19 17:59:46 +02:00
Laurent Destailleur
0c3e516e57 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-13 03:08:46 +02:00
Laurent Destailleur
bf3c0e9d4a FIX Avoid duplicate popup when popup setup to work as ajax 2023-09-12 10:52:15 +02:00
Laurent Destailleur
91fa48199a Fix warnings 2023-09-10 17:41:22 +02:00
Laurent Destailleur
876a44703d Fix warning 2023-09-10 17:30:00 +02:00
Laurent Destailleur
9ce32c0213 Merge branch 
'develop_add_all_id_prof_checker_for_code_compta_customer_and_supplier'
of https://github.com/OPEN-DSI/dolibarr into
OPEN-DSI-develop_add_all_id_prof_checker_for_code_compta_customer_and_supplier
 2023-09-09 12:08:41 +02:00
Laurent Destailleur
aab30d7638 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-08 15:33:04 +02:00
Laurent Destailleur
99406caa3a Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 2023-09-08 15:26:21 +02:00
atm-florian
53d43ab50f FIX 17.0 PHP8: supplier invoice class: 
- use declared attribute socid instead of fk_soc
- fk_project should be null, not 0 (would break constraint)
 2023-09-07 14:47:47 +02:00
Joachim Kueter
7e1aa99fa7 Merge branch 'develop' into cashdiscounthooks 2023-08-25 16:30:25 +02:00
Laurent Destailleur
85180a3044 Clean code 2023-08-24 14:55:23 +02:00
Laurent Destailleur
e1c1172da8 Debug v18 2023-08-15 18:27:52 +02:00
Laurent Destailleur
72dbb35d13 Debug v18 2023-08-15 18:25:00 +02:00
Laurent Destailleur
f21c168a84 Removed $brouillon property 2023-08-06 01:16:12 +02:00
Laurent Destailleur
e3e73d9096 Work on renaming libelle into label 2023-08-06 01:14:36 +02:00
Laurent Destailleur
0076ec69b8 The property ->brouillon has been removed from all classes. It was not 
reliable and was a duplicate of ->status == self::STATUS_DRAFT.
 2023-08-06 00:16:25 +02:00
Laurent Destailleur
91982253a0 Clean code 2023-08-05 14:59:31 +02:00
Laurent Destailleur
4431ca659f Debug v18 2023-08-05 14:20:25 +02:00
Laurent Destailleur
df76b9940d Debug v18 2023-08-05 13:27:56 +02:00
NextGestion
9677539e19 Merge branch 'Dolibarr:develop' into dolibarr_fixbugs 2023-07-31 15:19:45 +01:00
onhairech
b920dfdbda qodana fix 4: missing returns (#25334) 
* qodana fix 4: missing returns

* Delete settings.json

* correcting the return  info function

* unreachable code fix

* return fix
 2023-07-25 23:29:34 +02:00
Florent Poinsaut
aa36d9f936 Fix duplicated deletion of linked object in supplier invoice (#25415) 2023-07-23 19:42:19 +02:00
Laurent Destailleur
7a9e70246d Merge pull request #25235 from mc2contributor/fixRights 
Update permissions lookup in vendor module, fixes some warnings
 2023-06-30 09:02:45 +02:00
Roger Dueck
2d997161a5 Update permissions lookup in vendor module, fixes some warnings 2023-06-29 10:45:42 -06:00
Laurent Destailleur
b1e0b317c9 Debug v18 2023-06-29 13:16:44 +02:00
Charlène Benke
11a444f126 php V8 warning 2023-06-25 13:33:35 +02:00
Laurent Destailleur
31474d80f1 Doxygen 2023-06-19 00:52:43 +02:00