Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
90,787 Commits 35 Branches 179 Tags 1.7 GiB
ffcf8edd19
Commit Graph

79927 Commits

Author SHA1 Message Date
Laurent Destailleur
ffcf8edd19 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-23 13:55:42 +02:00
Laurent Destailleur
edbf4dc375 Fix doc 2020-10-23 13:55:14 +02:00
Laurent Destailleur
81543df5e4 Fix warnings 2020-10-23 04:24:54 +02:00
Laurent Destailleur
e22760e8d5
Merge pull request #15113 from frederic34/patch-8 
code field for product nature must be numeric
 2020-10-23 04:08:39 +02:00
Laurent Destailleur
517c8e862f
Merge pull request #15112 from frederic34/patch-7 
Update intracommreport.class.php
 2020-10-23 04:08:12 +02:00
Laurent Destailleur
6b6ce568c7
Merge pull request #15109 from frederic34/patch-6 
doxygen
 2020-10-23 04:07:29 +02:00
Laurent Destailleur
0a1e49447d
Merge pull request #15108 from frederic34/patch-4 
Update cproductnature.class.php
 2020-10-23 04:07:03 +02: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
c9a73cc380 Fix phpcs 2020-10-23 03:55:18 +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
Laurent Destailleur
e0e4da481a Fix phpcs 2020-10-23 03:42:54 +02:00
Laurent Destailleur
d9aa83e699 Fix phpcs 2020-10-23 03:41:26 +02:00
stickler-ci
5638a49774 Fixing style errors. 2020-10-22 22:23:03 +00:00
Frédéric FRANCE
43bb812260
Update cproductnature.class.php 2020-10-23 00:22:34 +02:00
Frédéric FRANCE
78ec68e2cf
code field for product nature must be numeric 2020-10-23 00:04:55 +02:00
Frédéric FRANCE
c2ea4f063b
Update intracommreport.class.php 2020-10-22 23:50:20 +02:00
Frédéric FRANCE
2146ce2dee
Update intracommreport.class.php 2020-10-22 23:37:29 +02:00
Frédéric FRANCE
0db7847ba7
Update intracommreport.class.php 2020-10-22 23:24:11 +02:00
Frédéric FRANCE
82c3f63c5c
replace deprecated 2020-10-22 22:54:29 +02:00
Frédéric FRANCE
9a470fa42d
replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
1bb2fc0db4 css 2020-10-22 22:45:27 +02:00
Frédéric FRANCE
ae1adfb2d7
Update product.class.php 2020-10-22 22:33:35 +02:00
Frédéric FRANCE
ed8bfa26fb
Update cproductnature.class.php 2020-10-22 22:20:48 +02:00
Laurent Destailleur
19efd633e9
Merge pull request #15107 from frederic34/patch-4 
Update api_contracts.class.php
 2020-10-22 21:59:47 +02:00
Laurent Destailleur
c77184c848 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 21:57:24 +02:00
Laurent Destailleur
0e442abd36 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2020-10-22 21:57:13 +02:00
Laurent Destailleur
15bbba3f52 Remove warning 2020-10-22 21:55:01 +02:00
Frédéric FRANCE
12dc82c340
Update api_contracts.class.php 2020-10-22 21:51:42 +02:00
Laurent Destailleur
a5e2ab2822
Merge pull request #15106 from frederic34/rejet 
add type
 2020-10-22 21:36:36 +02:00
Laurent Destailleur
42963f3059
Merge pull request #15105 from frederic34/patch-6 
Update product.class.php
 2020-10-22 21:36:11 +02:00
Laurent Destailleur
4917fb187e
Merge pull request #15104 from ptibogxiv/patch-389 
FIX lang to #15055
 2020-10-22 21:35:37 +02:00
Laurent Destailleur
8505810f90
Merge pull request #15103 from hregis/develop_bug2 
FIX sql syntax error
 2020-10-22 21:35:14 +02:00
Frédéric FRANCE
f4b42234ec
add space 2020-10-22 21:32:12 +02:00
Laurent Destailleur
9699bdc0fa Fix phpcs 2020-10-22 21:31:34 +02:00
Frédéric FRANCE
02403ba640
add type 2020-10-22 21:29:33 +02:00
Frédéric FRANCE
36ad3bfbc9
Update product.class.php 2020-10-22 21:11:49 +02:00
ptibogxiv
f3848dac1e
FIX lang to #15055 2020-10-22 20:06:56 +02:00
Laurent Destailleur
b61e5dc9eb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 20:03:41 +02:00
Laurent Destailleur
8074d2cc1d NEW Add validation of MX domain for emails 2020-10-22 20:01:59 +02:00
Regis Houssin
cbb6e4effe FIX sql syntax error 2020-10-22 19:32:32 +02:00
Laurent Destailleur
e811a9b13e
Merge pull request #15097 from marc-dll/FIX_10.0_supplier_invoice_echeance 
FIX: supplier invoice: automatically calculate payment term when modifying payment condition
 2020-10-22 18:40:07 +02:00
Laurent Destailleur
b4581b6af8
Better error management 2020-10-22 18:39:45 +02:00
Laurent Destailleur
62d3d1690e
Merge pull request #15102 from fappels/develop_fix_user_list 
Fix user list SQL error when user module has extrafields
 2020-10-22 18:35:28 +02:00
Laurent Destailleur
c05b96f58e
Merge pull request #15099 from joseplluis/patch-10 
NEW form to add customer/supplier into categories
 2020-10-22 18:33:29 +02:00
Laurent Destailleur
a6484e933b Css 2020-10-22 18:28:47 +02:00
Marc de Lima Lucio
594d9e321e FIX: invoice payment terms edition: error management 2020-10-22 18:28:27 +02:00
Laurent Destailleur
fb7202b7f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-10-22 17:55:47 +02:00
Laurent Destailleur
0616b9bc9b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/prelevement/card.php
	htdocs/compta/prelevement/line.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/functions2.lib.php
	htdocs/core/tpl/card_presend.tpl.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
 2020-10-22 17:55:38 +02:00