lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,976 Commits 43 Branches 150 Tags 886 MiB
8a74c928f3
Commit Graph

28380 Commits

Author SHA1 Message Date
Marcos García
fcb4f5ce67 Renamed MySQL alias that could cause conflicts 2012-08-23 09:00:31 +02:00
Marcos García
44cc4ae949 Some strings weren't being translated 
Thanks to @grandoc and I.D & L (idl-mp.com) for the french translations
 2012-08-23 08:46:22 +02:00
Maxime Kohlhaas
332ee652c3 Clear action was called with a rowid instead of id (rowid is for a target of the emailing, id is for the emailing) 2012-08-23 08:45:45 +02:00
Maxime Kohlhaas
39de1cb010 Task 515 : Correction on SQL request 2012-08-23 08:43:29 +02:00
Marcos García
66eabbe4a9 Improved es_ES translations 2012-08-23 08:33:18 +02:00
Marcos García
19bf4ab8df Improvements to translations 
Some available translations weren't being translated
Also corrected wrong translation key
Improved es_ES translation string
 2012-08-23 08:29:38 +02:00
Marcos García
43e4f139d5 Fixed bug #511 
A pagination problem was causing duplicated records
https://doliforge.org/tracker/?func=detail&aid=511&group_id=144
 2012-08-23 08:21:32 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Regis Houssin
