Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
122,879 Commits 36 Branches 189 Tags
42fea0090d2a01db644f6a2ae7e3baffdba1f16c
Commit Graph

2190 Commits

Author SHA1 Message Date
Laurent Destailleur
e6d77f991d Fix warning qodana 2023-06-29 13:47:28 +02:00
Laurent Destailleur
b0921fe8fe Merge pull request #25206 from vold-lu/fix_update_extrafield_expeditiondet 
FIX : Can update extrafield of expedition det with lot
 2023-06-28 16:27:00 +02:00
Laurent Destailleur
ef64e1dcfc Debug v18 2023-06-28 11:50:28 +02:00
Jyhere
b0857ea709 FIX: missing nbfield++ on some columns 2023-06-27 12:07:58 +02:00
Rémi Champlon
c9d98cf045 fix 2023-06-27 07:16:45 +02:00
Rémi Champlon
62b3cfd0c8 remvoe checks 2023-06-27 07:15:42 +02:00
Laurent Destailleur
e2fd64d47c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-06-27 01:08:48 +02:00
Laurent Destailleur
35e066ff8b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-06-27 01:05:04 +02:00
Rémi Champlon
cadf79be75 fix update extrafield of expedition det 2023-06-26 18:03:54 +02:00
Maxime Kohlhaas
301311fb92 New fix for #24882 2023-06-23 10:39:01 +02:00
Maxime Kohlhaas
5b6464168a FIX : decimal values were not possible on shipment quantities (introduced by #24882) 2023-06-23 10:26:21 +02:00
Frédéric France
647708a9bc use user hasRight 2023-06-19 23:05:59 +02:00
Laurent Destailleur
31474d80f1 Doxygen 2023-06-19 00:52:43 +02:00
Frédéric FRANCE
d66ed4adf9 use isModEnabled 2023-06-09 13:47:07 +02:00
Frédéric France
5a018d715d use user hasRight 2023-06-06 00:05:02 +02:00
Laurent Destailleur
8d7e53a98c Clean code 2023-06-03 13:56:06 +02:00
Laurent Destailleur
cd4a589afe Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-26 11:33:10 +02:00
Laurent Destailleur
fdd3c0580c Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-05-26 11:18:08 +02:00
Benjamin Falière
a47f59c5ad FIX error expedition qty 0 2023-05-25 17:58:21 +02:00
Laurent Destailleur
47b776195e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-05-23 01:38:32 +02:00
Laurent Destailleur
034a0f5c53 Clean code 2023-05-22 18:57:42 +02:00
Laurent Destailleur
55eedb7fd3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2023-05-22 18:52:42 +02:00
Laurent Destailleur
58238166d8 Debug v17 2023-05-22 16:48:06 +02:00
marcusdeangabriel
cff633ead0 Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-05-22 16:07:20 +02:00
Laurent Destailleur
5d39fe8926 Merge pull request #24717 from Hystepik/develop#1 
New : Dispatch card on expedition object
 2023-05-22 15:44:30 +02:00
hystepik
507604b597 fix bad function and bad usage 2023-05-17 10:31:34 +02:00
Laurent Destailleur
476f95c4f6 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/subscription/list.php
	htdocs/comm/action/index.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/cron/class/cronjob.class.php
	htdocs/eventorganization/class/conferenceorbooth.class.php
	htdocs/modulebuilder/template/myobject_list.php
	htdocs/public/ticket/list.php
	htdocs/supplier_proposal/list.php
	htdocs/ticket/class/ticket.class.php
 2023-05-17 00:57:17 +02:00
Laurent Destailleur
77b976163c Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/expedition/card.php
 2023-05-17 00:37:40 +02:00
Laurent Destailleur
c8186209ad Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
	htdocs/install/mysql/tables/llx_overwrite_trans.key.sql
	htdocs/projet/tasks.php
	htdocs/projet/tasks/time.php
 2023-05-17 00:36:12 +02:00
marcusdeangabriel
7333c6d74c Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-05-15 08:19:22 +02:00
hystepik
44856cc6ea Fix Ci 2023-05-09 16:05:15 +02:00
hystepik
2b2b722ead add verification on batchcode 2023-05-09 15:37:49 +02:00
hystepik
1b75dc54b4 can update and create 2023-05-09 11:04:53 +02:00
Laurent Destailleur
864399c08a Debug v18 2023-05-03 14:39:34 +02:00
hystepik
8245fa44e1 fix php 8.1 warnings 2023-05-02 14:32:18 +02:00
Laurent Destailleur
4028b5d568 Clean code 2023-04-29 13:13:12 +02:00
Laurent Destailleur
be835d63ed Merge pull request #24635 from VMR-Global-Solutions/develop 
API add / fix filter on extrafields in index()
 2023-04-28 20:02:09 +02:00
Laurent Destailleur
e74c50aa8a Clean code 2023-04-28 16:05:25 +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
Laurent Destailleur
c891196b5b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-04-25 21:02:01 +02:00
Laurent Destailleur
0bc8227f48 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-25 20:54:15 +02:00
Laurent Destailleur
2e3e6f6899 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-04-25 20:51:40 +02:00
Laurent Destailleur
10e38ec7f9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-04-25 19:14:33 +02:00
marcusdeangabriel
7181ac538d Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-04-24 10:49:50 +02:00
Christophe Battarel
d7436d5d8c fix test 2023-04-18 16:38:13 +02:00
Christophe Battarel
3de0a682c1 FIX for empty shipping 2023-04-18 16:31:58 +02:00
Laurent Destailleur
8e51bf2c55 Debug 18 2023-04-18 14:04:27 +02:00
marcusdeangabriel
4816522757 Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-04-11 07:51:01 +02:00
Laurent Destailleur
18b78d28ab Clean content of column "Already shipped into other shipment" 2023-04-10 18:56:33 +02:00
Laurent Destailleur
90bca8b4d7 NEW Can go back to draft on shipment when stock change not on validate 2023-04-10 15:55:58 +02:00