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

1600 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
4ff503d20a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/list.php
	htdocs/supplier_proposal/list.php
 2020-04-10 02:07:51 +02:00
Laurent Destailleur
7fe8c7eab3 FIX #11855 2020-04-10 01:37:04 +02:00
Laurent Destailleur
25320e5a36
Merge pull request #13494 from ptibogxiv/patch-321 
NEW display weight in shipment list
 2020-04-05 03:20:56 +02:00
Scrutinizer Auto-Fixer
612bac6598 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-05 00:44:59 +00:00
stickler-ci
a87755390d Fixing style errors. 2020-04-04 10:48:12 +00:00
ptibogxiv
101fd8e07b
NEW display weight in shipment list 
usefull to prepare truck before delivery
 2020-04-04 12:46:02 +02:00
ptibogxiv
84f0c216d1
Update list.php 2020-04-02 20:10:57 +02:00
stickler-ci
8b95e8a702 Fixing style errors. 2020-04-02 17:45:28 +00:00
ptibogxiv
67a1c3ea89
NEW better filter on shipment list as other list 2020-04-02 19:43:29 +02:00
Laurent Destailleur
79b1a2e191
Merge pull request #13457 from oscim/patch-30 
Update expedition.class.php
 2020-04-02 12:57:24 +02:00
Laurent Destailleur
bec231bd7b
Merge pull request #13459 from oscim/patch-31 
Update expedition.class.php
 2020-04-02 12:55:58 +02:00
Laurent Destailleur
b407797ca3 Fix css 2020-03-31 17:45:45 +02:00
stickler-ci
5a62da101d Fixing style errors. 2020-03-31 09:04:46 +00:00
oscim
f66c90ca8b
Update expedition.class.php 
report usage multicurrency of thirdparty in fetch method expedition for use in other  process
 2020-03-31 10:57:52 +02:00
stickler-ci
24c5f57da2 Fixing style errors. 2020-03-31 08:56:26 +00:00
oscim
5895858546
Update expedition.class.php 
report fk_unit line in fetch_line methode
 2020-03-31 10:54:14 +02:00
Laurent Destailleur
5fad4c8cb4 CSS 2020-03-29 19:41:01 +02:00
Laurent Destailleur
c27592bad2 Clean deprecated params on all fetch_optionals() 2020-03-27 16:02:58 +01:00
Laurent Destailleur
d1c6079a7a Fix phpcs 2020-03-24 21:44:47 +01:00
Laurent Destailleur
a5379c7144 FIX All forms must use newToken() 
Conflicts:
	htdocs/commande/card.php
	htdocs/compta/cashcontrol/cashcontrol_card.php
	htdocs/supplier_proposal/card.php
 2020-03-24 13:14:23 +01:00
Laurent Destailleur
1ff15e1fd9 FIX All forms must use newToken() 2020-03-24 13:10:35 +01:00
Laurent Destailleur
c2f0cdc0f6 Look and feel v12. Several minor fixes 2020-03-23 19:35:14 +01:00
Laurent Destailleur
8bab245c7e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/tpl/contacts.tpl.php
 2020-03-18 18:50:55 +01:00
Laurent Destailleur
37fce0d3ee Fix position on merou 
Fix preselected value on contact
 2020-03-14 14:45:37 +01:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Scrutinizer Auto-Fixer
f413ce6aac Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-03-12 11:45:44 +00:00
Laurent Destailleur
e1c7222172 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-09 20:39:05 +01:00
Jean Traullé
7c2bed2846 Fix #13296 2020-03-06 16:22:41 +00:00
Laurent Destailleur
054ffb7547 Depreciate variables not used by Dolibarr. 2020-03-06 14:38:06 +01:00
Laurent Destailleur
7866f89585
Merge pull request #13260 from atm-quentin/FIX_ecm_files 
FIX ecm_files didnt match cause document ref contained "/"
 2020-03-03 23:09:02 +01:00
atm-quentin
9446138951 FIX ecm_files didnt match cause document ref contained "/" 2020-03-03 12:07:18 +01:00
Laurent Destailleur
be3ecb3093 Remove hidden constant MAIN_EXTRAFIELDS_IN_ONE_TD that was useless 2020-02-21 14:32:53 +01:00
Laurent Destailleur
44eda2d4ad Fix doxygen 2020-02-20 13:42:43 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
33addfab01 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-08 17:21:17 +01:00
Francis Appels
0e65d08455 Fix set create_line rang parameter not required 2020-02-07 10:16:56 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
c2c80bf40f Fix Look and feel v11 2020-01-28 02:44:41 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Alexandre SPANGARO
115ca50c13 Merge remote-tracking branch 'upstream/develop' into 11.0_a7 2019-12-23 21:25:43 +01:00
Laurent Destailleur
f45710a4b1 Fix phpcs 2019-12-23 15:51:23 +01:00
Laurent Destailleur
9a08a6bf6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/categories/traduction.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contact/card.php
	htdocs/core/modules/modSociete.class.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/langs/en_US/products.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
	htdocs/margin/tabs/thirdpartyMargins.php
 2019-12-23 14:13:26 +01:00
Laurent Destailleur
eb32e98127 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-12-23 14:01:44 +01:00
Laurent Destailleur
36e6036e9e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-12-23 14:01:00 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Maxime Kohlhaas
3e19702e39 Fix prevent double action on shipment close 2019-12-17 18:05:59 +01:00
Frédéric FRANCE
9e4fb8d4fe
doxygen 2019-12-15 10:02:20 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00