Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-12 04:21:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

557 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Laurent Destailleur
8ba802ed5d Fix when reverting a shipment validation or closing and stock empty 2023-04-10 15:34:13 +02:00
Laurent Destailleur
f57dfd14c3 Fix label of warehouse no more visible 2023-04-10 15:00:46 +02:00
Laurent Destailleur
f26b5b58c9 Fix error management 2023-04-10 14:27:39 +02:00
Laurent Destailleur
220d404d62 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-04-04 19:40:05 +02:00
Laurent Destailleur
53032fd6ed Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into 17.0 2023-04-01 15:09:30 +02:00
Laurent Destailleur
49eb6089df Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0 2023-04-01 15:03:21 +02:00
Laurent Destailleur
490d372ab9 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 2023-04-01 15:01:41 +02:00
stickler-ci
cb63bbba32 Fixing style errors. 2023-03-29 09:06:53 +00:00
Gauthier PC portable 024
538a6870f1 FIX : it was not possible to update extrafields of expedition lines with batch without editing batch value 2023-03-29 11:00:20 +02:00
marcusdeangabriel
8176deca4f Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-03-20 09:32:56 +01:00
Laurent Destailleur
7976d99c68 Merge branch '17.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-03-18 01:59:13 +01:00
Laurent Destailleur
54d8b9baf4 Clean label of option. Fix css 2023-03-18 00:42:21 +01:00
marcusdeangabriel
02215cdacd Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-03-07 16:04:52 +01:00
Frédéric FRANCE
2f663706cf add pictos 2023-03-03 15:26:32 +01:00
marcusdeangabriel
e04382fba3 Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-02-23 10:18:02 +01:00
Laurent Destailleur
80df9434db Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2023-02-21 02:37:22 +01:00
Maxime Kohlhaas
bd9bb59780 Fix shipment status on card + llxheader 2023-02-20 20:57:46 +01:00
marcusdeangabriel
00ef013b3e Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-02-13 09:24:38 +01:00
Laurent Destailleur
17ae12abfd Fix warning 2023-02-10 21:09:20 +01:00
marcusdeangabriel
da300490cc Merge branch 'Dolibarr:develop' into SHIPMENT_GETS_ALL_ORDER_PRODUCTS 2023-02-06 16:23:45 +01:00
Philippe GRAND
7a1c9b468a fix : Warning: Undefined array key label in /home/httpd/vhosts/aflac.fr/domains/dev.aflac.fr/httpdocs/expedition/card.php on line 340 2023-02-05 17:04:13 +01:00
mgabriel
4ea6e00fd3 Extends SHIPMENT_GETS_ALL_ORDER_PRODUCTS to the "Shipment card." 2023-01-26 11:52:52 +01:00
Laurent Destailleur
48161b8400 Debug v17. Bad param for selection of project 2023-01-17 13:50:23 +01:00
Laurent Destailleur
751f79b672 Debug v17 2022-12-31 14:21:16 +01:00
Laurent Destailleur
65fc311e0f Merge pull request #22613 from FHenry/dev_fix_22581 
FIX: #22581
 2022-10-25 16:03:44 +02:00