Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
126,919 Commits 36 Branches 189 Tags
cb15d8c7beb0db960202c0207fe164e65e59349c
Commit Graph

732 Commits

Author SHA1 Message Date
Frédéric FRANCE
61b79fda17 avoid phpstan error with phpdoc 2023-12-06 15:46:39 +01:00
Laurent Destailleur
a7125280bc Fix with php-cs-fixer 2023-12-04 12:12:12 +01:00
Frédéric FRANCE
adfc58bd7d fix phpstan 2023-12-02 21:18:10 +01:00
Frédéric FRANCE
53c8a3acf8 clean phpdoc for phpstan (#26905) 2023-12-01 19:51:32 +01:00
Laurent Destailleur
7785ae93a1 Fix php8.2 warnings 2023-11-27 11:41:05 +01:00
Laurent Destailleur
574502c6fd Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-11-24 10:23:38 +01:00
Laurent Destailleur
e6eb34a8db Fiw warnings: The private array ->status_short, ->statuts and 
->status_long are now array ->labelStatusShort and ->labelStatus
everywhere.
 2023-11-24 10:10:24 +01:00
Frédéric FRANCE
938afdb06e fix phpstan (#26841) 2023-11-24 09:30:49 +01:00
Frédéric FRANCE
81c22d00f1 fix phpstan (#26809) 2023-11-23 17:24:55 +01:00
Laurent Destailleur
a0bba05b02 Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/api_orders.class.php
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/project.lib.php
	htdocs/fourn/class/api_supplier_orders.class.php
	htdocs/fourn/class/fournisseur.facture-rec.class.php
	htdocs/langs/en_US/stocks.lang
 2023-11-17 18:24:53 +01:00
Laurent Destailleur
5e59e8d0e4 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 18.0 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2023-11-17 00:44:30 +01:00
Günter Lukas
06915267a7 Fix #26620 (#26622) 
Fix calculation of total amount of multicurrency
 2023-11-16 14:59:07 +01:00
Mohamed DAOUD
eba4756156 Fix some warnings -technical debt- (#26514) 
* fix-warnings

* fix the last commit

---------

Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-11-14 01:52:42 +01:00
Laurent Destailleur
7659bba97a Fix bad delete of lines into llx_ecm_files 2023-11-13 12:24:47 +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
ptibogxiv
2adb0b5213 NEW shipment can include service (for information and invoicing) (#26407) 
* NEW shipment can include service (for information and invoicing)

add an optionnal option for include service on shipment because some business need invoicing only from shipment so actually dont get services on invoice autmatically.

this is a first PR for validation of this secret option before upload other PR

* Update shipment.php

* Update card.php
 2023-11-01 15:02:40 +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
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
4f4ede2e32 Fix php8.2 warnings 2023-10-15 18:14:14 +02:00
Christophe Battarel
e2c89ca452 fix shipping ref if already set (#26156) 
Co-authored-by: Christophe Battarel <christophe@altairis.fr>
 2023-10-09 19:52:21 +02:00
Laurent Destailleur
d3dc6615db Remove deprecated use of ->modelpdf (good is ->model_pdf) 2023-10-02 21:49:08 +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
VESSILLER
089d24bef0 FIX sql to create batch from shipping line 2023-09-21 14:30:37 +02:00
Laurent Destailleur
492b726da9 Fix regression with label of order 2023-09-19 20:32:23 +02:00
Laurent Destailleur
60a52d0bc6 Remove TODO 2023-09-13 10:46:18 +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
ec8c2a7d62 Debug dispatch tab 2023-09-13 03:01:18 +02:00
Laurent Destailleur
b35a2e2281 FIX Edition of shipment detail with lot not updating correctly tables 2023-09-12 23:03:52 +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
d91ce60ab4 Merge pull request #25819 from frederic34/setascustomer 
deprecate set_as_client
 2023-09-08 11:23:06 +02:00
Frédéric FRANCE
26dff90658 deprecate set_as_client 2023-09-06 14:38:35 +02:00
Laurent Destailleur
924da777bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-04 23:26:35 +02:00
Laurent Destailleur
b6b1d8acbc Fix error message 2023-09-03 22:34:14 +02:00
Laurent Destailleur
3343a47244 NEW billing on shipment+reception. Can be done before or after delivery. 2023-09-03 21:38:11 +02:00
Laurent Destailleur
247ab6a93e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-09-02 20:54:10 +02:00
Laurent Destailleur
bc53cd7643 Merge pull request #25313 from kubajznik/extrafields-support-selectForForms 
NEW #25312 Support extrafields in selectForForms
 2023-09-02 18:40:14 +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
Jakub Stříbrný
6ec130d2e6 add $isextrafieldmanaged to expedition.class.php 2023-07-26 14:58:55 +02:00
Laurent Destailleur
31474d80f1 Doxygen 2023-06-19 00:52:43 +02:00
Laurent Destailleur
034a0f5c53 Clean code 2023-05-22 18:57:42 +02:00
marcusdeangabriel
cff633ead0 Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-05-22 16:07:20 +02:00
hystepik
507604b597 fix bad function and bad usage 2023-05-17 10:31:34 +02:00
marcusdeangabriel
7333c6d74c Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-05-15 08:19:22 +02:00
hystepik
8245fa44e1 fix php 8.1 warnings 2023-05-02 14:32:18 +02:00
VMR Global Solutions
926aa6fec7 API add / fix filter on extrafields in index() 
Add / change in api_xxx.class.php files the ability to filter on extrafields when missing in the public functions index()
by changing the SQL query with the pattern 
" FROM ".MAIN_DB_PREFIX"xxxx AS t LEFT JOIN ".MAIN_DB_PREFIX."xxxx_extrafields AS ef ON (ef.fk_object = t.rowid)
 2023-04-28 09:31:33 +02:00
marcusdeangabriel
7181ac538d Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-04-24 10:49:50 +02:00