c8e1aca7d8 New: [ task #498] part2 2012-08-23 07:50:20 +02:00
Regis Houssin
3cdb2ba8e1 Merge pull request #337 from marcosgdf/coding-style 
Improved coding style
 2012-08-22 22:43:03 -07:00
Regis Houssin
99e7b82b69 Merge pull request #336 from marcosgdf/minor 
Fixed string not being translated
 2012-08-22 22:40:02 -07:00
Regis Houssin
08ea9c4351 Merge pull request #334 from grandoc/develop 
Develop
 2012-08-22 22:39:39 -07:00
Regis Houssin
4bdb2047a9 Merge pull request #335 from marcosgdf/translations 
Added missing en_US translations
 2012-08-22 22:38:46 -07:00
Marcos García
5769c0facc Changed incorrect includes 2012-08-23 02:46:16 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
37c4898720 Removed "./" in require statements 
It does not make any sense to do that
 2012-08-23 01:43:44 +02:00
Maxime Kohlhaas
5fd10d14be Task 515 : Corrections + target modules modifications 2012-08-23 00:00:01 +02:00
Marcos García
56264f0bf5 Fixed incorrect change 2012-08-22 23:44:17 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Marcos García
f3674317ec Removed parenthesis from all require and replaced with single quotes 2012-08-22 23:24:21 +02:00
Marcos García
706d79986c Removed parenthesis from all require_once and replaced with single quotes 2012-08-22 23:11:24 +02:00
Maxime Kohlhaas
06ab1f6f94 Task 515 : New field added on contact : no_email 2012-08-22 22:59:10 +02:00
Marcos García
bed4e7bc72 Fixed string being not translated 2012-08-22 22:36:08 +02:00
Regis Houssin
85c0dd95ca Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-08-22 17:50:07 +02:00
Regis Houssin
4a5d89e6cc Fix: move barcode type entries in module descriptor for best 
compatibility with multicompany
 2012-08-22 17:44:52 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Philippe Grand
f6e31ee6bc Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-22 09:04:41 +02:00
Marcos García
25042c1ef9 Added missing en_US translations 
Made by tanayhan
http://www.dolibarr.org/forum/fbprofile/userid-7996
 2012-08-22 07:13:02 +02:00
Regis Houssin
545cb023ff Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-21 13:48:52 +02:00
Regis Houssin
75bfddd7a6 Fix: wrong ereg 2012-08-21 11:47:56 +02:00
Philippe Grand
6cfe58f083 fix some english translation 2012-08-21 09:39:07 +02:00
Philippe Grand
33ea1e1622 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 14:44:20 +02:00
Laurent Destailleur
2ab1a018df Fix: GETPOST can not always be used to replace isset. 2012-08-20 14:30:16 +02:00
Laurent Destailleur
880276f047 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 14:14:26 +02:00
Laurent Destailleur
fb074daaf1 Fix: The backto use bad url. 2012-08-20 14:14:01 +02:00
Regis Houssin
3c13395d21 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into task498_objectline 2012-08-20 12:10:20 +02:00
Philippe Grand
158019f161 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 11:07:28 +02:00
Regis Houssin
7c623a9a2e Fix: strict mode bounty 2012-08-20 11:04:56 +02:00
Regis Houssin
5dc10cfcae Fix: possibility to defined another value instead 50% 2012-08-20 10:38:48 +02:00
Regis Houssin
c6d008fb1b Fix: broken feature and add FIXME 2012-08-20 09:40:59 +02:00
Regis Houssin
1aa26d0cd7 Fix: missing show field if "in progress" is chosen first 2012-08-20 08:45:39 +02:00
Philippe Grand
b2771660d3 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2012-08-20 08:43:10 +02:00
Regis Houssin
8719f87781 Fix: avoid warning "is not a legal ECMA-262 octal constant" 2012-08-20 08:30:55 +02:00
Regis Houssin
257dcb8928 Merge pull request #332 from marcosgdf/minor 
Fixed incorrect HTML
 2012-08-19 22:47:48 -07:00
Marcos García
63c4cfb609 Fixed incorrect HTML 2012-08-20 02:45:38 +02:00
Marcos García
344f379683 jQuerified events' javascript 2012-08-20 02:42:56 +02:00
Laurent Destailleur
9c31e6b2db Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 02:15:50 +02:00
Laurent Destailleur
218b97f2d0 Fix: [ bug #506 ] Can't set percentage of a started event 2012-08-20 02:15:07 +02:00
Regis Houssin
00781031d8 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-20 01:30:28 +02:00
Regis Houssin
3991e0b13d Fix: add accountancy code error message 2012-08-20 01:29:13 +02:00
Laurent Destailleur
f0d0539766 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2012-08-20 00:40:07 +02:00
Laurent Destailleur
a0796423e9 Move warning to info 2012-08-20 00:39:35 +02:00
Regis Houssin
24cc07815d Fix: remove old accountancy code, can cause blank screen 2012-08-20 00:36:51 +02:00
Laurent Destailleur
c664ac3cfa Fix: Default value was not defined 2012-08-20 00:27:38 +02:00
Regis Houssin
a856ad0afa Fix: strict mode sunshine 2012-08-19 09:05:50 +02:00
Regis Houssin
6729cd9b4b Merge pull request #330 from marcosgdf/fix-bug-504 
Fixed bug #504
 2012-08-18 22:48:24 -07:00
Marcos García
8639f1a414 Fixed bug #504 
https://doliforge.org/tracker/?func=detail&aid=504&atid=246&group_id=144
 2012-08-19 03:37:37 +02:00
Marcos García
bced5f3bca Added missing es_ES translation 2012-08-19 03:36:04 +02:00
Philippe Grand
72895fa4b7 for module ultimatepdf 2012-08-18 21:31:12 +02:00
Regis Houssin
eb24a2fb4d Merge pull request #324 from simnandez/develop 
Trad: Add ca_ES missing translations
 2012-08-18 12:04:58 -07:00
Regis Houssin
88becc9592 Merge pull request #325 from marcosgdf/translations 
Added missing permission translation
 2012-08-18 12:03:41 -07:00
Regis Houssin
4439d829e3 Merge pull request #328 from marcosgdf/coding-style 
Removed duplicated code
 2012-08-18 12:02:52 -07:00
Marcos García
7608905b3c Removed duplicated code 2012-08-18 20:51:30 +02:00
Regis Houssin
b4e324a515 Fix: add ht and ttc fields 2012-08-18 19:05:59 +02:00
Marcos García
d32ed9b39c Missing copyright 2012-08-18 18:49:18 +02:00
Marcos García
44fd4e7eb8 Fixed a SQL error when listing lines of an invoice 
Column 'localtax1_tx' in field list is ambiguous
 2012-08-18 18:47:12 +02:00
simnandez
ea8c380ef3 Trad: Add missing ca_ES translations 2012-08-18 18:45:23 +02:00
Marcos García
12282a8a20 Added missing permission translation 2012-08-18 17:27:12 +02:00
simnandez
c8a1bc5490 Qual: A closed contract no more invoiceable 2012-08-18 16:42:46 +02:00
simnandez
16e5742ae2 Trad: Add ca_ES missing translations 2012-08-18 13:17:27 +02:00
simnandez
8f8cdf78fa Trad: Improve ca_ES and es_ES translations 2012-08-18 12:33:10 +02:00
simnandez
4fdf38b51c Trad: Improve ca_ES and es_ES translations 2012-08-18 12:12:17 +02:00
Regis Houssin
74c1fa2263 Fix: bad rights 2012-08-18 10:52:10 +02:00
Regis Houssin
4aa8d0eb0c Fix: [ bug #501 ] Error while trying to modify an user 2012-08-18 10:19:01 +02:00
Regis Houssin
eeb52eee0d Fix: [ bug #500 ] PHP Warning when creating dict line 2012-08-18 09:57:42 +02:00
Regis Houssin
058d0b1b08 Fix: [ bug #503 ] Unable to delete linked file to a deposit 2012-08-18 08:51:52 +02:00
Regis Houssin
bd99c2d23d Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-08-18 08:31:59 +02:00
Regis Houssin
d03b29ba78 Fix: [ bug #502 ] Error when validating cheque deposit 2012-08-18 08:30:29 +02:00
Regis Houssin
add63c7320 Merge pull request #321 from marcosgdf/minor 
Project::setClose wasn't setting the new status
 2012-08-17 22:28:39 -07:00
Regis Houssin
e7b63faaa8 Merge pull request #320 from marcosgdf/project-upload-bug 
Fixed a bug where files were not being uploaded to a project's task
 2012-08-17 22:27:39 -07:00
Regis Houssin
09e34068bc Merge pull request #319 from marcosgdf/translations 
A lot of improvements into translations
 2012-08-17 22:22:56 -07:00
Marcos García
737b7d4946 Improved es_ES translation 2012-08-18 06:10:58 +02:00
Marcos García
30d7aa0383 Missing es_ES translation and improved the rest of them 2012-08-18 06:00:05 +02:00
Marcos García
4842da5679 Project::setClose wasn't setting the new status 2012-08-18 05:57:25 +02:00
Marcos García
1339796492 Untranslated dict errors 2012-08-18 05:14:21 +02:00
Marcos García
f7a7ca4ff2 Fixed a bug where files were not being uploaded to a project's task 
Reported by Jose Antonio Garcia in dolibarr.es' forum
http://www.dolibarr.es/index.php/foro/7-bugs-versiones-estables/1250-error-subir-archivo-en-una-tarea-de-un-proyecto
 2012-08-18 04:09:28 +02:00
Marcos García
f5b5f88f84 Added missing copyright 2012-08-18 00:04:52 +02:00
Marcos García
46ab7c597a Missing translation in PoS > Print Ticket page 2012-08-17 23:50:22 +02:00
Marcos García
952204564f Missing dict translation because of translated key 2012-08-17 23:43:08 +02:00
Marcos García
da762903bb Missing paper format dict translations 2012-08-17 23:28:15 +02:00
Regis Houssin
bc9ab610ea Merge pull request #317 from simnandez/develop 
Trad: add mailminspip into ca_ES
 2012-08-17 11:16:32 -07:00
Regis Houssin
5ff8d74d34 Merge pull request #316 from marcosgdf/minor 
Translated message was generating an incomplete string
 2012-08-17 11:15:50 -07:00
Regis Houssin
577a853b9b New: update field "qty" with minimum qty for this supplier price 2012-08-17 18:17:15 +02:00
Regis Houssin
878f54b1e9 Fix: invoice supplier, disable "add" button and show error message if a 
product with no supplier price is selected
 2012-08-17 17:23:36 +02:00
Regis Houssin
7394525388 Fix: disable "add" button and show error message if a product with no 
supplier price is selected
 2012-08-17 16:58:57 +02:00
Regis Houssin
3438305169 FIXME: with ajax autocompleter, does not see the products that have no 
supplier prices because they can be selected and it creates an error
message.
Fix: Do not make a "print" on "hook methods", just get the result
 2012-08-17 15:16:07 +02:00
simnandez
f20c7ea4c9 Trad: add mailminspip into ca_ES 2012-08-17 09:38:09 +02:00
Marcos García
8d6d9e8f8c PoS permission number was incorrect in admin.lang 2012-08-17 07:56:54 +02:00
Marcos García
8ab7a5e276 Improved es_ES translations 2012-08-17 07:55:28 +02:00
Marcos García
24c89ddc12 Translated message was generating an incomplete string 2012-08-17 07:05:28 +02:00
Regis Houssin
4825448ced Merge pull request #315 from marcosgdf/error-messages 
Forgot to migrate to some lines to the new error-handler
 2012-08-16 13:59:05 -07:00
Marcos García
29f2e7236a Forgot to migrate to some lines to the new error-handler 2012-08-16 21:37:33 +02:00
Regis Houssin
3468787a29 Fix: best view 2012-08-16 20:20:23 +02:00
Regis Houssin
d03eb5af4a New: add total vat field 2012-08-16 20:11:48 +02:00
Regis Houssin
97474bf77f Fix: strict mode safari 2012-08-16 19:18:24 +02:00
Stephen L
087cf0bb91 Add conditional substitution IF/ELSEIF/ENDIF for ODT 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-16 17:30:32 +02:00
Regis Houssin
e1c009fce4 Fix: regression, formconfirm template can't use with variable content 2012-08-16 17:22:00 +02:00
Regis Houssin
7a30416124 Merge pull request #310 from marcosgdf/error-messages 
Added missing error messages in supplier & customer's orders
 2012-08-16 08:16:56 -07:00
Regis Houssin
b3d09478ca Merge pull request #313 from lrq3000/develophooks 
A lot of hooks and triggers implemented + custom substitution function for lines in ODT
 2012-08-16 08:15:19 -07:00
Stephen L
427da6ed5e Add optional options for mysqlnobin export method. 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-16 16:02:08 +02:00
Stephen L
ed990c00f5 Revert "Add conditional substitution IF/ELSEIF/ENDIF for ODT" 
This reverts commit adab15a30a.

Revert to cleanup (the conditional substitution is in another pull request)
 2012-08-16 13:54:19 +02:00
Marcos García
db5d046ee7 Applied 3.3 error management as @hregis requested 2012-08-16 13:10:14 +02:00
Marcos García
f320ed92cc Translated and upper-cased export formats, improved es_ES translations 
fr_FR exports translations were made by @fhenry and Manuel Pintor (contact@idl-mp.com)
Little refactor too
 2012-08-16 13:07:12 +02:00
Marcos García
3941466cd3 Removed duplicated code 2012-08-16 03:55:41 +02:00
Marcos García
b6cd8b632b Improved es_ES translations 2012-08-15 19:32:26 +02:00
Marcos García
557cb35b8d Added missing translations 2012-08-15 19:17:05 +02:00
Marcos García
cc4d5ff8d8 Removed the use of duplicated key translations 
Nature is now being used instead of MorPhy
UserTitle is now being used instead of Civility
VATIntraVeryShort was being used were not necessary
 2012-08-15 18:55:32 +02:00
Stephen L
44bed57faf Fix: mysqlnobin export method now works better (avoid duplicates values errors when a number is in fact a string and foreign keys checks are always disabled when restoring) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-15 18:35:37 +02:00
Marcos García
46db54da21 Renamed ECMNoDirecotyYet to ECMNoDirectoryYet 2012-08-15 16:06:53 +02:00
Marcos García
b4471a4bd7 Added missing error messages in supplier & customer's orders 2012-08-15 15:52:51 +02:00
Regis Houssin
f714897873 Fix: limit to products and services 2012-08-15 10:34:10 +02:00
Regis Houssin
fbb275ee25 Fix: remove bad fixe 2012-08-15 09:15:26 +02:00
Regis Houssin
48efabc8a4 Fix: remove deprecated function and avoid warnings 2012-08-15 09:06:36 +02:00
Regis Houssin
56c73192f1 Merge pull request #308 from marcosgdf/fix-stats 
More fixes to graph stats
 2012-08-14 22:27:11 -07:00
Regis Houssin
a8c8ef456c Merge pull request #301 from marcosgdf/translations 
Improved some translations
 2012-08-14 22:26:50 -07:00
Marcos García
37332ee040 Forgot to rename the variable 2012-08-15 01:20:53 +02:00
Marcos García
9c179699fb Added missing fr_FR translations 2012-08-14 21:33:32 +02:00
Marcos García
c8851cfca6 Fixed a problem with supplier's orders stats 
They were showing orders even if they were not approved or ordered
 2012-08-14 21:23:50 +02:00
Marcos García
764c0a50cd Fixed more average amount graph stats. They include: 
* Customer's orders
* Supplier's orders
* Customer's invoices
* Trips and expense
 2012-08-14 21:23:14 +02:00
Regis Houssin
b77a2255a0 Fix: wrong user count 2012-08-14 19:54:08 +02:00
Stephen L
c0a314000c Add custom ODT substitution for lines of products (completesubstitutionarray_lines) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 16:03:45 +02:00
Stephen L
c1d15a9572 Add: hooks and triggers for a lot of core modules (action/calendrier, deplacement, dons, tva, contact/tiers, contrat, product lines, expedition, fournisseur commandes et factures, fiche intervention, projet et taches) 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 15:50:45 +02:00
Marcos García
c49e458c6c Propal stats weren't showing average total for more than 1 year 2012-08-14 15:43:14 +02:00
Stephen L
adab15a30a Add conditional substitution IF/ELSEIF/ENDIF for ODT 
Signed-off-by: Stephen L. <lrq3000@gmail.com>
 2012-08-14 11:38:27 +02:00
Marcos García
3e1e508bf3 Fixed bug #485 
Merged patch from J. Fernando Lagrange (lowmemory)
https://doliforge.org/tracker/?func=detail&aid=485&atid=246&group_id=144
 2012-08-14 09:57:03 +02:00
Marcos García
2f011638b1 Merge branch 'develop' into translations 2012-08-13 10:45:45 +02:00
Marcos García
770194aa91 Improved SPIP CMS translation 2012-08-13 06:28:34 +02:00
Marcos García
1b817e79b9 Improved some es_ES translations & fixed untranslated string 2012-08-13 06:26:56 +02:00
Marcos García
0b7cea6c73 Lowercased strings 2012-08-13 04:49:23 +02:00
Marcos García
2c007644ba Better es_ES translation 2012-08-13 03:11:40 +02:00
Marcos García
651d0e4eca Translated es_ES string 2012-08-11 19:14:25 +02:00
Laurent Destailleur
3b2ffb8cc0 Fix: Removed key of external modules 2012-08-11 02:06:34 +02:00
Laurent Destailleur
724ea40fa4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-11 02:00:02 +02:00
Laurent Destailleur
855bcf1b24 Fix: missing or duplicate key 2012-08-11 01:59:45 +02:00
Laurent Destailleur
0251385624 Fix: Broken feautres after migration from old versions 2012-08-10 19:13:54 +02:00
Laurent Destailleur
0176674c9f Add info for chinese 2012-08-10 04:16:31 +02:00
Laurent Destailleur
8627464596 Exclude file 2012-08-10 03:51:53 +02:00
Laurent Destailleur
4250dedf60 Better message if param not defined 2012-08-10 03:46:17 +02:00
Laurent Destailleur
8e16581e7f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-08-10 03:13:54 +02:00
Laurent Destailleur
628f1b17a6 Add missing key 2012-08-10 03:06:16 +02:00