Laurent Destailleur
|
25e034721c
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-07-11 00:06:57 +02:00 |
|
Laurent Destailleur
|
24dc936000
|
Revert "default to create on card.php if $action is empty"
This reverts commit e0b664066b.
|
2022-07-11 00:05:50 +02:00 |
|
Christian Foellmann
|
e0b664066b
|
default to create on card.php if $action is empty
|
2022-07-11 00:01:42 +02:00 |
|
Laurent Destailleur
|
bd3af19978
|
Merge pull request #21335 from atm-GregM/NEW_exped_ObjectLink
NEW add objectLink on expedition
|
2022-07-10 19:33:49 +02:00 |
|
Laurent Destailleur
|
c0977e5ee8
|
Merge pull request #21469 from cfoellmann/PR/card-empty-action
FIX default to create on card.php if $action is empty
|
2022-07-10 18:50:48 +02:00 |
|
Laurent Destailleur
|
cccb453a05
|
Fix doc
|
2022-07-10 18:40:53 +02:00 |
|
Laurent Destailleur
|
8f819abd61
|
Fix doc
|
2022-07-10 18:35:23 +02:00 |
|
Christian Foellmann
|
aaca9bc03d
|
default to create on card.php if $action is empty
|
2022-07-08 09:16:02 +02:00 |
|
Laurent Destailleur
|
a871aa8f85
|
Merge pull request #21382 from fboitel/NEW#20650
NEW #20650 Checkbox column on left for lists
|
2022-07-07 21:48:51 +02:00 |
|
Laurent Destailleur
|
116633ed2f
|
Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-07-07 20:14:47 +02:00 |
|
Laurent Destailleur
|
2f269c75de
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 16.0
Conflicts:
htdocs/compta/facture/list.php
htdocs/langs/fr_FR/bills.lang
|
2022-07-07 20:12:23 +02:00 |
|
Laurent Destailleur
|
f9d13290d5
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
Conflicts:
htdocs/compta/facture/list.php
|
2022-07-07 19:15:58 +02:00 |
|
Christian Foellmann
|
4c5e05e411
|
fix page titles
Conflicts:
htdocs/compta/bank/annuel.php
htdocs/contact/list.php
htdocs/product/stock/movement_list.php
htdocs/user/list.php
|
2022-07-06 19:19:08 +02:00 |
|
Laurent Destailleur
|
76e3c10c06
|
Revert "fix page titles"
|
2022-07-06 15:56:04 +02:00 |
|
Quentin VIAL-GOUTEYRON
|
2e065e1702
|
FIW : add missing thead on table
|
2022-07-05 13:11:36 +02:00 |
|
Laurent Destailleur
|
3f354be119
|
Update shipment.php
|
2022-07-04 01:21:41 +02:00 |
|
Laurent Destailleur
|
18a6f52abb
|
Update shipment.php
|
2022-07-04 01:20:50 +02:00 |
|
stickler-ci
|
7d9ab1b717
|
Fixing style errors.
|
2022-07-02 17:28:16 +00:00 |
|
Lenin Rivas
|
3aa41a25b9
|
Correct Stock in Shipment
|
2022-07-02 12:23:46 -05:00 |
|
Christian Foellmann
|
89d1389e2d
|
fix page titles
|
2022-06-27 12:48:04 +02:00 |
|
Laurent Destailleur
|
cf34d07d5d
|
Update card.php
|
2022-06-27 12:22:46 +02:00 |
|
Laurent Destailleur
|
69cbe48a75
|
doc
|
2022-06-27 12:07:34 +02:00 |
|
Anthony Berton
|
bcdbcf5070
|
Update card.php
|
2022-06-27 11:18:38 +02:00 |
|
Anthony Berton
|
3a8f479db7
|
Update card.php
|
2022-06-27 11:16:50 +02:00 |
|
BB2A Anthony Berton
|
6a80d81d4a
|
FIX
|
2022-06-27 09:11:33 +02:00 |
|
BB2A Anthony Berton
|
b046d92efb
|
STOCK_MUST_BE_ENOUGH_FOR_SHIPMENT
|
2022-06-27 09:00:57 +02:00 |
|
BB2A Anthony Berton
|
324b145833
|
FIX - php V8 expedition card
|
2022-06-27 08:42:33 +02:00 |
|
Laurent Destailleur
|
14832bb543
|
FIX timeout due to too many the same request
|
2022-06-25 04:15:04 +02:00 |
|
Faustin
|
9ede77c0e7
|
NEW #20650 completing checkcolumn on left for expedition list
|
2022-06-24 17:32:28 +02:00 |
|
Frédéric France
|
62c171c26d
|
isModEnabled
|
2022-06-21 20:54:28 +02:00 |
|
atm-GregM
|
e8a5d4f008
|
Merge branch 'develop' into NEW_exped_ObjectLink
|
2022-06-21 15:31:45 +02:00 |
|
GregM
|
8c0b1efce4
|
NEW add objectLink expedition
|
2022-06-21 15:21:45 +02:00 |
|
Laurent Destailleur
|
dd392143e1
|
Fix conf->projet conf->project
|
2022-06-14 17:53:17 +02:00 |
|
Laurent Destailleur
|
b5f77b4035
|
FIX #21237
|
2022-06-14 17:36:42 +02:00 |
|
Laurent Destailleur
|
6c1c8058c1
|
Doc
|
2022-06-14 16:56:03 +02:00 |
|
Frédéric France
|
3fdbce7a31
|
use isModEnabled function
|
2022-06-11 09:46:28 +02:00 |
|
stickler-ci
|
858926d95e
|
Fixing style errors.
|
2022-06-02 08:15:04 +00:00 |
|
jyhere
|
bd1d6de326
|
FIX : array merges in expedition class
|
2022-06-02 10:11:53 +02:00 |
|
Laurent Destailleur
|
4c10c04f9f
|
Merge pull request #20495 from atm-john/new_fix_regression_select_extrafield_search
FIX : regression select extrafield search + fix function name
|
2022-05-24 21:55:33 +02:00 |
|
Maxime Kohlhaas
|
6131d5a2b4
|
Fix scrutinizer
|
2022-05-22 01:19:00 +02:00 |
|
Laurent Destailleur
|
177e8c17fb
|
Fix scrutinizer
|
2022-05-18 11:23:21 +02:00 |
|
Laurent Destailleur
|
4de50da0dd
|
Repare code to forbidden var_dump() into code
|
2022-05-17 14:55:38 +02:00 |
|
Laurent Destailleur
|
6592eb5d73
|
Debug for php 8.1
|
2022-05-08 18:25:22 +02:00 |
|
Laurent Destailleur
|
fa7254be9a
|
Fix picto and perm
|
2022-05-03 17:05:14 +02:00 |
|
Laurent Destailleur
|
770a0fbe8d
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-04-11 17:34:40 +02:00 |
|
Laurent Destailleur
|
480fda43c5
|
Clean code
|
2022-04-11 17:34:19 +02:00 |
|
Laurent Destailleur
|
139c5a4327
|
Merge pull request #19518 from 1ocate/1ocateAddShipmentclose
NEW Mass action close shipment
|
2022-04-11 16:49:34 +02:00 |
|
Laurent Destailleur
|
af5444dc91
|
FIX ref not set in message of closing shipment
|
2022-04-11 16:48:56 +02:00 |
|
Laurent Destailleur
|
4fc07d96d8
|
Merge pull request #20519 from joseplluis/patch-11
BUG expedition and warehouse with children
|
2022-04-02 16:22:23 +02:00 |
|
Laurent Destailleur
|
5b91ae062f
|
All triggers with a name XXX_UPDATE have been renamed XXX_MODIFY for
code consistency purpose.
|
2022-04-02 10:31:58 +02:00 |
|
Josep Lluís
|
eb14d1d31f
|
BUG expedition and warehouse with childen
if a warehouse was selected by user, picking is limited to this warehouse and his children (same check is done in products without batch)
|
2022-04-01 16:37:32 +02:00 |
|
ATM john
|
c1d9ea95dc
|
fix function name
|
2022-03-30 12:16:17 +02:00 |
|
Laurent Destailleur
|
95dc25587c
|
Standardize code of the fetch_lines()
|
2022-03-28 13:50:47 +02:00 |
|
Laurent Destailleur
|
4a80f35aaa
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2022-03-23 17:26:25 +01:00 |
|
Ferran Marcet
|
ccf8b01020
|
Fix: The origin of the stock movement is not being recorded
|
2022-03-22 13:46:55 +01:00 |
|
stickler-ci
|
aec5f4da13
|
Fixing style errors.
|
2022-03-21 11:25:46 +00:00 |
|
GregM
|
362352b198
|
replacing to dolGetButtonAction on Expedition card
|
2022-03-21 12:18:36 +01:00 |
|
Laurent Destailleur
|
6bb49797f8
|
Merge pull request #20243 from JohnXLivingston/fix_template_name_typo
Fix: typo in template name
|
2022-03-07 14:55:02 +01:00 |
|
Laurent Destailleur
|
893e1571b8
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-03-04 22:43:35 +01:00 |
|
Laurent Destailleur
|
c45d6a3bc7
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-03-04 19:45:02 +01:00 |
|
Laurent Destailleur
|
792dcc6334
|
FIX creation of the shipment if order contains services - 2/2
|
2022-03-04 19:14:57 +01:00 |
|
John Livingston
|
1ece554c92
|
Fix: typo in template name
There was a typo in generated HTML comment.
|
2022-03-01 17:39:38 +01:00 |
|
Laurent Destailleur
|
70a18bc15a
|
FIX creation of the shipment if order contains services
|
2022-03-01 01:28:47 +01:00 |
|
Laurent Destailleur
|
0d024147bf
|
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2022-02-28 22:36:31 +01:00 |
|
Francis Appels
|
c242a0561b
|
Fix shipping list, e.shipping_method_id should be e.fk_shipping_method.
Disabled searchall for shipping method, does not work.
|
2022-02-25 16:11:16 +01:00 |
|
Laurent Destailleur
|
e96061dd18
|
Fix phpunit SecurityTest
|
2022-02-22 23:46:57 +01:00 |
|
Frédéric FRANCE
|
c8640f329e
|
add missing global
|
2022-02-15 18:31:05 +01:00 |
|
Frédéric FRANCE
|
0ba912b1e5
|
add missing global
|
2022-02-15 18:14:44 +01:00 |
|
Frédéric FRANCE
|
c474ee216f
|
Update expedition.class.php
|
2022-02-15 11:15:34 +01:00 |
|
Laurent Destailleur
|
6b5c0769b8
|
FIX #19786
|
2022-01-24 14:09:53 +01:00 |
|
Laurent Destailleur
|
91b2d59458
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-01-14 10:37:41 +01:00 |
|
Laurent Destailleur
|
53e65095a7
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/commande/card.php
htdocs/expedition/card.php
htdocs/fourn/commande/card.php
htdocs/fourn/commande/list.php
htdocs/fourn/facture/card.php
|
2022-01-14 10:36:46 +01:00 |
|
Laurent Destailleur
|
9dde80dd52
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/expedition/card.php
htdocs/fourn/commande/list.php
|
2022-01-14 10:30:39 +01:00 |
|
Laurent Destailleur
|
13510b9929
|
Clean sortfield, sortorder
|
2022-01-13 11:17:25 +01:00 |
|
Laurent Destailleur
|
f51720879b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
|
2022-01-13 11:05:57 +01:00 |
|
Laurent Destailleur
|
dc3670bc91
|
Clean search_status
|
2022-01-13 11:00:52 +01:00 |
|
Marc de Lima Lucio
|
b110ca6ead
|
FIX: order to shipment: FIX hidden conf SHIPMENT_GETS_ALL_ORDER_PRODUCTS (still not working when not preselecting a warehouse)
|
2022-01-12 16:40:43 +01:00 |
|
Laurent Destailleur
|
79fbe7488e
|
Merge pull request #19721 from grandoc/new_branch_01_01_2022
Fix : Fatal error: Uncaught Error: Call to a member function deleteFr…
|
2022-01-06 16:04:18 +01:00 |
|
iouston
|
f91c376a7c
|
minor change on getNextNumRef doc block
|
2022-01-04 16:44:13 +01:00 |
|
Laurent Destailleur
|
ef56631c80
|
FIX #yogosha8186
|
2022-01-03 18:15:19 +01:00 |
|
Philippe GRAND
|
17d1fa190f
|
Fix : Fatal error: Uncaught Error: Call to a member function deleteFromShipment() on null in /home/httpd/vhosts/doliweb.com/httpdocs/expedition/class/expedition.class.php on line 1463
|
2022-01-01 15:27:20 +01:00 |
|
Laurent Destailleur
|
0387b9922e
|
FIX error message on sqlfilter in API
|
2021-12-20 20:49:32 +01:00 |
|
Laurent Destailleur
|
d80f83caf4
|
Clean code
|
2021-12-09 17:19:31 +01:00 |
|
Laurent Destailleur
|
e983ba58f9
|
Merge pull request #19534 from Hystepik/develop#3
Fix : php8.0 warning
|
2021-12-08 18:51:51 +01:00 |
|
Laurent Destailleur
|
90cff6aed9
|
Update list.php
|
2021-12-08 18:50:42 +01:00 |
|
Laurent Destailleur
|
51e7484d55
|
Fix var not defined
|
2021-12-08 18:49:57 +01:00 |
|
Laurent Destailleur
|
ea45fdce5c
|
Merge pull request #19535 from Hystepik/develop#4
Fix : php 8.0 warnings
|
2021-12-08 18:44:16 +01:00 |
|
Laurent Destailleur
|
72dc560ce8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-12-08 18:27:28 +01:00 |
|
Laurent Destailleur
|
69cd7ae2ab
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/don/card.php
htdocs/public/test/badges.php
htdocs/public/test/test_exec.php
|
2021-12-08 18:27:03 +01:00 |
|
Laurent Destailleur
|
990882e264
|
Merge branch 'develop' into Debug_15
|
2021-12-08 15:53:33 +01:00 |
|
Laurent Destailleur
|
6886cca1fa
|
CSS
|
2021-12-07 02:35:46 +01:00 |
|
Francis Appels
|
5803060caf
|
Fix shipment delete
|
2021-12-06 14:43:11 +01:00 |
|
lmarcouiller
|
ed7bfb333b
|
fix php8.0 errors
|
2021-12-01 16:24:57 +01:00 |
|
lmarcouiller
|
4c92af9aca
|
fix php8.0 warnings
|
2021-12-01 15:24:25 +01:00 |
|
Jay Yeo
|
f3fa611d34
|
Merge branch 'Dolibarr:develop' into 1ocateAddShipmentclose
|
2021-11-30 23:05:11 +07:00 |
|
Lucas Marcouiller
|
1c4a7a00cb
|
fix php8.0 warning
|
2021-11-30 16:35:46 +01:00 |
|
atm-greg
|
db06de0ac2
|
add printFieldListHaving hook
|
2021-11-30 16:28:21 +01:00 |
|
Laurent Destailleur
|
8bace4c64e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-11-30 16:24:42 +01:00 |
|
Laurent Destailleur
|
a298a845f1
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/bookkeeping/list.php
htdocs/core/actions_massactions.inc.php
htdocs/core/lib/functions.lib.php
htdocs/core/lib/memory.lib.php
htdocs/langs/en_US/holiday.lang
htdocs/ticket/card.php
|
2021-11-30 16:24:18 +01:00 |
|
stickler-ci
|
31dd11c9c0
|
Fixing style errors.
|
2021-11-30 13:11:28 +00:00 |
|
Jay Yeo
|
169f5e6ad6
|
Update list.php
|
2021-11-30 20:08:56 +07:00 |
|
stickler-ci
|
48c4ddf347
|
Fixing style errors.
|
2021-11-30 10:51:09 +00:00 |
|
1ocate
|
4fb125703a
|
For easy close shipment
|
2021-11-30 17:46:06 +07:00 |
|
Laurent Destailleur
|
efe4b2363a
|
Merge pull request #19514 from atm-greg/FIX_Uniformize_printFieldListFrom_hook
uniformize hooks behaviour
|
2021-11-30 11:20:22 +01:00 |
|
atm-greg
|
71d4b3f082
|
add hook // Add from hooks
|
2021-11-29 17:02:57 +01:00 |
|
atm-greg
|
1dffc1c0fa
|
add hook to uniformize printFieldListFrom hook
|
2021-11-29 16:54:26 +01:00 |
|
Christian Foellmann
|
6608f5f0d8
|
update all script tags to be uniform. language="javascript" removed
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
|
2021-11-29 15:09:18 +01:00 |
|
Laurent Destailleur
|
441af6b6fb
|
Fix add rel="noopener noreferrer"
|
2021-11-22 02:35:55 +01:00 |
|
Laurent Destailleur
|
48d7378282
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/comm/action/card.php
htdocs/core/lib/functions.lib.php
htdocs/filefunc.inc.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/langs/ar_IQ/bills.lang
htdocs/langs/ar_IQ/cashdesk.lang
htdocs/langs/ar_IQ/modulebuilder.lang
htdocs/langs/ar_IQ/partnership.lang
htdocs/langs/ar_IQ/propal.lang
htdocs/langs/ar_IQ/stocks.lang
htdocs/langs/ar_IQ/ticket.lang
htdocs/langs/en_AE/admin.lang
htdocs/langs/en_US/receptions.lang
htdocs/langs/en_ZA/admin.lang
htdocs/product/stock/class/mouvementstock.class.php
htdocs/reception/class/reception.class.php
|
2021-11-19 23:14:39 +01:00 |
|
Laurent Destailleur
|
271f42e761
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.facture.class.php
htdocs/societe/list.php
|
2021-11-19 10:06:35 +01:00 |
|
Laurent Destailleur
|
e7a4f04da4
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2021-11-18 21:41:12 +01:00 |
|
Laurent Destailleur
|
8f96383186
|
Update expedition.class.php
|
2021-11-18 20:10:04 +01:00 |
|
Ferran Marcet
|
db975bbcc2
|
Fix: The error not correctly collected on insertation line failure
|
2021-11-18 17:17:00 +01:00 |
|
Laurent Destailleur
|
fe7e1d4118
|
Look and feel v15
|
2021-10-29 09:40:38 +02:00 |
|
Laurent Destailleur
|
ad2e567571
|
Fix bug huntr.dev
|
2021-10-25 15:32:10 +02:00 |
|
Laurent Destailleur
|
98f4f0b1c9
|
Merge
|
2021-10-25 11:52:24 +02:00 |
|
Laurent Destailleur
|
f2cd7a7a56
|
Removed the div class="ficheaddleft"
|
2021-10-24 00:37:37 +02:00 |
|
Laurent Destailleur
|
8604f9b153
|
Clean DOM (remove ficheaddleft div)
|
2021-10-23 17:18:35 +02:00 |
|
Frédéric FRANCE
|
46c4f28478
|
fix multiple warnings
|
2021-10-22 22:15:59 +02:00 |
|
Laurent Destailleur
|
12d211815b
|
Debug v15
|
2021-10-19 21:38:36 +02:00 |
|
Laurent Destailleur
|
c40a73162e
|
Look and feel v15
|
2021-10-18 21:20:58 +02:00 |
|
Laurent Destailleur
|
dd0809b528
|
Fix trans labels status
|
2021-10-16 19:37:57 +02:00 |
|
Laurent Destailleur
|
f8010dfcbc
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/reception/list.php
htdocs/takepos/pay.php
|
2021-10-16 13:01:03 +02:00 |
|
Laurent Destailleur
|
4e9c7c9efb
|
FIX Attachment of pdf into shipment when sending email
|
2021-10-11 20:04:45 +02:00 |
|
Florian HENRY
|
677002e834
|
fix travis
|
2021-10-07 20:20:29 +02:00 |
|
Laurent Destailleur
|
520a4f55f8
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
|
2021-10-06 18:34:03 +02:00 |
|
Laurent Destailleur
|
cb84eef6dc
|
Update shipment.php
|
2021-10-06 16:13:02 +02:00 |
|
Laurent Destailleur
|
4208964153
|
Merge branch 'develop' into patch-10
|
2021-10-06 16:09:54 +02:00 |
|
Laurent Destailleur
|
fa57191702
|
Fix regressions
|
2021-09-27 20:09:43 +02:00 |
|
Laurent Destailleur
|
d4cc60640b
|
Clean code
|
2021-09-27 15:41:58 +02:00 |
|
Laurent Destailleur
|
37603b451a
|
Fix token in url
|
2021-09-27 12:24:01 +02:00 |
|
Laurent Destailleur
|
d38c3028eb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/class/expensereport.class.php
|
2021-09-23 02:41:53 +02:00 |
|
Laurent Destailleur
|
deb1965cd5
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/action/card.php
htdocs/compta/paiement/list.php
htdocs/core/class/commonobject.class.php
htdocs/mrp/mo_list.php
htdocs/projet/tasks/task.php
htdocs/public/payment/newpayment.php
|
2021-09-20 17:15:12 +02:00 |
|
ksar
|
131677a5ea
|
FIX #18735
File preview is not working
|
2021-09-20 11:50:10 +02:00 |
|
Laurent Destailleur
|
6af9f3b142
|
Fix css
|
2021-09-19 21:18:30 +02:00 |
|
Laurent Destailleur
|
3dc3214047
|
CSS
|
2021-09-19 21:13:27 +02:00 |
|
Laurent Destailleur
|
d760686239
|
Fix case of newtoken()
|
2021-09-18 22:24:00 +02:00 |
|
Laurent Destailleur
|
0749d01c5a
|
Fix add action delete* as sensitive action
|
2021-09-18 22:04:41 +02:00 |
|
Laurent Destailleur
|
8bdc53f469
|
Fix Add action classify as sensitive actions
|
2021-09-18 20:49:24 +02:00 |
|
Laurent Destailleur
|
62b721a904
|
Add deletecontact as sentitive action
Replace dol_buildpath with DOL_URL_ROOT
|
2021-09-18 19:34:46 +02:00 |
|
Laurent Destailleur
|
8909702619
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/class/adherent.class.php
htdocs/bom/class/bom.class.php
htdocs/filefunc.inc.php
htdocs/langs/en_US/eventorganization.lang
htdocs/product/class/productfournisseurprice.class.php
|
2021-09-16 13:40:05 +02:00 |
|
Laurent Destailleur
|
5b07be0179
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
htdocs/expedition/class/expedition.class.php
htdocs/holiday/list.php
|
2021-09-16 13:33:49 +02:00 |
|
Laurent Destailleur
|
724badb522
|
Fix deletion of shipment when there is batch record
|
2021-09-15 13:29:19 +02:00 |
|
Laurent Destailleur
|
11b6259130
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/holiday/class/holiday.class.php
htdocs/langs/en_US/admin.lang
|
2021-09-10 11:40:45 +02:00 |
|
|
|
63abe2f1ff
|
FIX #18666 Order / Shipment list: Don't SQL JOIN category table when not necessary.
|
2021-09-09 19:56:28 +04:00 |
|
Laurent Destailleur
|
ee066ad725
|
Cast sql var
|
2021-09-03 21:25:43 +02:00 |
|
Frédéric FRANCE
|
18d61574d3
|
fix tooltip info
|
2021-09-02 12:40:05 +02:00 |
|
Laurent Destailleur
|
e71ff148ba
|
Fix phpcs
|
2021-08-28 18:42:26 +02:00 |
|
Laurent Destailleur
|
fb8723d884
|
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons
replace remaining SubmitCancel buttons
|
2021-08-28 18:39:06 +02:00 |
|
Laurent Destailleur
|
c1d3ddf10b
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-08-28 18:31:06 +02:00 |
|
Laurent Destailleur
|
bb94ea7334
|
Fix debug car reception: Fill/reset link, colspan, translation
|
2021-08-28 17:24:05 +02:00 |
|
stickler-ci
|
e60cf96c8e
|
Fixing style errors.
|
2021-08-28 14:35:01 +00:00 |
|
Laurent Destailleur
|
31ca781236
|
Update card.php
|
2021-08-28 16:34:38 +02:00 |
|
stickler-ci
|
2ddebc123a
|
Fixing style errors.
|
2021-08-28 14:32:44 +00:00 |
|
Laurent Destailleur
|
faf1d52d91
|
Update card.php
|
2021-08-28 16:32:22 +02:00 |
|
stickler-ci
|
74ed754fcc
|
Fixing style errors.
|
2021-08-28 07:22:25 +00:00 |
|
henrynopo
|
c219b8f576
|
Update card.php
|
2021-08-28 15:19:45 +08:00 |
|
Laurent Destailleur
|
2dd91bf312
|
Clean code
|
2021-08-27 23:36:06 +02:00 |
|
Laurent Destailleur
|
46d993c9a6
|
Clean code
|
2021-08-27 22:42:04 +02:00 |
|
Laurent Destailleur
|
3b6559b1a6
|
Clean code by adding cast int.
|
2021-08-27 18:53:45 +02:00 |
|
Laurent Destailleur
|
2f225ee7e5
|
Clean code by adding cast int.
|
2021-08-27 16:33:03 +02:00 |
|
henrynopo
|
2c7a788678
|
Update shipment.php
|
2021-08-27 11:09:10 +08:00 |
|
henrynopo
|
a0c9cf2d8d
|
Update card.php
|
2021-08-26 12:31:20 +08:00 |
|
Christian Foellmann
|
f094b4c70c
|
fix up most of the remaining submit inputs
|
2021-08-24 17:04:17 +02:00 |
|
Laurent Destailleur
|
07053d8605
|
Fix sql injection
|
2021-08-24 16:38:39 +02:00 |
|
Laurent Destailleur
|
9752819fe3
|
Merge pull request #18342 from atm-gauthier/NEW_shpping_method_and_trackingurl_on_shipping_list
NEW : display shipping method and tracking url on shipment list
|
2021-08-24 15:54:21 +02:00 |
|
Laurent Destailleur
|
22339a3ed3
|
Merge pull request #18451 from cfoellmann/PR/form-buttons-function
improve forms - buttonsSaveCreate()
|
2021-08-24 15:26:03 +02:00 |
|
Laurent Destailleur
|
dc006b0ebb
|
Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.form.class.php
|
2021-08-23 19:44:02 +02:00 |
|
Laurent Destailleur
|
8485fee5f9
|
Cast numeric into on sql request
|
2021-08-23 19:33:24 +02:00 |
|
Laurent Destailleur
|
23829ae637
|
Cast numeric into on sql request
|
2021-08-23 18:56:46 +02:00 |
|
Laurent Destailleur
|
d4b5ee6c85
|
Fix cast into variable into sql request.
|
2021-08-23 17:41:11 +02:00 |
|
Christian Foellmann
|
d706c3b1ec
|
use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination
|
2021-08-20 14:41:30 +02:00 |
|
stickler-ci
|
ee55a7de5a
|
Fixing style errors.
|
2021-08-04 15:50:59 +00:00 |
|
Gauthier PC portable 024
|
7b702d19d4
|
NEW : display shipping method and tracking url on shipemnt list
|
2021-08-04 17:47:40 +02:00 |
|
Laurent Destailleur
|
1a0eeaf701
|
Fix phpcs
|
2021-08-03 16:35:47 +02:00 |
|
Laurent Destailleur
|
115b0e6831
|
Update api_shipments.class.php
|
2021-08-03 15:07:16 +02:00 |
|
|
|
d1f9762ca9
|
CLOSE #18319 REST API - Shipment: Add 'close' action / endpoint / POST method.
Allow "closing" a shipment through the REST API.
|
2021-08-03 13:37:28 +04:00 |
|
stickler-ci
|
84493fb55d
|
Fixing style errors.
|
2021-07-11 07:47:32 +00:00 |
|
fr69400
|
cd55445905
|
Update note.php
|
2021-07-11 09:47:17 +02:00 |
|
stickler-ci
|
4272f93aa4
|
Fixing style errors.
|
2021-07-09 16:41:41 +00:00 |
|
fr69400
|
e45d5c1d0d
|
NEW add hookmanager on note pages
|
2021-07-09 18:36:21 +02:00 |
|
Laurent Destailleur
|
23c0edf854
|
Merge pull request #17784 from atm-john/new_expedition_warehouse_auto_picking
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
|
2021-06-20 12:55:30 +02:00 |
|
Laurent Destailleur
|
34cebe6aa3
|
Look and feel v14
|
2021-06-14 01:11:39 +02:00 |
|
Laurent Destailleur
|
fb46ece906
|
Fix yogosha 6347
|
2021-06-09 15:36:47 +02:00 |
|
Laurent Destailleur
|
fa4786a3f6
|
Fix permission
|
2021-06-08 16:19:21 +02:00 |
|
Laurent Destailleur
|
2586fcd1a3
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commandestats.class.php
htdocs/core/actions_massactions.inc.php
htdocs/core/modules/propale/doc/pdf_cyan.modules.php
htdocs/holiday/month_report.php
htdocs/product/class/product.class.php
htdocs/product/stock/class/mouvementstock.class.php
htdocs/societe/list.php
|
2021-06-04 11:20:38 +02:00 |
|
Laurent Destailleur
|
8c9bec3e3b
|
Code comment
|
2021-06-04 10:29:30 +02:00 |
|
ATM john
|
3aca9bdb9e
|
Fix warehouse id
|
2021-06-02 12:02:27 +02:00 |
|
ATM john
|
f13388122c
|
Add fetch stock order
|
2021-06-01 21:43:05 +02:00 |
|
stickler-ci
|
3cc65989c1
|
Fixing style errors.
|
2021-06-01 07:25:29 +00:00 |
|
ATM john
|
cf9c9ec882
|
fix condition
|
2021-06-01 09:07:05 +02:00 |
|
ATM john
|
a5c2ce1727
|
NEW/FIX : Allow auto picking for child warehouse and taking into account of the quantities already affected in list
|
2021-06-01 08:45:45 +02:00 |
|
Laurent Destailleur
|
4768729c09
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/list.php
htdocs/commande/list.php
htdocs/compta/facture/list.php
htdocs/core/class/rssparser.class.php
htdocs/core/tpl/admin_extrafields_view.tpl.php
htdocs/core/tpl/extrafields_list_search_sql.tpl.php
htdocs/expedition/list.php
|
2021-05-17 07:57:32 +02:00 |
|
Laurent Destailleur
|
6bf66adff0
|
Fix remove some $_REQUEST
|
2021-05-17 07:27:02 +02:00 |
|
stickler-ci
|
50d4d28c14
|
Fixing style errors.
|
2021-05-14 11:54:50 +00:00 |
|
Ferran Marcet
|
ce6df0ee4a
|
FIX: Filter of the dates in the lists is lost
|
2021-05-14 13:50:12 +02:00 |
|
Alexandre SPANGARO
|
a67ab81b4d
|
Merge remote-tracking branch 'upstream/develop' into 14b4
|
2021-05-11 07:03:18 +02:00 |
|
Laurent Destailleur
|
f8581a1a01
|
Look and feel v14
|
2021-05-10 19:33:45 +02:00 |
|
Laurent Destailleur
|
23d19a8af3
|
Fix permissions
|
2021-05-10 19:20:17 +02:00 |
|
Alexandre SPANGARO
|
14d743db1e
|
Fix Title customer order sendings card
|
2021-05-09 22:41:52 +02:00 |
|