Commit Graph

43814 Commits

Author SHA1 Message Date
Laurent Destailleur
5a8f625ff1 Merge pull request #1942 from fappels/develop
Fix increase stock on shipment validation
2014-10-12 01:36:22 +02:00
Laurent Destailleur
5e0c7688d5 Merge pull request #1949 from defrance69/patch-23
Update product.class.php
2014-10-12 01:33:37 +02:00
Laurent Destailleur
5f0c2b34dc Merge pull request #1954 from marcosgdf/lowecased-booleans
Lowercased booleans to fit with PSR-2 specification.
2014-10-12 01:31:35 +02:00
Laurent Destailleur
44e2cd2194 Prepare code to manage task_datehour with task_date. 2014-10-12 01:20:03 +02:00
Laurent Destailleur
2b479aa0b4 Qual: Uniformize translated label of progress on all pages.
Fix: Color of first line of documents.
Fix: The calculated progress was not calculated.
2014-10-12 01:04:34 +02:00
Marcos García de La Fuente
f7a44347cb Lowecased booleans to fit with PSR-2 specification. 2014-10-12 00:23:19 +02:00
Laurent Destailleur
6c3c1d3a0a Merge pull request #1930 from GPCsolutions/reportprogress
Allow reporting progress along with timespent
2014-10-12 00:10:28 +02:00
Laurent Destailleur
e9881997ed Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-11 23:50:27 +02:00
Laurent Destailleur
bbdf408314 git push origin developMerge branch 'Devensys-develop-HiddenMailPasswordForgotten' into develop 2014-10-11 23:49:55 +02:00
Laurent Destailleur
52e1bd2ad1 Merge 2014-10-11 23:46:49 +02:00
Laurent Destailleur
77ed7bf5df Merge branch 'develop-HiddenMailPasswordForgotten' of
github.com:Devensys/dolibarr into
Devensys-develop-HiddenMailPasswordForgotten

Conflicts:
	htdocs/core/lib/functions.lib.php
2014-10-11 23:44:50 +02:00
Laurent Destailleur
a9e6e93c59 Merge pull request #1953 from jfefe/patch-6
Allow to make PUT request with getURLContent() function
2014-10-11 23:32:25 +02:00
Laurent Destailleur
2800faffa8 Fix: File names must be in lowercase.
Fix: Missing includes.
2014-10-11 18:27:30 +02:00
Laurent Destailleur
a804fe62b4 Fix: translation for vi_VN 2014-10-11 15:46:37 +02:00
Laurent Destailleur
cd8936a224 Clean deprecated code. 2014-10-11 15:04:42 +02:00
Laurent Destailleur
0dc82cddf1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/langs/es_ES/accountancy.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/agenda.lang
	htdocs/langs/es_ES/categories.lang
	htdocs/langs/es_ES/companies.lang
	htdocs/langs/es_ES/compta.lang
	htdocs/langs/es_ES/donations.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/holiday.lang
	htdocs/langs/es_ES/interventions.lang
	htdocs/langs/es_ES/projects.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/suppliers.lang
2014-10-11 14:42:45 +02:00
Laurent Destailleur
8a98f8461d Sync transifex 2014-10-11 14:33:22 +02:00
jfefe
eb06c8a33e Allow to make PUT request with getURLContent() function 2014-10-11 04:25:32 +02:00
Juanjo Menent
f1104275b4 Trad: Syncro es_ES/compta.lang from transifex 2014-10-10 22:11:00 +02:00
Juanjo Menent
2f3abd3774 Trad: Syncro es_ES from transifex 2014-10-10 21:50:05 +02:00
Regis Houssin
c01edd76f6 Fix: avoid warning 2014-10-10 16:53:21 +02:00
Andrelec1
269b960d9a Add support tld with dots 2014-10-10 15:18:24 +02:00
Andrelec1
f4f1f45d5a copyright and annotation 2014-10-10 15:01:10 +02:00
Andrelec1
7978b4503d Add function hideMail and use 2014-10-10 14:57:07 +02:00
BENKE Charles
00c5c940c9 Update product.class.php
Label of product on tooltip is more usefull than the ref who's already on the link
2014-10-09 21:31:35 +02:00
Laurent Destailleur
00fd9acf31 Fix: Bad length of field
Transifex sync
2014-10-09 18:32:23 +02:00
Laurent Destailleur
e76b5a370d Fix: bad parameter 2014-10-09 17:27:14 +02:00
Laurent Destailleur
31a96aa4c6 Fix: CRLF 2014-10-09 17:18:14 +02:00
Laurent Destailleur
a19e8aa89d Sync transifex 2014-10-09 17:15:15 +02:00
Laurent Destailleur
60a6e2a579 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-09 17:06:13 +02:00
Laurent Destailleur
06cc08026b Some fix on per user view. 2014-10-09 17:05:57 +02:00
Laurent Destailleur
0390085f54 Style for install match css of login. 2014-10-09 13:47:40 +02:00
Laurent Destailleur
f9377a4715 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-08 20:57:11 +02:00
Laurent Destailleur
de5005ca54 Fix: Avoid duplicate error message
Fix: pgsql syntax error
2014-10-08 15:35:39 +02:00
Laurent Destailleur
4c4485d0ee More comment to explain and remove a todo. 2014-10-08 15:24:35 +02:00
Laurent Destailleur
56f5c666cc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-08 15:09:32 +02:00
Laurent Destailleur
168b0db094 Fix: button must be align to right 2014-10-08 15:09:07 +02:00
Regis Houssin
cc553514af Fix: add constant MAIN_OVERWRITE_THEME_PATH if the theme does not have
the same name as the module
2014-10-08 14:51:16 +02:00
Laurent Destailleur
2bbede6465 New: Can add product into category from category card. 2014-10-07 21:39:10 +02:00
Laurent Destailleur
0a4d040e9d Fix: Warning sur traduction 2014-10-07 21:15:14 +02:00
Juanjo Menent
75eb61702e Fix: Showing accounting account fails 2014-10-07 12:46:05 +02:00
Laurent Destailleur
cfc5bb845a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-06 14:49:10 +02:00
Francis Appels
1e6240953e Fix increase stock on shipment validation
$obj not set.
Re-enabled delete button for shipment with batches, was increase issue,
not decrease issue.
2014-10-06 14:10:27 +02:00
Regis Houssin
3ddcac5ced Fix: missing $ismultientitymanaged 2014-10-06 09:12:19 +02:00
Regis Houssin
a2446e51db New: add context "globalcard" for declaring only once all cards 2014-10-06 07:20:58 +02:00
Laurent Destailleur
a2fed6f214 Fix: miss dol_fiche_end 2014-10-05 23:26:42 +02:00
Laurent Destailleur
60f643cf1a Change comented log to help debug 2014-10-05 20:26:35 +02:00
Laurent Destailleur
968b021985 Fix trad and sql error 2014-10-05 05:37:01 +02:00
Laurent Destailleur
3b6c533b85 Fix translation 2014-10-05 05:13:46 +02:00
Laurent Destailleur
81c28f528d Fix translation 2014-10-05 05:13:09 +02:00