lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,990 Commits 43 Branches 150 Tags 886 MiB
9f4ec3dbdf
Commit Graph

48990 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
phf
9f4ec3dbdf FIX error creating default object from empty value 2015-08-31 12:00:47 +02:00
Laurent Destailleur
04d8bf7a1a Merge pull request #3427 from fappels/3.8-fix-delivery-validate 
Fix missing delivery validation button
 2015-08-31 00:51:17 +02:00
Laurent Destailleur
1decd6be12 Merge pull request #3422 from fappels/3.8 
Fix commit #3396 lot/serial shipment
 2015-08-31 00:48:25 +02:00
Laurent Destailleur
c5f8011657 git push origin develop 
Merge branch 'gschratzer-patch-1' into develop
 2015-08-31 00:45:30 +02:00
Laurent Destailleur
2c85cf246c Merge branch 'patch-1' of https://github.com/gschratzer/dolibarr into 
gschratzer-patch-1

Conflicts:
	htdocs/projet/element.php
 2015-08-31 00:45:18 +02:00
Laurent Destailleur
3315978fd3 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-30 21:22:28 +02:00
Laurent Destailleur
1e3bc9f822 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-30 21:21:37 +02:00
Laurent Destailleur
c06abac49e Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/compta/salaries/index.php
	htdocs/contact/class/contact.class.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/lib/geturl.lib.php
	htdocs/core/lib/pdf.lib.php
 2015-08-30 21:20:50 +02:00
Juanjo Menent
888d988710 Merge pull request #3434 from marcosgdf/patch-3 
NEW Added __PROJECT_NAME__ tag for customer invoice emails
 2015-08-30 18:00:36 +02:00
Juanjo Menent
643ce1f2d1 Merge pull request #3433 from fappels/3.8-fix-package-label 
Fix missing product label in package tab
 2015-08-30 18:00:04 +02:00
Marcos García
e4bddb4a00 NEW Added __PROJECT_NAME__ tag for customer invoice emails 2015-08-30 13:47:02 +02:00
fappels
b908f10c5b Fix missing product label in package tab 2015-08-30 11:50:47 +02:00
Juanjo Menent
c3d3a989b3 Merge pull request #3429 from marcosgdf/patch-2 
Removed odd test
 2015-08-30 09:03:36 +02:00
Juanjo Menent
3e45cab352 Merge pull request #3389 from aspangaro/develop-57 
New: Add number of expense reports to pay in dashboard and a grace period
 2015-08-30 09:02:07 +02:00
aspangaro
e4bac2adfd Merge remote-tracking branch 'Upstream/develop' into develop-57 
Conflicts:
	htdocs/install/mysql/migration/3.8.0-3.9.0.sql
 2015-08-30 07:39:45 +02:00
Marcos García
3482031b8a Removed second odd test 2015-08-29 21:44:05 +02:00
Marcos García
8fd7f0f383 Removed odd test 2015-08-29 21:41:15 +02:00
fappels
f1be574489 correction on permissions 2015-08-29 17:14:41 +02:00
fappels
ace1681f31 Fix missing delivery validation button 
delivery advanced permissions were missing
 2015-08-29 16:52:10 +02:00
Laurent Destailleur
c8f12dc5f2 Fix PUT method for already formated strings 2015-08-29 15:12:31 +02:00
Laurent Destailleur
a3d612a26a Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-08-29 13:45:47 +02:00
Laurent Destailleur
17b69e16d2 Fix remove a bad log reporting error when not 2015-08-29 13:45:23 +02:00
Juanjo Menent
25fca6615a Merge pull request #3395 from fmarcet/develop 
NEW: Translate extrafield's labels
 2015-08-28 16:44:49 +02:00
Juanjo Menent
c09b130644 Merge pull request #3403 from defrance/patch-76 
NEW add in get_origin function generic origintype
 2015-08-28 16:28:59 +02:00
Juanjo Menent
b058d39bb4 Merge pull request #3419 from aspangaro/develop-61 
Increase length of column pcg_version to 32 for accountancy system
 2015-08-28 16:26:26 +02:00
Juanjo Menent
4e1aec16b8 Merge pull request #3416 from GPCsolutions/3.8-3218 
Fix #3218 Bank date selectors presentation
 2015-08-28 16:20:50 +02:00
Juanjo Menent
f6074d3017 Merge pull request #3417 from GPCsolutions/3.8-3219 
Fix #3219 More conventional presentation
 2015-08-28 16:20:34 +02:00
Juanjo Menent
3feeaf7294 Merge pull request #3415 from GPCsolutions/3.8-2571-suppliers 
Added tags/categories management to suppliers
 2015-08-28 16:18:28 +02:00
Juanjo Menent
a7d1a35a56 Merge pull request #3420 from aspangaro/3.7-4 
Fix #3289 Salaries module shows amounts with currency symbol unlike t…
 2015-08-28 16:12:36 +02:00
Juanjo Menent
0aba8a1bb1 Merge pull request #3421 from grandoc/grandoc_fix_27082015 
Grandoc fix 27082015
 2015-08-28 16:06:43 +02:00
Laurent Destailleur
39cbd7629f Fix error message during import 2015-08-27 23:49:25 +02:00
Laurent Destailleur
aec3976741 Fix set ref 2015-08-27 22:48:52 +02:00
Laurent Destailleur
302b61c5ce Fix Can't download generated document for cheque summary deposit. 2015-08-27 22:43:09 +02:00
fappels
6d02c48c49 Fix batch expedition 2015-08-27 19:52:43 +02:00
philippe grand
6952084be3 it's a mess 2015-08-27 17:23:23 +02:00
aspangaro
aff134ab65 Fix #3289 Salaries module shows amounts with currency symbol unlike the rest of Dolibarr 2015-08-27 16:10:02 +02:00
aspangaro
134bd42c4e Increase length of column pcg_version to 32 2015-08-27 15:13:29 +02:00
philippe grand
e9f631d2e3 fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:49:12 +02:00
philippe grand
db7defb7c3 Revert "fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level'" 
This reverts commit 2527ae263b.
 2015-08-27 14:43:48 +02:00
philippe grand
2527ae263b fix : Fatal error: Uncaught exception 'Exception' with message 'Incorrect log level' 2015-08-27 14:28:12 +02:00
Juanjo Menent
ddb9c6a025 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-26 21:01:39 +02:00
Juanjo Menent
0a33f0728a Fix translations of contract exports 2015-08-26 21:01:01 +02:00
Juanjo Menent
4cd61073e2 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-26 20:26:27 +02:00
Juanjo Menent
6321e96e49 Close #3223 2015-08-26 20:25:52 +02:00
Raphaël Doursenaud
ba1ad9f317 Fix #3219 More conventional presentation 2015-08-26 19:51:06 +02:00
Raphaël Doursenaud
33ea968b5b Fix #3218 Bank date selectors presentation 2015-08-26 19:45:32 +02:00
Raphaël Doursenaud
cea47f3e25 Added tags/categories management to suppliers 
Suppliers part of #2571
 2015-08-26 19:30:55 +02:00
Guido Schratzer
154f6cff9f Fix: htdocs/projet/element.php Logoposition 
Fixed Logo from center to right
set table width to 100 %
 2015-08-26 18:35:15 +02:00
Laurent Destailleur
6e7ab5a32f Merge pull request #3406 from aspangaro/develop-58 
Update php-iban library - Just number version update
 2015-08-26 11:30:33 +02:00
Laurent Destailleur
603c44c37c Merge pull request #3405 from aspangaro/3.8-13 
Fast review 3.8
 2015-08-26 11:27:16 +02:00