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

587 Commits

Author SHA1 Message Date
Laurent Destailleur
a7125280bc Fix with php-cs-fixer 2023-12-04 12:12:12 +01:00
Laurent Destailleur
1e83b61476 CSS 2023-12-02 19:17:46 +01:00
Laurent Destailleur
7785ae93a1 Fix php8.2 warnings 2023-11-27 11:41:05 +01:00
Laurent Destailleur
d9df238ac4 Clean code and prepare database for reception from any source 2023-11-14 17:33:50 +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
Francis Appels
ee269b4608 FIX: update product with stock to lot or serial type. (#23002) 
* git init

* Fixing style errors.

* Add split of serial defaults

* Fix remaining part

* Fix on  remaining decimal part

* Revert "Fix on  remaining decimal part"

This reverts commit b91f884ddc.

* Revert "Fix remaining part"

This reverts commit 35a6631b29.

* Revert "Add split of serial defaults"

This reverts commit 37009afcbc.

* Remove split for serial numbers and replace by error message.

* Fix stickler CI

* Fix missing product id for lot number fetch

* Allow update for data consistency, but show warning in stock card and stocks by lot/serial list

---------

Co-authored-by: Francis Appels <francis@vps399724.ovh.net.novalocal>
Co-authored-by: stickler-ci <support@stickler-ci.com>
 2023-10-31 11:47:38 +01:00
Laurent Destailleur
8daf1db666 Fix warning 2023-10-18 11:13:11 +02:00
Laurent Destailleur
2fdf26731b Fix php8 error 2023-10-16 21:35:00 +02:00
VIAL-GOUTEYRON Quentin
61afa1c84b NEW : conf to display date entry stock exped and sort in date order (#22625) 
* NEW : Date d'entree en stock sur les exped au moment de la création

* add en trad

* Ajout conf pour la date d'entree en stock

* add trad

* trad

* Fixing style errors.

* modif for only full group by

---------

Co-authored-by: stickler-ci <support@stickler-ci.com>
Co-authored-by: Laurent Destailleur <eldy@destailleur.fr>
 2023-10-16 18:38:37 +02:00
Laurent Destailleur
4f4ede2e32 Fix php8.2 warnings 2023-10-15 18:14:14 +02:00
Laurent Destailleur
c32fe8dc5f QUAL: Use dol_clone with parameter 2 for ->oldcopy 2023-10-11 19:10:24 +02:00
Laurent Destailleur
719e896ee8 css 2023-09-27 20:12:43 +02:00
Laurent Destailleur
7b2240c267 CSS 2023-09-21 19:19:01 +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
924da777bf Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into develop 2023-09-04 23:26:35 +02:00
Laurent Destailleur
55d93b3126 Fix help messages 2023-09-03 22:45:47 +02:00
Laurent Destailleur
4cb97704cc Fix look and feel on shipment/reception 2023-09-03 22:12:34 +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
Christophe Battarel
6f1e9d59ca fix qty check 2023-08-17 15:19:08 +02:00
Christophe Battarel
6f3f75478f fix stupid 2023-08-17 11:14:50 +02:00
Christophe Battarel
d53772f21d add constant to check if qty shipped not greater than qty ordered 2023-08-17 11:11:49 +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
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
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