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

65396 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dev2a
60c508b1c4 Get start date from fiscal year 
if start date is empty, get date from current accounting fiscal year, else from company fiscal month setting
 2018-01-11 15:52:45 +01:00
dev2a
415d7574eb Fix PHP notices adding empty($page) 2018-01-11 15:35:34 +01:00
Laurent Destailleur
6d9a9dd3fe Fix Time spent for "other task" was not visible when filtering project 2018-01-11 13:08:13 +01:00
Neil Orley
8d710020e9 FIX use DB PREFIX instead of llx_ 2018-01-11 12:58:41 +01:00
Laurent Destailleur
46d28deee7 Fix substitution of thirdparty 2018-01-11 12:25:40 +01:00
Laurent Destailleur
3f4d7dbce6 Fix substitution of thirdparty 2018-01-11 12:24:47 +01:00
Regis Houssin
157e118cba Fix: broken feature 2018-01-11 10:47:40 +01:00
Laurent Destailleur
95312d1944 Fix regression 2018-01-11 10:20:49 +01:00
Laurent Destailleur
dbb9caa196 Prepare 6.0.5 2018-01-11 09:53:47 +01:00
Laurent Destailleur
a4ab37e990 Remove deprecated field 2018-01-11 01:16:14 +01:00
Laurent Destailleur
d74305d333 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-11 01:14:40 +01:00
Laurent Destailleur
90ddfc3f7f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/translation.php
 2018-01-11 01:14:20 +01:00
Laurent Destailleur
764646634d
Merge pull request #8051 from atm-florian/6.0 
fix: search translation into external module files also
 2018-01-11 01:12:53 +01:00
Laurent Destailleur
4316793638
Merge pull request #8047 from hregis/develop_multicompany 
Fix: some bugs with multicompany sharing
 2018-01-11 01:07:17 +01:00
Laurent Destailleur
a11cb8dcbf
Update card.php 2018-01-11 01:06:50 +01:00
Laurent Destailleur
0ae02d76a3
Merge pull request #8049 from fmarcet/6.0 
Fix: Still using property ->client instead of ->thirdparty.
 2018-01-11 01:03:47 +01:00
Laurent Destailleur
af6b84ba3a Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/list.php
	htdocs/contact/document.php
	htdocs/product/list.php
 2018-01-11 01:03:13 +01:00
Laurent Destailleur
e9bf6ed4ce Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-11 00:56:01 +01:00
Laurent Destailleur
54228b4f98 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-01-11 00:55:51 +01:00
Laurent Destailleur
58589b8454 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-01-11 00:55:10 +01:00
Laurent Destailleur
387dd967e2 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2018-01-11 00:55:00 +01:00
Laurent Destailleur
5adeaf9d76 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2018-01-11 00:54:30 +01:00
Laurent Destailleur
205e715b7f
Merge pull request #8046 from hregis/6.0_bug 
Fix: avoid Warning: A non-numeric value encountered
 2018-01-11 00:53:07 +01:00
Laurent Destailleur
b2c900011c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-01-11 00:48:10 +01:00
Laurent Destailleur
f83ea80d6a
Merge pull request #8041 from dolibarr95/patch-35 
NEW Add class in societe/card.php
 2018-01-11 00:47:53 +01:00
Laurent Destailleur
e41f761157 Fix ident 2018-01-11 00:47:29 +01:00
Laurent Destailleur
9827358002
Merge pull request #8040 from atm-florian/dev_fixsecu 
fix #7963
 2018-01-11 00:44:45 +01:00
Laurent Destailleur
4747e84b74
Update price.php 2018-01-11 00:40:33 +01:00
Laurent Destailleur
79562f8d5b
Merge pull request #8036 from atm-ph/fix_6.0_model_pdf_invoice_payment 
Fix wrong address used into PDF model of supplier payment
 2018-01-11 00:37:37 +01:00
Laurent Destailleur
b5fe953a64
Merge pull request #8035 from pdermody/6.0 
Fix #8034 - Surface and volume units are calculated incorrectly
 2018-01-11 00:36:00 +01:00
Laurent Destailleur
df22a311c2
Merge pull request #8030 from steschuser/5.0 
FIX #8029 Unable to make leave request in holyday module
 2018-01-11 00:32:45 +01:00
Laurent Destailleur
9253fed754 Revert "Code comment" 
This reverts commit 8000777864.
 2018-01-11 00:17:32 +01:00
Laurent Destailleur
436b653fa0 Error report 2018-01-11 00:16:45 +01:00
florian HENRY
c8c550cd33 Merge branch '6.0' of https://github.com/Dolibarr/dolibarr.git into 6.0 2018-01-10 20:49:48 +01:00
Laurent Destailleur
8000777864 Code comment 2018-01-10 20:43:56 +01:00
HENRY Florian
5af39e80e0
Update price.php 2018-01-10 20:38:06 +01:00
florian HENRY
0bd45dc64b fix: search translation into external module files also 2018-01-10 20:34:32 +01:00
Laurent Destailleur
f2b8c3c97d Fix check of customer/supplier code 2018-01-10 18:19:54 +01:00
Ferran Marcet
d99535d9da Fix: Still using property ->client instead of ->thirdparty. 2018-01-10 16:40:43 +01:00
Ferran Marcet
7ce7c0d5e5 Merge branch '5.0up' into 5.0 2018-01-10 16:12:53 +01:00
Regis Houssin
8c3b4f62db Fix: wrong entity with thirdparty sharing 2018-01-10 13:30:57 +01:00
Laurent Destailleur
43d560830c Fix on old php 2018-01-10 13:20:43 +01:00
Laurent Destailleur
e141d43999 Fix bad links with mobile 2018-01-10 13:14:30 +01:00
Laurent Destailleur
ae59ca43cc Fix sort of subscriptions 2018-01-10 13:02:05 +01:00
Regis Houssin
4683a35532 Fix: wrong image path with multicompany sharing 2018-01-10 12:52:30 +01:00
Regis Houssin
4cc0e889c1 Fix: restore broken feature 2018-01-10 12:38:27 +01:00
Regis Houssin
bd1acca2cd Fix: wrong entity with multicompany thirdparty sharing 2018-01-10 12:38:12 +01:00
Laurent Destailleur
cda078ce26 Fix test on email unique 2018-01-10 12:27:11 +01:00
Laurent Destailleur
e5c26f89e7 Fix search link 2018-01-10 11:08:52 +01:00
Laurent Destailleur
49f59e0d06 Fix menu visible in experimental mode 2018-01-10 11:02:11 +01:00