Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-26 11:21:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
100,555 Commits 36 Branches 191 Tags
c03958a867d1180e5bcaf99feee94de8acdb334a
Commit Graph

397 Commits

Author SHA1 Message Date
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
fb46ece906 Fix yogosha 6347 2021-06-09 15:36:47 +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
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
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
Laurent Destailleur
e71e5d533d Fix HTML5 2021-04-19 21:30:25 +02:00
Laurent Destailleur
a50b0e7441 Debug inventory module 2021-04-09 13:15:27 +02:00
Laurent Destailleur
047471c220 Remove $_POST war 2021-03-24 19:06:44 +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
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
Frédéric FRANCE
8db4291f88 code syntax expedition directory 2021-02-25 22:38:35 +01:00
Philippe GRAND
2307275d61 standardization, internationalisation 2021-02-09 14:21:39 +01:00
Frédéric FRANCE
04c25a01af deprecate non camelCaps functions 2021-02-09 13:10:11 +01:00
Frédéric FRANCE
8d49ca9f0d fix html 2021-02-07 18:49:46 +01:00
Laurent Destailleur
b91bca7022 Fix the source object may have been modified with corrupted data. 2021-01-08 01:56:23 +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
aaf1910c25 Fix stock amount can be a decimal 2020-12-08 17:53:12 +01:00
Christian Foellmann
f801dd7d66 PR toggle FCKeditor on public/private notes 2020-11-30 16:39:14 +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
Francis Appels
7eec1155a0 Fix issue #15506 tansfer line extrafield order to expedition 2020-11-24 18:58:37 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel" 
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
 2020-11-23 15:12:52 +01:00
Givriz
c48129e279 Ajout de la class "button-save" 
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
 2020-11-19 20:23:38 +01:00
Laurent Destailleur
6bbeb6d3a0 Fix debug creation of shipment with virtual product. 2020-11-16 16:31:05 +01:00
Laurent Destailleur
6c42535eb2 Maxi debug v13 2020-11-16 12:20:18 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Francis Appels
7fa7f0a390 Re-add set_date_livraison as a deprecated function. 
Use correct naming convention for new method naming.
 2020-10-26 16:50:52 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Aurélien
f954e8b173 :mod livraison rename user acces right #14697 2020-10-06 16:10:48 +02:00
Aurélien
c8cd55e158 debug access right after rename class #14697 2020-10-06 15:57:50 +02:00
Aurélien
1af42b313c rename livraison pdf and dependencies #14697 2020-10-06 13:32:02 +02:00
Aurélien
af7c23b2ac rename folder admin/livraison.php and dependencies #14697 2020-10-06 12:05:24 +02:00
Aurélien
5571a166c6 change variable #14697 2020-10-06 11:37:55 +02:00
Aurélien
140200213e change table into DB and ref #14697 2020-10-06 11:04:31 +02:00
Aurélien
c1b0c1f6a2 rename folder ref to Module Delivery 2020-10-05 15:32:29 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
b8fe2188a6 Standardize code around model_pdf 2020-09-10 01:49:09 +02:00
Scrutinizer Auto-Fixer
c263c8a76c Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-08 19:27:28 +00:00