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

56334 Commits

Author SHA1 Message Date
Laurent Destailleur
ca809a11af Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/commande/class/commande.class.php
 2018-03-13 18:04:18 +01:00
atm-quentin
af09a3714b FIX reverse field to have object loaded in doaction 2018-03-13 17:12:03 +01:00
Laurent Destailleur
f88536068f Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-13 15:30:07 +01:00
Laurent Destailleur
17b7c6268e FIX avoid "Array" on screen 2018-03-13 15:29:52 +01:00
ptibogxiv
4f6f0b302e
FIX for nondisplay of fk_element 's id in REST API response 
the fk_element don't display when the call is made with REST API (reason non found)
 2018-03-13 10:28:44 +01:00
Laurent Destailleur
dcd3387a30
Update commande.class.php 2018-03-13 09:53:21 +01:00
Laurent Destailleur
51229a602f
Update commande.class.php 2018-03-13 09:51:45 +01:00
atm-quentin
6c7a5cebdf FIX check verif exped on delete order 2018-03-13 09:34:50 +01:00
Laurent Destailleur
ae5080dab4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-12 20:16:23 +01:00
Laurent Destailleur
d045dca003 Fix financial commitment 2018-03-12 20:04:25 +01:00
Laurent Destailleur
55d3e72463 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/contact/class/contact.class.php
	htdocs/societe/card.php
 2018-03-12 19:02:30 +01:00
Laurent Destailleur
51c94fadfa Look and feel v7 2018-03-11 21:31:34 +01:00
Laurent Destailleur
e1654f4215 Fix division by zero 2018-03-11 21:18:18 +01:00
Laurent Destailleur
95e7062ca3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-03-11 19:29:01 +01:00
Laurent Destailleur
d5d6939fd9 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/core/class/commonobject.class.php
 2018-03-11 19:28:39 +01:00
Laurent Destailleur
a3d25b24d3 FIX #8285 Extrafields now reported by /api/index.php/agendaevents/{id} 2018-03-11 19:27:03 +01:00
Laurent Destailleur
5c4b5cc74f fix 2018-03-11 00:40:35 +01:00
Laurent Destailleur
9ed2e47775 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-11 00:32:41 +01:00
Laurent Destailleur
897b3f7b79 Fix setup 2018-03-11 00:31:26 +01:00
Laurent Destailleur
f98ca2e31a
Merge pull request #8335 from inoveaconseil/patch-1 
Fix #8092
 2018-03-11 00:06:28 +01:00
Laurent Destailleur
03f7df88c6
Update card.php 2018-03-11 00:05:32 +01:00
Inovea Conseil
c2397fad60
Fix #8092 2018-03-10 23:49:43 +01:00
Maxime Kohlhaas
c008853842 Fix #8057 2018-03-10 23:05:33 +01:00
Laurent Destailleur
6c9e0e1752
Merge branch '7.0' into 7.0 2018-03-10 21:52:57 +01:00
Alexis Algoud
74dc815bfa fix commonobject isInt for module builder capabilities 2018-03-10 19:02:06 +01:00
Laurent Destailleur
905cf112e9
Merge pull request #8327 from tiaris/fix7.0 
FIX #8289
 2018-03-10 18:58:22 +01:00
Laurent Destailleur
6fcc271790
Update product.class.php 2018-03-10 18:57:55 +01:00
Laurent Destailleur
aea3c164ba
Merge pull request #8178 from hregis/7.0_bug2 
Fix: avoid Warning: A non-numeric value encountered
 2018-03-10 18:47:11 +01:00
Laurent Destailleur
3911738b88 Fix vulnerability reported by DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 18:40:45 +01:00
Laurent Destailleur
e3ace1f89f Fix morecss not provided 2018-03-10 18:17:54 +01:00
Laurent Destailleur
702c84a100 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-03-10 17:57:49 +01:00
Laurent Destailleur
241b5e9a93 FIX security report DIGITEMIS CYBERSECURITY & PRIVACY 2018-03-10 15:52:11 +01:00
BadPixxel
44d18027f2 BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709 2018-03-10 15:48:40 +01:00
BadPixxel
836054a8b3 BugFix Issue #8261: Variants module. Combinations cannot be edited 2018-03-10 14:51:24 +01:00
jean
6793bfae3a FIX #8289 add a cofoiguration for correct stopck calculation 2018-03-10 14:17:52 +01:00
Laurent Destailleur
a85a103a55
Merge pull request #8308 from atm-florian/7.0_fixinventory 
7.0 fixinventory
 2018-03-10 12:54:36 +01:00
Laurent Destailleur
212536a3fd
Update list.php 2018-03-10 12:54:20 +01:00
Laurent Destailleur
64f2f324de
Update card.php 2018-03-10 12:52:09 +01:00
Laurent Destailleur
a7f82af352
Update card.php 2018-03-10 12:49:25 +01:00
Laurent Destailleur
75b470b580
Update eldy.lib.php 2018-03-10 12:43:01 +01:00
Laurent Destailleur
04bcc4dd46
Update eldy.lib.php 2018-03-10 12:39:39 +01:00
Maxime Kohlhaas
fd36ade61a Fix unit in replenish #7225 2018-03-10 11:20:32 +01:00
Maxime Kohlhaas
d92fa3a69c Fix required field + space in dispatch 2018-03-09 23:49:40 +01:00
florian HENRY
c62904d632 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_fixinventory 2018-03-09 23:41:32 +01:00
Laurent Destailleur
612b95b219
Merge pull request #8316 from atm-maxime/fix_clone_supplierorder 
Fix supplier order clone was keeping objectlinked
 2018-03-09 23:01:45 +01:00
Laurent Destailleur
31f36f4028
Merge pull request #8312 from atm-florian/7.0_fix8232 
7.0 fix8232
 2018-03-09 22:47:10 +01:00
Maxime Kohlhaas
d82c62b638 Fix supplier order clone was keeping objectlinked 2018-03-09 21:51:59 +01:00
TuxGasy
9eeb80151e Fix bug when updating multi currency rate on invoice supplier 2018-03-09 21:13:54 +01:00
Laurent Destailleur
143827ac79
Merge pull request #8306 from Robisix/7.0 
FIX Duplicate product_type asignement on order addline
 2018-03-09 19:45:47 +01:00
florian HENRY
42fed5981d bettre syntax 2018-03-09 19:16:06 +01:00