Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
97,383 Commits 36 Branches 189 Tags
904dca335a0da7da1663c3d1b4eb9ff16bd40b97
Commit Graph

1780 Commits

Author SHA1 Message Date
UT from dolibit
828345b69f Update contact.php 
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';

llxHeader('', $langs->trans('Order'), $help_url);
 2021-04-02 20:58:08 +02:00
Laurent Destailleur
6e422d26f3 FIX #yogosha5746 - next step (wip) 2021-03-30 16:20:18 +02:00
Laurent Destailleur
6c98276ead FIX #yogosha5782 2021-03-30 11:26:49 +02:00
Laurent Destailleur
3a4bb69c05 FIX #yogosha5749 2021-03-29 15:32:09 +02:00
Laurent Destailleur
ce1f8289a4 FIX #yogosha5746 2021-03-29 15:07:23 +02:00
Laurent Destailleur
1d48b883a7 Look and feel v14 2021-03-27 13:17:56 +01:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +01:00
Laurent Destailleur
15440917b1 Fix #ygosha5698 2021-03-22 11:30:18 +01:00
Laurent Destailleur
3c8bf2167b Debug permissions 2021-03-21 18:01:43 +01:00
UT from dolibit
d4777e76be Update card.php 
$help_url = 'EN:Module_Shipments|FR:Module_Expéditions|ES:Módulo_Expediciones|DE:Modul_Lieferungen';

llxHeader('', $langs->trans('Shipment'), 'Expedition', $help_url);
 2021-03-16 13:38:46 +01:00
Laurent Destailleur
cc10106a21 Fix protection on int 2021-03-14 12:20:23 +01:00
Laurent Destailleur
3cbced439a Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/compta/bank/line.php
	htdocs/compta/facture/class/facture-rec.class.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/paiement/cheque/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/lib/date.lib.php
	htdocs/core/lib/ticket.lib.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/core/tpl/extrafields_view.tpl.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/cron/list.php
	htdocs/expedition/card.php
	htdocs/mrp/mo_list.php
	htdocs/product/stock/productlot_card.php
	htdocs/public/emailing/mailing-read.php
	htdocs/public/emailing/mailing-unsubscribe.php
	htdocs/ticket/list.php
	test/phpunit/FactureRecTest.php
 2021-03-05 19:29:09 +01:00
Laurent Destailleur
a371647bca FIX picto on shipment to reset qty to 0. Some quantities were not reset. 2021-03-04 08:52:55 +01:00
Laurent Destailleur
3705409d56 Code change to follow modulebuilder template 2021-02-27 18:33:01 +01:00
Frédéric FRANCE
8db4291f88 code syntax expedition directory 2021-02-25 22:38:35 +01:00
Laurent Destailleur
2be6992916 Fix include_once into include for inc.php file. See comment in #16338 2021-02-19 16:10:19 +01:00
Philippe GRAND
2307275d61 standardization, internationalisation 2021-02-09 14:21:39 +01:00
Laurent Destailleur
89bda722bf Merge pull request #16232 from frederic34/paymentvat 
use camelCaps name
 2021-02-09 13:29:40 +01:00
Frédéric FRANCE
04c25a01af deprecate non camelCaps functions 2021-02-09 13:10:11 +01:00
Frédéric FRANCE
898bf55202 Merge remote-tracking branch 'upstream/develop' into facturerec 2021-02-08 20:21:46 +01:00
Frédéric FRANCE
815f3602e3 clean deprecated modelpdf to model_pdf 2021-02-08 18:30:09 +01:00
Laurent Destailleur
8041ef641a Merge branch 'develop' into dev_typent_jax_workcorrectly 2021-02-08 15:29:36 +01:00
Frédéric FRANCE
8d49ca9f0d fix html 2021-02-07 18:49:46 +01:00
Florian HENRY
ec41bf58e5 always ajax now 2021-02-04 09:48:17 +01:00
Laurent Destailleur
b24aac1e6b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
 2021-01-31 12:03:39 +01:00
Laurent Destailleur
044b4eee48 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/expedition/list.php
 2021-01-31 11:54:45 +01:00
Laurent Destailleur
244ee05a9c FIX #14290 #15900 2021-01-30 18:09:13 +01:00
Florian HENRY
d856b0149d Merge branch '13_backport' into develop 2021-01-12 10:08:12 +01:00
Laurent Destailleur
b91bca7022 Fix the source object may have been modified with corrupted data. 2021-01-08 01:56:23 +01:00
Francis Appels
afc85c2f2d Fix expedition class 
- update shipment, tms is auto update field
- wrong vars
- clean code
 2021-01-07 18:24:44 +01:00
quentin
2f932330d3 FIX wrong name for search status param 2021-01-06 10:10:39 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
5e92ed0dcd Fix load lang 2021-01-05 10:44:28 +01:00
Francis Appels
236ff2d4e4 indent 2021-01-03 12:26:10 +01:00
Francis Appels
cbf6fe1f62 Clean code 2021-01-03 11:42:11 +01:00
Francis Appels
799927432c regression for user type on shipment contact 2021-01-03 10:53:48 +01:00
Francis Appels
ade0e008e9 Some debug on Shipments. 
Wrong object status on list paging.
Parameter error on link contact.
nbr Linked files not shown in tab badge.
 2021-01-02 17:42:33 +01:00
Laurent Destailleur
a6eb14f68b Merge pull request #15585 from cfoellmann/fckeditor-notes 
NEW Can toggle FCKeditor on public/private notes
 2020-12-27 15:06:35 +01:00
Laurent Destailleur
3d33d3aa3a Fix warning 2020-12-13 14:36:00 +01:00
Laurent Destailleur
075cacb8cf Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:40:28 +01:00
Laurent Destailleur
aaf1910c25 Fix stock amount can be a decimal 2020-12-08 17:53:12 +01:00
Laurent Destailleur
485fe0fc62 FIX Can receipt of a product that required lot after disabling stock and 
lot module
 2020-12-08 17:51:26 +01:00
Frédéric FRANCE
4e18f46f28 doxygen 2020-12-05 23:53:55 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +01:00
Laurent Destailleur
59b445a103 Clean dead code 2020-11-28 14:47:39 +01:00
Laurent Destailleur
73790a0958 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
 2020-11-27 16:21:32 +01:00
Laurent Destailleur
5ed2bbb204 Fix error message 2020-11-27 16:13:27 +01:00
Laurent Destailleur
d8bf7b2714 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
	htdocs/core/modules/propale/doc/pdf_cyan.modules.php
 2020-11-25 18:04:06 +01:00
Francis Appels
a734e1caa7 line is order line not exp line 2020-11-25 15:06:07 +01:00