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

42437 Commits

Author SHA1 Message Date
Laurent Destailleur
f57284f507 Fix stats opportunities 2015-09-01 16:52:20 +02:00
Laurent Destailleur
a84696230b Fix the translation page must be visible for all languages, except 
en_US.
 2015-09-01 16:11:58 +02:00
Laurent Destailleur
7d4602f2c4 Fix payment mode type 2015-09-01 15:59:11 +02:00
Laurent Destailleur
7a78c9d704 Fix doxygen 2015-09-01 14:31:32 +02:00
Laurent Destailleur
03435d7d90 Fix bad error management 2015-09-01 12:36:43 +02:00
Marcos García de La Fuente
216827b1d8 FIX [ bug #3358 ] Tasks box does not work with PostgreSQL 
Close #358
 2015-09-01 11:26:59 +02:00
Marcos García de La Fuente
3134950dbe FIX [ bug #3383 ] Company name is overlapped with company direction in PDF models 
Close #3383
 2015-09-01 11:19:05 +02:00
Marcos García de La Fuente
c4f9bde14d FIX [ bug #3431 ] Invoice bank account is not respected 
Close #3431
 2015-09-01 11:09:37 +02:00
Raphaël Doursenaud
870882257d Fix #3448 Pass expected date format 2015-09-01 11:06:44 +02:00
Marcos García de La Fuente
9ec349f410 FIX [ bug #3432 ] Spaces should be removed from IBAN when formatting it 
Close #3432
 2015-09-01 10:56:55 +02:00
Laurent Destailleur
441bb83e64 Fix url of local web sites 2015-09-01 10:08:03 +02:00
fmarcet
2b6a481011 FIX: The hours of date filter aren't correct 2015-09-01 09:46:45 +02:00
Raphaël Doursenaud
3b493ab0ed Fix #2863 Sensible defaults for ChromePHP path 
Use the provided ChromePHP class by default
 2015-08-31 21:08:37 +02:00
Raphaël Doursenaud
51d5bff15d Fix #3442 Remove useless syslog 
Not having the permission to read the box is not an error.
Furthermore, no other boxes have this behavior.
 2015-08-31 19:41:42 +02:00
Laurent Destailleur
9aa60e1ae1 Fix remove warning 2015-08-31 19:02:14 +02:00
Laurent Destailleur
6fd6df81ca Fix css 2015-08-31 18:01:36 +02:00
Laurent Destailleur
2a85fb542a Fix phpcs 
Sync transifex
 2015-08-31 17:22:36 +02:00
Laurent Destailleur
cf3eb1e452 Fix limit of nb of project. 2015-08-31 17:01:32 +02:00
Laurent Destailleur
3a32b08512 Fix filter on opportunity status 2015-08-31 15:52:54 +02:00
Laurent Destailleur
278e90cf0a Fix same pb than #3297 with vat edit 2015-08-31 13:06:53 +02:00
Laurent Destailleur
5fd6c44640 Fix error management 2015-08-31 13:00:24 +02:00
Laurent Destailleur
dfde0314c6 Fix bad permission 2015-08-31 12:34:59 +02:00
Laurent Destailleur
00b9f98c1c Merge remote-tracking branch 'origin/3.7' into develop 2015-08-31 12:15:20 +02:00
Laurent Destailleur
942723ff8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-31 12:13:35 +02:00
Laurent Destailleur
31465fe899 Fix several minor bugs 2015-08-31 12:13:23 +02:00
phf
9f4ec3dbdf FIX error creating default object from empty value 2015-08-31 12:00:47 +02:00
Aurélien Stride
1a3d8b5ae4 FIX : adjusted test for affecting supplier reference 2015-08-31 09:25:39 +02:00
fmarcet
cf38b17e88 FIX: Bad visualization of suppliers name on Incomes-Expenses mode 2015-08-31 09:18:37 +02:00
Laurent Destailleur
fb70fbdc06 Merge pull request #3428 from marcosgdf/bug-3426 
FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields
 2015-08-31 00:53:04 +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
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
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
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
Marcos García de La Fuente
b953d2c466 FIX [ bug #3426 ] Unable to create an invoice from a contract with extrafields 
Close #3426
 2015-08-29 19:42:51 +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
Laurent Destailleur
3e266243e5 Fix css for support page 2015-08-28 20:39:30 +02:00
Laurent Destailleur
a98985bf37 Fix align 2015-08-28 20:17:36 +02:00
Laurent Destailleur
47ea834516 Fix debug module expense report 2015-08-28 20:11:16 +02:00
Laurent Destailleur
4377a2d013 Fix style and sql error for field fde.ref not found 2015-08-28 18:20:51 +02:00
Aurélien Stride
e2072999cf ADD : ref_supplier to object property, otherwise not visibly updated on change 2015-08-28 17:12:27 +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
Laurent Destailleur
6624182361 Fix form outside table 2015-08-28 00:29:46 +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
603c44c37c Merge pull request #3405 from aspangaro/3.8-13 
Fast review 3.8
 2015-08-26 11:27:16 +02:00
Laurent Destailleur
0a880cd205 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-26 11:26:00 +02:00
Laurent Destailleur
3fc63eba0d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-26 11:25:05 +02:00
Laurent Destailleur
edf05e8d94 Merge pull request #3404 from hregis/3.7_bug 
Fix: disable hook for avoid errors when object langs is disable
 2015-08-26 11:24:50 +02:00
Laurent Destailleur
3db021addf Fix Use correct boolean type. 
Complete doxygen
 2015-08-26 11:24:31 +02:00
Juanjo Menent
9deaa3cceb Merge remote-tracking branch 'origin/3.8' into develop 2015-08-25 22:01:33 +02:00
Juanjo Menent
f32a7ba228 Close #3224 2015-08-25 21:59:46 +02:00
aspangaro
73d8f20c6b Fix: Correct directory where the donation is generated & add the action to remove_file who are generated 2015-08-25 08:09:14 +02:00
Laurent Destailleur
a54589c13c Fix filter lost 2015-08-24 17:47:26 +02:00
Laurent Destailleur
09355b0c7b Fix filtering 2015-08-24 16:40:43 +02:00
Laurent Destailleur
2cf10ac05d Fix filtering 2015-08-24 16:32:43 +02:00
Laurent Destailleur
8061ec9084 Fix translation 2015-08-24 15:59:17 +02:00
Laurent Destailleur
aaba18bd51 Fix filter on date 2015-08-24 15:40:33 +02:00
Laurent Destailleur
32ec57403b Bad translation 2015-08-24 15:28:15 +02:00
Laurent Destailleur
1a55159e35 Fix filter on prospect status 2015-08-24 14:59:46 +02:00
Laurent Destailleur
80fc4743c9 Fix the property "list" was not used. 2015-08-24 14:42:07 +02:00
Laurent Destailleur
feed3f714c Fix to avoid warning 2015-08-24 11:17:11 +02:00
aspangaro
478947d630 Correct 2015-08-23 07:46:37 +02:00
aspangaro
7d2eae2359 Fix: Better presentation for add form 2015-08-23 07:37:38 +02:00
BENKE Charlie
af7302fa90 change done 2015-08-23 00:30:11 +02:00
Regis Houssin
7b7fc44b46 Fix: disable hook for avoid errors when object langs is disable 2015-08-22 09:24:46 +02:00
BENKE Charlie
1b117d5581 add in get_origin function generic origintype 
actually we have only internal module origintype 
propose to add feature to add stockmovement from other external module
 2015-08-21 14:10:55 +02:00
Laurent Destailleur
15ab9c0ecd Merge remote-tracking branch 'origin/3.7' into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/stock/mouvement.php
 2015-08-20 16:08:42 +02:00
Laurent Destailleur
da8e71b2c5 Fix #3309 2015-08-20 16:05:29 +02:00
Laurent Destailleur
1b409538a8 Fix #3400 
Conflicts:
	htdocs/core/lib/date.lib.php
 2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac Fix #3400 2015-08-20 15:50:00 +02:00
Laurent Destailleur
18f064cc69 Fix login is a mandatory field. 2015-08-20 15:18:36 +02:00
Laurent Destailleur
d409568442 Format code 2015-08-20 15:07:16 +02:00
Laurent Destailleur
e24fd6fa37 Merge remote-tracking branch 'origin/develop' into 3.8 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2015-08-20 14:36:32 +02:00
Laurent Destailleur
c3fb14855b Try a better fix to replace PR #3297 2015-08-20 14:34:48 +02:00
Laurent Destailleur
d90b342cc9 Fix use dedicated escapment function 2015-08-20 14:34:08 +02:00
Laurent Destailleur
2266c2806f Merge pull request #3396 from fappels/3.8 
Fix shipment validation: 2 times qty in SQL select
 2015-08-20 14:32:34 +02:00
Laurent Destailleur
936f912216 Fix filter on category 2015-08-20 04:07:07 +02:00
Laurent Destailleur
26e3fcc636 Try a better fix to replace PR #3297 2015-08-20 03:38:21 +02:00
Laurent Destailleur
9a6e13d253 Fix test if empty was inverted 2015-08-19 19:45:24 +02:00
Laurent Destailleur
b11642a7f4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-19 18:27:22 +02:00
Laurent Destailleur
5f30ad3b63 Fix no link to show if id empty 2015-08-19 18:27:12 +02:00
philippe grand
3743c7460d FIX : pdf_writeLinkedObjects use foreach instead of for($i..) because 
now linked objects return by fetchLinkedObject are associative array
with ID as key.
 2015-08-19 16:36:44 +02:00
fappels
38584f2cfa Fix shipment validation 2 times qty in SQL select 2015-08-19 10:42:54 +02:00
Juanjo Menent
7befa78223 Merge pull request #3386 from grandoc/grandoc_fixes_20150815 
the form should be outside table to avoid errors
 2015-08-18 20:07:38 +02:00
Juanjo Menent
8ba1d1d414 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-18 19:59:03 +02:00
fmarcet
d6b84233ed NEW: Translate extrafield's labels 2015-08-18 16:40:03 +02:00
Florian HENRY
8b62e562e5 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8 2015-08-18 11:14:22 +02:00
Laurent Destailleur
241bf85da2 Fix parameter sendmassremind 2015-08-18 09:53:04 +02:00
Laurent Destailleur
fabd751be4 Fix Server hang with long loop when reading specimen pdf and high number 
of tasks.
 2015-08-17 20:07:14 +02:00
Laurent Destailleur
76ce98630f Fix translation 2015-08-17 19:42:19 +02:00
Laurent Destailleur
7ff149e876 Fix missing param mode 2015-08-17 15:13:40 +02:00
Florian HENRY
b4e810a7a8 FIX: #3392 2015-08-17 13:05:54 +02:00
Laurent Destailleur
911f37b6eb Merge remote-tracking branch 'origin/develop' into 3.8 2015-08-17 12:55:41 +02:00
aspangaro
bd69d37c3a New: Add number of expense reports to pay 2015-08-17 05:29:12 +02:00
aspangaro
67140dc188 Fix: Missing "Gender" translation 2015-08-16 08:18:00 +02:00
Laurent Destailleur
2faa5d725e Missing tcpdf files 2015-08-15 18:17:54 +02:00
philippe grand
53a21019fd the form should be outside table to avoid errors 2015-08-15 16:15:54 +02:00
philippe grand
924ff21268 the form should be outside table to avoid errors 2015-08-15 16:12:33 +02:00
philippe grand
20a4304188 the form should be outside table to avoid errors 2015-08-15 16:10:24 +02:00
philippe grand
61f6da0210 the form should be outside table to avoid errors 2015-08-15 16:07:59 +02:00
philippe grand
670f0ae867 the form should be outside table to avoid errors 2015-08-15 16:03:09 +02:00
philippe grand
0432254412 the form should be outside table to avoid errors 2015-08-15 15:53:07 +02:00
philippe grand
b619aa080d the form should be outside table to avoid errors 2015-08-15 15:47:17 +02:00
philippe grand
676004e2e4 the form should be outside table to avoid errors 2015-08-15 15:42:54 +02:00
philippe grand
d51912687b the form should be outside table to avoid errors 2015-08-15 15:37:54 +02:00
philippe grand
a2b39721ce the form should be outside table to avoid errors 2015-08-15 15:35:31 +02:00
philippe grand
39c2c6b61b the form should be outside table to avoid errors 2015-08-15 15:30:12 +02:00
philippe grand
d596f5222b the form should be outside table to avoid errors 2015-08-15 15:08:11 +02:00
philippe grand
ece6d1bf02 the form should be outside table to avoid errors 2015-08-15 11:21:50 +02:00
Laurent Destailleur
f3c4e20db2 Fix centering of message on logon page 2015-08-15 03:41:57 +02:00
Laurent Destailleur
52240eec9a Fix removed warnings 2015-08-15 02:44:05 +02:00
Laurent Destailleur
d9b3069813 Fix: When validation and approval where done in same step, label of 
action used always label for validation.
 2015-08-15 02:34:15 +02:00
Laurent Destailleur
3bdd342df1 Fix #3116 2015-08-14 23:53:59 +02:00
Laurent Destailleur
d408193657 Fix: When stock is empty, no information was visible to explain why 
create button does not work.
 2015-08-14 20:37:20 +02:00
Laurent Destailleur
10d3c41358 Fix Bad value into popup 2015-08-14 20:07:11 +02:00
Laurent Destailleur
5ed3d80103 Merge pull request #3385 from marcosgdf/bug-3321 
FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights
 2015-08-14 18:10:28 +02:00
Laurent Destailleur
cacfe454a9 Merge pull request #3382 from hregis/3.7_bug 
Fix: place the form outside the table for avoid errors
 2015-08-14 18:09:57 +02:00
Laurent Destailleur
6c01403ef3 Merge branch 'resources-fixes' of https://github.com/IonAgorria/dolibarr 
into IonAgorria-resources-fixes

Conflicts:
	htdocs/core/tpl/resource_add.tpl.php
	htdocs/resource/element_resource.php
 2015-08-14 17:53:52 +02:00
Laurent Destailleur
2abb90713e Fix list of resource not visible 2015-08-14 17:35:05 +02:00
Laurent Destailleur
58988d3084 3.5.8 2015-08-14 16:12:36 +02:00
Laurent Destailleur
cfc7658399 Merge pull request #3380 from FHenry/3.8 
FIX : Fix demo dump data, date '0000-00-00 00:00:00' is not valid, replace by NOW()
 2015-08-14 15:52:57 +02:00
Laurent Destailleur
84d4cbdbcc Merge remote-tracking branch 'origin/3.7' into develop 2015-08-14 15:14:33 +02:00
Laurent Destailleur
343f4086bc Remove dead code 2015-08-14 15:12:40 +02:00
Laurent Destailleur
d13b8b8284 Fix better translation 2015-08-14 13:04:35 +02:00
Laurent Destailleur
1731b1a11b Fix: transparency of event was lost 2015-08-14 13:01:20 +02:00
Laurent Destailleur
d19f1722a2 Fix: when there is several events on agenda view per user, we must 
include ref into label to have different titles.
 2015-08-14 12:31:09 +02:00
Marcos García de La Fuente
b3a7b44046 FIX [ bug #3321 ] Users with certain permissions were shown a "forbidden access" page even if they had the rights 
Close #3321
 2015-08-14 12:29:32 +02:00
Regis Houssin
fdf6c32fbc Fix: place the form outside the table for avoid errors 2015-08-13 12:47:04 +02:00
Florian HENRY
a916b75ad8 FIX : Better const usage in accountancy module 2015-08-13 11:32:31 +02:00
Florian HENRY
2775250ce4 Fix TYPE_SITUATION on sell journals 2015-08-13 11:23:27 +02:00
Florian HENRY
6806e2b36b FIX : Accountancy expert module filter on column must not launch ventil 
ventil
 2015-08-13 10:27:35 +02:00
Laurent Destailleur
d5ed875427 Fix no need the star for this case 2015-08-13 05:23:25 +02:00
Laurent Destailleur
3938a35455 Update template 2015-08-13 05:15:42 +02:00
Laurent Destailleur
0226f53098 Fix When selecting another email template, the topic was not replaced. 2015-08-13 05:09:26 +02:00
Laurent Destailleur
fc8a822f1d Merge remote-tracking branch 'origin/3.7' into develop 2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:58:32 +02:00
Laurent Destailleur
04812bf422 Fix date not visible and label of edit button not correct 2015-08-13 03:38:23 +02:00
Laurent Destailleur
1595765ec8 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	htdocs/compta/facture/class/facture.class.php
 2015-08-13 03:18:02 +02:00
Laurent Destailleur
418a609b73 Fix PHPCS 2015-08-13 03:06:25 +02:00
Laurent Destailleur
4a6239f9a7 Fix no default value for dangerous actions 2015-08-13 02:52:58 +02:00
Laurent Destailleur
460a78e3e5 Fix translation 2015-08-13 02:13:34 +02:00
Laurent Destailleur
74bf751ca1 Fix: Missing dol_fiche_head and end 2015-08-13 01:33:04 +02:00
Laurent Destailleur
811169b2ae Fix: do not show desc if empty 2015-08-13 01:26:25 +02:00
Laurent Destailleur
8122ed9ec3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-13 00:51:49 +02:00
Laurent Destailleur
ba67cf9fa6 Update doc 2015-08-13 00:51:32 +02:00
Laurent Destailleur
af2d63d7e5 Merge pull request #3368 from marcosgdf/bug-3211 
FIX [ bug #3211 ] Error about sold to pay (Montant encours)
 2015-08-13 00:15:13 +02:00
Laurent Destailleur
dc4b429a33 Merge branch 'bug-3313' of https://github.com/marcosgdf/dolibarr into 
marcosgdf-bug-3313

Conflicts:
	ChangeLog
 2015-08-13 00:13:36 +02:00
Laurent Destailleur
4b51fc80a6 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 
Conflicts:
	ChangeLog
 2015-08-13 00:06:27 +02:00
Laurent Destailleur
4a124c6ee9 Merge pull request #3350 from tomours/develop 
FIX #3349 Checking a VAT number with spaces
 2015-08-12 23:51:37 +02:00
Laurent Destailleur
958321b64d Merge pull request #3340 from atm-maxime/3.6 
Rowid was missing on expedition line so no origin id when creating an invoice
 2015-08-12 23:39:43 +02:00
Laurent Destailleur
16ee7b461c Merge pull request #3332 from atm-gauthier/3.7_fix_display_country_name_on_vcard 
FIX : Display country name instead of country id (display country id …
 2015-08-12 23:38:36 +02:00
Laurent Destailleur
923203802c fix dangerous sql injection #3327 2015-08-12 23:33:09 +02:00
Laurent Destailleur
25e729cf4d Revert "Fix #3322 Use title for alt if no alt is provided" 
This reverts commit 2cf9d9f583.
 2015-08-12 23:18:07 +02:00
Laurent Destailleur
2c791e528d Revert "unit price not used if qty = 1" 
This reverts commit fb25f479f2.
 2015-08-12 23:15:32 +02:00
Laurent Destailleur
f1e87478ff Fix translation of printing menu 2015-08-12 23:12:15 +02:00
Laurent Destailleur
f5c2378d91 Fix CSS 2015-08-12 22:38:40 +02:00
Laurent Destailleur
d4aabf99db Fix permission of module 2015-08-12 22:32:29 +02:00
Laurent Destailleur
b5730a24bc Fix W3C 2015-08-12 22:28:30 +02:00
Laurent Destailleur
fc9dc100b1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-08-12 22:13:19 +02:00
Laurent Destailleur
daeada4bae Merge branch 'patch-70' of https://github.com/defrance/dolibarr into 
defrance-patch-70

Conflicts:
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql
 2015-08-12 22:12:50 +02:00
Ion Agorria
2e1e9017c6 Missed the file 2015-08-12 22:00:51 +02:00
Ion Agorria
f3cd9da73d Resource fixes 2015-08-12 21:48:00 +02:00
Juanjo Menent
f98c61fc06 Merge pull request #3376 from FHenry/develop_darkjeff 
NEW :  fix some feature on accountancy modules (devellop)
 2015-08-12 18:46:34 +02:00
Juanjo Menent
78d1dfae11 Merge remote-tracking branch 'origin/3.7' into develop 2015-08-12 18:41:44 +02:00
Juanjo Menent
e4a9ca8b45 Merge pull request #3373 from hregis/3.7_bug 
Fix: missing entity in cache files names
 2015-08-12 18:38:39 +02:00
Juanjo Menent
993037ec9e Merge pull request #3371 from atm-gauthier/new_add_event_type_on_third_party_card_agenda_tab 
NEW : print event type on third party card tab agenda list (only if A…
 2015-08-12 18:25:20 +02:00
Florian HENRY
17146fdef7 fix stuff 2015-08-12 16:11:00 +02:00
Florian HENRY
adccd5d04f fix some feature on accountancy modules 2015-08-12 15:53:17 +02:00
Florian HENRY
f2c59405d4 Merge branch 'develop' into develop_darkjeff 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
 2015-08-12 14:23:51 +02:00
josemariagomezroncero
e146af3118 Update llx_c_type_resource.sql 
Error create table, missing incremet type element
 2015-08-11 22:38:21 +02:00
Francis Appels
1d85529eda Fix delete not used empty stock record 
When removing all stock from warehouse are move all stock to other
warehouse, there is still an 0 stock record in in the stock table for
the source warehouse, not visible in Dolibarr.
 2015-08-11 22:01:26 +02:00
Regis Houssin
ebe4969723 Fix: missing entity in cache files names 2015-08-11 10:22:06 +02:00
Marcos García de La Fuente
02f4e9f5cb Merge branch '3.7' into bug-3211 
# Conflicts:
#	ChangeLog
 2015-08-11 10:12:36 +02:00
Juanjo Menent
6964f80d8f Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 21:06:27 +02:00
Juanjo Menent
95e8148f78 Merge pull request #3294 from GPCsolutions/totalvalidator 
Totalvalidator
 2015-08-10 20:56:31 +02:00
Juanjo Menent
a6d7977d4f Merge pull request #3354 from defrance/patch-74 
New pdf for project - listing of elements
 2015-08-10 20:51:58 +02:00
Juanjo Menent
f3517871a9 Merge pull request #3357 from atm-maxime/new_stats_percent 
New : % of evolution on stats
 2015-08-10 20:51:08 +02:00
Juanjo Menent
d39b6a6bfa Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 20:46:35 +02:00
Juanjo Menent
e1f627ca8e Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:37:44 +02:00
Juanjo Menent
7d18adebb1 Merge pull request #3369 from marcosgdf/minor 
Fixed minor problem with error alert when creating user
 2015-08-10 20:35:03 +02:00
Juanjo Menent
c96573dcb4 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 20:29:36 +02:00
Juanjo Menent
b3f3cdda3a Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 20:16:05 +02:00
Marcos García de La Fuente
e2797ddd40 Merge branch '3.6' into bug-3342 
# Conflicts:
#	ChangeLog
 2015-08-10 17:48:18 +02:00
Marcos García de La Fuente
202d12ffef Merge branch '3.7' into bug-3211 
# Conflicts:
#	ChangeLog
 2015-08-10 17:42:38 +02:00
tomours
9267fe367e FIX #3372 - Printing issue with Postgres and dates (SQL format) 
After connecting to the database, we force datestyle to "ISO, YMD", so dates returned by the db will have a format compatible with Dolibarr functions.
This will fix dates printing issues in mostly all pages, with a postgres db configured with "SQL, DMY" as default.
 2015-08-10 15:10:58 +02:00
tomours
ef5d394b84 FIX #3349 Allow checking a VAT number with spaces 
One of the first things I did, while starting to try Dolibarr, was to fill info about my company.
I filled my VAT number : "FR 13 794..." and saw the "check" button.
Oh, that's nice ! Click. Didn't work :(
In fact, it didn't work because the webservice Dolibarr uses to check VAT numbers doesn't understand spaces.

By doing this we could enter good looking VAT numbers (with spaces) and still check them.
 2015-08-10 15:10:47 +02:00
Juanjo Menent
9374b4f3e3 Merge remote-tracking branch 'origin/3.6' into 3.7 2015-08-10 12:14:18 +02:00
Juanjo Menent
3823744e8e Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 11:32:55 +02:00
Juanjo Menent
ae25846e25 Merge remote-tracking branch 'origin/3.7' into 3.8 2015-08-10 11:31:38 +02:00
Juanjo Menent
5f70e94905 Merge pull request #3360 from marcosgdf/bug-3286 
Fix [ bug #3286 ]: Payment types are not translated to English
 2015-08-10 11:25:20 +02:00
Juanjo Menent
63d77b2ddd Merge remote-tracking branch 'origin/3.8' into develop 2015-08-10 11:11:43 +02:00
Juanjo Menent
b2f5ae7aa8 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/boxes/box_task.php
 2015-08-10 11:09:22 +02:00
Darkjeff
2500e26072 update product account 
clean sql if buy or sell
 2015-08-10 10:29:05 +02:00
Marcos García de La Fuente
8a1c5450c2 Fixed minor problem with error alert when creating user 2015-08-09 18:26:12 +02:00
Marcos García de La Fuente
2f6587b48e FIX [ bug #3211 ] Error about sold to pay (Montant encours) 
Close #3211
 2015-08-09 18:08:22 +02:00
Marcos García de La Fuente
f3ef4fed93 Fix: [ bug #3313 ] Error enabling module with PostgreSQL database 
Close #3313
 2015-08-09 13:58:03 +02:00
Marcos García de La Fuente
7cb564586e Fix: [ bug #3310 ] OrderLine::fetch, FactureLigne::fetch and PropaleLigne::fetch do not return anything 
Close #3310
 2015-08-09 13:52:02 +02:00
Marcos García de La Fuente
2f921b6431 Fix [ bug #3342 ]: Taxes dictionary page does not accept localized decimals for localtax2 rate 
Close #3342
 2015-08-09 13:46:48 +02:00
Marcos García de La Fuente
a24f29ba8b Fix [ bug #3341 ]: Missing translation in /compta/paiement_charge.php 
Close #3341
 2015-08-09 13:37:05 +02:00
Marcos García de La Fuente
e725d44565 Fix [ bug #3286 ]: Payment types are not translated to English 
Close #3286
 2015-08-09 13:24:23 +02:00
Marcos García de La Fuente
cccc543065 Fix: [ bug #3288 ] Tasks box is not properly drawn 
Close #3288
 2015-08-09 13:16:55 +02:00
Juanjo Menent
a11962454f Best way to change ref and ref_supplier 2015-08-07 18:18:07 +02:00
Juanjo Menent
28a1612b8d Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 18:05:09 +02:00
Juanjo Menent
fd6f7dfa61 Fix #3355 2015-08-07 18:01:13 +02:00
Juanjo Menent
841cc0fe5e Fix #3355 2015-08-07 17:52:21 +02:00
Juanjo Menent
0d1b4e6911 Update fr_FR and es_ES printing message. Transifex works only for develop branch... 2015-08-07 17:09:36 +02:00
Maxime Kohlhaas
1cbb20c89f Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_stats_percent 2015-08-07 13:30:12 +02:00
Maxime Kohlhaas
0afd27e3c2 New : % of evolution on stats 2015-08-07 13:29:11 +02:00
Juanjo Menent
f695b5cd11 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 13:01:53 +02:00
Juanjo Menent
38afb1a4e6 Merge remote-tracking branch 'origin/3.7' into 3.8 
# Conflicts:
#	htdocs/core/modules/modBarcode.class.php
 2015-08-07 12:57:16 +02:00
Juanjo Menent
12b83fd3e8 Fix #3304 2015-08-07 12:45:27 +02:00
Juanjo Menent
af55c8467b Merge remote-tracking branch 'origin/3.8' into develop 
# Conflicts:
#	htdocs/printing/admin/printing.php
 2015-08-07 10:14:30 +02:00
Juanjo Menent
ef6b96b4c7 Fix #3236 2015-08-07 10:12:10 +02:00
Juanjo Menent
9f2b4c503e Fix #3236 2015-08-07 09:57:43 +02:00
Juanjo Menent
9610a493c9 Merge remote-tracking branch 'origin/3.8' into develop 2015-08-07 09:29:36 +02:00
Juanjo Menent
5177c5f227 fix #3338 broken links on shippment card 2015-08-07 09:27:46 +02:00