lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,991 Commits 43 Branches 150 Tags 886 MiB
104bbfdc1c
Commit Graph

42991 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
104bbfdc1c Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-03-30 19:14:49 +02:00
Florian HENRY
65ec02bae1 FIX : [ bug #1913 ] [EXPORT] [PGSQL] Bug when filtering export on a 
specific year
 2015-03-30 19:13:55 +02:00
Laurent Destailleur
fd8d09c8c0 Fix avoid warning 2015-03-29 17:53:05 +02:00
Laurent Destailleur
b5690142aa Prepare 3.6.3 2015-03-29 16:26:31 +02:00
Laurent Destailleur
253955dc31 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2015-03-28 17:13:05 +01:00
Laurent Destailleur
ffe1ee0d84 Target 98 to publish of dolibarr sevrer is now working 2015-03-28 17:12:31 +01:00
Laurent Destailleur
d0e4d8046b Merge pull request #2480 from marcosgdf/minor-2 
Corrected search box alignment in Customer orders list
 2015-03-27 01:09:06 +01:00
Laurent Destailleur
78638a30cd Merge pull request #2477 from atm-maxime/3.6 
Fix : Quantity displayed for virtual stock explanations was wrong
 2015-03-27 01:01:37 +01:00
Marcos García de La Fuente
e59fed9f38 Corrected search box alignment in Customer orders list 2015-03-26 11:08:34 +01:00
Maxime Kohlhaas
b250c5588e Fix : Quantity displayed for virtual stock explanations was wrong 2015-03-25 16:11:36 +01:00
Laurent Destailleur
2a4687834d Merge pull request #2474 from netfab/3.6 
Fix displaying of the warning image.
 2015-03-23 23:26:09 +01:00
Fab
ea7f00e777 Fix displaying of the warning image. 
Since last commit, $objp->date_livraison returns nothing ; max() will
then returns wrong result, and the warning image will be displayed when it
should not.
 2015-03-23 20:05:31 +01:00
Laurent Destailleur
b52ee1d069 Merge pull request #2465 from marcosgdf/bug-delivery_date 
Fixed delivery date in order list not showing up
 2015-03-21 01:24:17 +01:00
Marcos García de La Fuente
56295ed438 Fixed delivery date in order list not showing up 2015-03-20 11:28:23 +01:00
Laurent Destailleur
c4ff66c5d7 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-03-14 13:46:18 +01:00
Laurent Destailleur
a9eebb33fd Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2015-03-14 13:45:27 +01:00
Laurent Destailleur
89b22be063 FIXED: Allowed 0 to be used as an account mask. Required by CEGID. 2015-03-14 13:44:26 +01:00
Laurent Destailleur
da72cf387b Merge pull request #2451 from Dolibarr/revert-2318-3.5-accountingmask 
Revert "FIXED Allowed 0 to be used as an account mask"
 2015-03-14 13:43:04 +01:00
Laurent Destailleur
4a9a3ab04b Revert "FIXED Allowed 0 to be used as an account mask" 2015-03-14 13:42:58 +01:00
Laurent Destailleur
da042c1677 Merge pull request #2318 from GPCsolutions/3.5-accountingmask 
FIXED Allowed 0 to be used as an account mask
 2015-03-14 13:42:46 +01:00
Juanjo Menent
7cab558ed2 Fix: Showing system error if not enough stock of product into orders 
creation with lines
 2015-03-14 09:44:58 +01:00
Laurent Destailleur
41b09d8c70 Merge pull request #2448 from atm-maxime/3.6 
Fix : display proposal date on proposal list
 2015-03-11 02:50:26 +01:00
Laurent Destailleur
242a71e967 Merge pull request #2436 from marcosgdf/patch-1 
Update ChangeLog
 2015-03-11 02:31:24 +01:00
Laurent Destailleur
734a7dd5c7 Merge pull request #2443 from biznext/patch-4 
Fix Anchor link for quick access when editing.
 2015-03-11 02:13:29 +01:00
Laurent Destailleur
f484abe5ec Merge pull request #2446 from GPCsolutions/3.6-#1901 
FIXED #1901: Inverted supplier order/invoice buttons in project referring objects
 2015-03-11 02:12:01 +01:00
Maxime Kohlhaas
05a2a6af00 FIX : [bug #1900] Unable to remove a salary with enough permissions 2015-03-10 15:53:02 +01:00
Maxime Kohlhaas
154e1a7991 Merge branch '3.6' of github.com:Dolibarr/dolibarr into 3.6 2015-03-10 15:14:25 +01:00
Maxime Kohlhaas
978dc8170d Fix : display proposal date on proposal list 2015-03-10 14:56:58 +01:00
Raphaël Doursenaud
f8dfa61859 FIXED #1901: Inverted supplier order/invoice buttons in project referring objects 2015-03-09 16:20:51 +01:00
Estephe L.
9d320e4268 Fix Anchor link for quick access when editing. 
This is a quick fix to make anchor link works well when editing a proposal, order or invoice ...
 2015-03-08 23:29:09 +01:00
Marcos García
9a7346f889 Update ChangeLog 2015-03-06 12:09:23 +01:00
Laurent Destailleur
5f9f536f0b Merge pull request #2417 from marcosgdf/bug-1892 
[ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment
 2015-03-04 22:01:37 +01:00
Laurent Destailleur
4e144b6b76 Merge pull request #2416 from marcosgdf/bug-1825 
Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben)
 2015-03-04 20:38:47 +01:00
Marcos García de La Fuente
41c55d1913 Better fix for bug-1825. There are actually a lot to things to escape and escaped methods can make conflict with similar names so it is better to make a md5 to have a unique value 2015-03-04 11:55:17 +01:00
Marcos García de La Fuente
77605bce3e [ bug #1892 ] PHP Fatal error when using USER_UPDATE_SESSION trigger and adding a supplier invoice payment 2015-03-02 13:33:31 +01:00
Marcos García de La Fuente
7876238823 Fixed bug with hide/show checkboxes reported by Ruben Almeida (aruben) 
When an external calendar was called "mytasks", Dolibarr events were also hidden too.
 2015-03-02 01:36:27 +01:00
Laurent Destailleur
a421564b84 Fix phpcs 2015-03-01 13:52:58 +01:00
Juanjo Menent
7ca8fdb20c PHP norms 2015-02-27 17:58:19 +01:00
Juanjo Menent
bfe9bf7a47 Fix: Bad SEPA xml file creation 2015-02-27 17:55:15 +01:00
Laurent Destailleur
72da9b52af Merge pull request #2380 from marcosgdf/bug-1825 
Better fix for bug 1825
 2015-02-24 17:07:17 +01:00
Laurent Destailleur
d9ab05833f Merge pull request #2370 from braito4/patch-1 
[FIX #1833] Permissions in contact/note.php wrong
 2015-02-20 23:31:55 +01:00
Laurent Destailleur
29c39d61fb Merge branch 'marcosgdf-bug-1790' into 3.6 2015-02-20 23:24:05 +01:00
Laurent Destailleur
56635cea98 Merge branch 'bug-1790' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-1790

Conflicts:
	ChangeLog
 2015-02-20 23:23:57 +01:00
Laurent Destailleur
bd6b465ee1 Add phpunit for ie11 and ie10 2015-02-20 20:16:15 +01:00
Laurent Destailleur
e1e31de229 Merge remote-tracking branch 'origin/3.5' into 3.6 2015-02-20 20:15:04 +01:00
Laurent Destailleur
d549c00b2e Merge pull request #2365 from marcosgdf/3.5 
Fix: [ bug #1846 ] Browser IE11 not detected
 2015-02-20 20:02:11 +01:00
Marcos García de La Fuente
d46c76311c Correction 2015-02-20 10:23:17 +01:00
Marcos García de La Fuente
3a917a0d1f Merge branch '3.6' into bug-1825 2015-02-20 10:19:08 +01:00
Marcos García de La Fuente
fd18aa8717 Better fix for Bug #1825 2015-02-20 10:17:02 +01:00
Laurent Destailleur
cb32dbc7b8 Merge branch 'marcosgdf-bug-1825' into 3.6 2015-02-19 09:47:35 +01:00