lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
95,981 Commits 43 Branches 150 Tags 886 MiB
dc5557e4f7
Commit Graph

1769 Commits

Author SHA1 Message Date
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
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
Laurent Destailleur
fe0764be6e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/expedition/class/expedition.class.php
	htdocs/product/class/product.class.php
 2020-11-22 02:32:47 +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
4ae121d870 FIX Can't create shipment for virtual product. Add 
STOCK_EXCLUDE_VIRTUAL_PRODUCTS as a quick hack to solve this.
 2020-11-16 19:43:45 +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
c96fd8c727
fix warnings 2020-11-15 16:58:40 +01:00
Laurent Destailleur
6536208a14
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile 
NEW include tpl for loading lang file for extra fields in list
 2020-11-10 14:42:21 +01:00
Scrutinizer Auto-Fixer
f6e3f58fcb Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-11-09 14:18:56 +00:00
Laurent Destailleur
a9fbe9dd6c Fix remove warning 2020-11-08 00:18:41 +01:00