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

1927 Commits

Author SHA1 Message Date
Laurent Destailleur
96a213ced7 Fix escaping html 2021-02-17 11:54:34 +01:00
Laurent Destailleur
eae232da50 Fix sql error 2021-02-09 19:16:26 +01:00
Laurent Destailleur
6892ad9630 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
 2021-02-08 17:25:05 +01:00
Laurent Destailleur
a143635f53 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-02-08 17:20:17 +01:00
Laurent Destailleur
21d3519d42 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-02-07 20:13:38 +01:00
Maxime Kohlhaas
414a2366fb Fix links to go back on supplier invoice list 2021-02-07 19:28:00 +01:00
Maxime Kohlhaas
0e1353733d Fix #15940 mixing different joins 2021-02-07 19:21:52 +01:00
Laurent Destailleur
3b8b0d59ba
Merge pull request #16142 from OPEN-DSI/fix_erreur_facture_fourn 
FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql
 2021-02-03 20:24:44 +01:00
Laurent Destailleur
348fd0fcb5 FIX #16160 2021-02-03 19:36:10 +01:00
kamel
506ba822e9 FIX: Select transport mode function when create a supplier invoice and add unique key to the table llx_c_transport_mode in migrate sql 2021-02-02 11:06:01 +01:00
Laurent Destailleur
32c33b72d6 FIX Sql error in group by with postgresql 2021-01-28 16:10:13 +01:00
Laurent Destailleur
7d37183f21 FIX Pb with VAT code when VAT code contains a number 2021-01-15 19:43:02 +01:00
Laurent Destailleur
cac7fdd058 Look and feel v13 2021-01-15 14:02:18 +01:00
Laurent Destailleur
8debb58f7c Fix rounding of currency unit prices 2021-01-11 13:36:53 +01:00
Laurent Destailleur
16253a79ee FIX GETPOST of qty with wrong parameters 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-11 13:11:40 +01:00
Laurent Destailleur
445a751d6b Fix price2num 2021-01-11 13:08:02 +01:00
Laurent Destailleur
3d96c5a454 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/admin/dict.php
	htdocs/bom/tpl/objectline_create.tpl.php
	htdocs/bom/tpl/objectline_edit.tpl.php
	htdocs/bom/tpl/objectline_view.tpl.php
	htdocs/core/boxes/box_shipments.php
	htdocs/societe/class/societe.class.php
 2021-01-06 20:20:37 +01:00
kevin
e8ba4de832 Fix #14353 2021-01-06 14:46:56 +01:00
Laurent Destailleur
ce0abd17fe Debug v13 2021-01-02 16:18:16 +01:00
Laurent Destailleur
b66ec5bc64 Fix css 2020-12-23 23:16:27 +01:00
Laurent Destailleur
d65dc85a10 FIX for php 8 2020-12-23 19:16:25 +01:00
Laurent Destailleur
0db72852fb Fix height of graph 2020-12-03 20:18:37 +01:00
Laurent Destailleur
958893228a Fix combo to add contact and status of contact on popup 2020-11-30 15:18:58 +01:00
Laurent Destailleur
6c65ebef0d Look and feel v13 2020-11-29 15:16:53 +01:00
proprum
d1cded49a9
Adding require_once files.lib to fourn/paiement. 
Bug when there is a calculated extrafield which use "dol_dir_list" for calculating the amount of files attached to a invoice

With bonus : the integer calculated extrafield configuration : 
count(dol_dir_list($conf->fournisseur->facture->dir_output.'/'.get_exdir($object->id,2,0,0,$object,'invoice_supplier').dol_sanitizeFileName($object->ref),'files',0,'','(\.meta|_preview.*\.png)$'));
 2020-11-25 19:47:30 +01:00
stickler-ci
bbf1ade0a5 Fixing style errors. 2020-11-25 09:39:41 +00:00
Florian HENRY
4a316f06d5 fix : finish bank transfert fourn from list 2020-11-25 10:24:44 +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
dada0e16f5 Fix group by 2020-11-11 01:25:04 +01:00
jcp
d73e6a4670 Update fourn list to see cond_reglement 2020-11-10 19:37:08 +01:00
Laurent Destailleur
da6c6c9e0a Clean code 2020-11-08 14:39:20 +01:00
Laurent Destailleur
ac6f8e4e7c Debug v13 2020-11-06 11:52:48 +01:00
Laurent Destailleur
5b737d77c2
Merge pull request #15292 from prietojc/12.0_patch-2 
NEW: Add select by supplier category
 2020-11-05 19:29:30 +01:00
jcp
95a156301b NEW: Add select by supplier category 2020-11-04 12:13:04 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
5a3780e062
end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
1dab6570ed
Merge branch 'develop' into patch-11 2020-10-26 13:36:33 +01:00
Laurent Destailleur
82db2636f0 Fix phpcs 2020-10-26 13:22:03 +01:00
Frédéric FRANCE
f2c0e3765d
Update card.php 2020-10-25 23:29:51 +01:00
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2020-10-25 21:33:13 +01:00
Laurent Destailleur
6bc0630c5f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
 2020-10-25 21:09:43 +01:00
Laurent Destailleur
baa86d773b Fix phpcs 2020-10-25 21:07:37 +01:00
Maxime Kohlhaas
680ae60b6f Fix #15064 : error when supplier invoice numbering module is not configured 2020-10-25 08:56:34 +01:00
Laurent Destailleur
3bab0a322d
Merge pull request #15110 from frederic34/dol_fiche_head 
replace deprecated
 2020-10-23 04:03:46 +02:00
Laurent Destailleur
254da6923b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/line.php
 2020-10-23 04:00:45 +02:00
Laurent Destailleur
0e25843baa Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
 2020-10-23 03:59:11 +02:00
Laurent Destailleur
62420c5e7b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/fourn/facture/card.php
 2020-10-23 03:51:22 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Marc de Lima Lucio
594d9e321e FIX: invoice payment terms edition: error management 2020-10-22 18:28:27 +02:00