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

27754 Commits

Author SHA1 Message Date
Laurent Destailleur
dfda863b7e Update files for 3.2.2 2012-09-02 15:21:43 +02:00
Laurent Destailleur
7a3f6b9acc Fix: error report when duplicate product 2012-09-02 15:10:37 +02:00
Laurent Destailleur
de7b060e12 Works on larger screens 2012-09-02 14:44:28 +02:00
Laurent Destailleur
f25802520a Fix: Avoid repeat of img 2012-09-02 14:33:22 +02:00
Laurent Destailleur
a7d6289d4b Fix: edit of percentage 
Conflicts:
	htdocs/comm/action/fiche.php
 2012-09-02 14:27:00 +02:00
Regis Houssin
d12700aeab Fix: for compatibility and avoid error if external module use 
$conf->module_parts
 2012-09-02 12:28:36 +02:00
Regis Houssin
77688cf988 Fix: comptibility between bureau2crea theme and multicompany module 2012-09-02 11:52:10 +02:00
Regis Houssin
b66aeabb88 Fix: broken features and uniformize code 2012-09-02 09:25:40 +02:00
simnandez
9fbd6f0b58 Fix: Modify spanish VAT to new rates 2012-09-01 18:25:46 +02:00
simnandez
6e12d84f14 Fix: Modify spanish VAT to new rates 2012-09-01 16:39:47 +02:00
Laurent Destailleur
1eac98dc43 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-08-31 12:47:24 +02:00
Laurent Destailleur
6691bef701 Fix: Start and end date not saved at project creation 2012-08-31 12:44:55 +02:00
Laurent Destailleur
7a42514833 Fix: bug for default vat definition 2012-08-30 21:14:30 +02:00
Laurent Destailleur
749f371d4e Merge pull request #360 from GPCsolutions/3.2-lang 
FIXED: Spelling mistakes in the french translation of product/admin/prod...
 2012-08-30 10:41:30 -07:00
Laurent Destailleur
bee6b92a7b Fix: Bad test 2012-08-30 16:55:59 +02:00
Laurent Destailleur
36ff4abe3c Fix: enhance cleaning of database 2012-08-30 16:52:20 +02:00
Cédric Salvador
6012dff11e FIXED: Spelling mistakes in the french translation of product/admin/product_extrafields.php 2012-08-29 18:58:27 +02:00
Laurent Destailleur
6c62b64b7c Fix: Test on ref and ref_ext into webservice 2012-08-29 10:21:25 +02:00
Laurent Destailleur
d4ac506d66 Missing translation key 2012-08-28 22:33:40 +02:00
Laurent Destailleur
e5c2d07c53 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-08-28 18:42:39 +02:00
Laurent Destailleur
05de9c19c3 Fix: permission for a user to view its own card using webservice 2012-08-28 18:39:34 +02:00
simnandez
85eedfa6e7 Fix: Bad assignation of const for pdf delivery module name 2012-08-27 08:52:10 +02:00
Laurent Destailleur
e121ab8c86 [ bug #512 ] Filter system not working in banks > account > transactions 
Conflicts:
	htdocs/compta/bank/account.php
 2012-08-26 19:33:32 +02:00
Laurent Destailleur
fe76902342 Fix: Bad field 2012-08-26 13:15:51 +02:00
Laurent Destailleur
9142e3400b Fix: [ bug #254 ] Database backup not working with complex passwords 2012-08-26 00:52:10 +02:00
Regis Houssin
87cc60d647 Revert "Fix: remove obsolete code" 
This reverts commit c5728843a5.
 2012-08-25 10:59:58 +02:00
Regis Houssin
c5728843a5 Fix: remove obsolete code 
Conflicts:
	htdocs/admin/expedition.php
 2012-08-25 10:59:41 +02:00
simnandez
bc2411098c Fix: Bad assignation of const for pdf delivery module name 2012-08-24 17:45:44 +02:00
simnandez
0dafeb8e44 Fix: Bad assignation of const for pdf delivery module name 2012-08-24 17:30:22 +02:00
simnandez
084efd03a3 Fix: Bad assignation of const for pdf delivery module name 2012-08-24 17:26:36 +02:00
Regis Houssin
61372f4650 Fix: rename for security raison 2012-08-23 18:14:02 +02:00
Regis Houssin
049e588341 Fix: move barcode type entries in module descriptor for best 
compatibility with multicompany
 2012-08-22 17:46:11 +02:00
Regis Houssin
2d15b64f24 Fix: wrong ereg 2012-08-21 11:46:50 +02:00
Laurent Destailleur
6bab2e0bd8 Fix: The backto use bad url. 2012-08-20 14:17:29 +02:00
Regis Houssin
f425762e9d Fix: missing show field if "in progress" is chosen first 2012-08-20 08:21:05 +02:00
Regis Houssin
81970b8dd0 Fix: avoid warning "is not a legal ECMA-262 octal constant" 2012-08-20 08:12:51 +02:00
Laurent Destailleur
cb96735f50 Fix: [ bug #506 ] Can't set percentage of a started event 2012-08-20 02:16:53 +02:00
Laurent Destailleur
fb2fd71ff4 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-08-20 02:16:26 +02:00
Regis Houssin
6c2d9baeb5 Fix: remove old accountancy code, can cause blank screen 2012-08-20 00:34:06 +02:00
Laurent Destailleur
cef55097ea Fix: Default value was not defined 2012-08-20 00:29:13 +02:00
Marcos García
552c82a032 Fixed bug #504 
https://doliforge.org/tracker/?func=detail&aid=504&atid=246&group_id=144
 2012-08-19 07:51:51 +02:00
Regis Houssin
d6f1f870a2 Fix: bad rights 2012-08-18 10:51:13 +02:00
Regis Houssin
2e38300ec4 Fix: [ bug #501 ] Error while trying to modify an user 2012-08-18 10:16:25 +02:00
Regis Houssin
5f8530d0c0 Fix: [ bug #503 ] Unable to delete linked file to a deposit 
Conflicts:
	htdocs/compta/paiement/cheque/fiche.php
 2012-08-18 09:01:17 +02:00
Marcos García
2bd7dc68d3 Project::setClose wasn't setting the new status 2012-08-18 07:35:55 +02:00
Marcos García
173ff4f92a 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

Conflicts:
	htdocs/projet/tasks/document.php
 2012-08-18 07:35:39 +02:00
Marcos García
1f9e0d3e00 Translated message was generating an incomplete string 2012-08-17 20:19:10 +02:00
Regis Houssin
b2ff7b5ea1 Fix: limit to products and services 2012-08-15 10:35:15 +02:00
Marcos García
f03e0965e2 Forgot to rename the variable 2012-08-15 07:32:10 +02:00
Marcos García
acb9380f1c Fixed a problem with supplier's orders stats 
They were showing orders even if they were not approved or ordered

Conflicts:
	htdocs/commande/class/commandestats.class.php
 2012-08-15 07:31:55 +02:00
Marcos García
40660482d4 Fixed more average amount graph stats. They include: 
* Customer's orders
* Supplier's orders
* Customer's invoices
* Trips and expense

Conflicts:
	htdocs/commande/stats/index.php
 2012-08-15 07:30:28 +02:00
Regis Houssin
f1cbb10edc Fix: wrong user count 2012-08-14 19:52:51 +02:00
Marcos García
640f001bba Propal stats weren't showing average total for more than 1 year 
Conflicts:
	htdocs/comm/propal/stats/index.php
	htdocs/core/class/stats.class.php
 2012-08-14 16:30:16 +02:00
Marcos García
78a26d61ad 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 10:23:38 +02:00
Laurent Destailleur
3670cfd966 Fix: Broken feautres after migration from old versions 2012-08-10 19:16:53 +02:00
Laurent Destailleur
d090788caa Fix: Do not run request if param is empty 2012-08-08 14:08:37 +02:00
Laurent Destailleur
db4240afad Fix: Do not overwrite global $user information 2012-08-08 09:23:57 +02:00
Raphaël Doursenaud
34673e220d Fix: Display correct user in project tasks' time spent list 
Use a local object rather than modifying the global $user object (sic!)
 2012-08-08 09:21:29 +02:00
Laurent Destailleur
7f7fa693f3 Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-08 04:09:25 +02:00
Laurent Destailleur
4786ab9268 Fix: Specimen generation fails 2012-08-08 04:06:19 +02:00
Laurent Destailleur
0db0ab34b4 [ bug #480 ] Can't receive to stock with strict mode 2012-08-07 19:36:34 +02:00
Laurent Destailleur
69b65de41b Fix: Missing desc field 2012-08-07 19:11:26 +02:00
Laurent Destailleur
0f2a1a854b Fix: autoselect when it should not 2012-08-07 18:59:07 +02:00
Laurent Destailleur
32a7747440 Fix: Delete all files (PROV* when validating. 2012-08-07 16:05:00 +02:00
Regis Houssin
0a8ae2934d Fix: remove unused file and missing print 2012-08-06 20:41:17 +02:00
Regis Houssin
afeabd44f0 Fix: update jquery fileupload 2012-08-06 19:06:11 +02:00
Regis Houssin
99e234d703 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-08-06 17:41:06 +02:00
Regis Houssin
117cd337dd Fix: missing object 2012-08-06 17:39:56 +02:00
Regis Houssin
4f5432160d Fix: remove draft status if invoice is validated 2012-08-06 09:14:44 +02:00
Laurent Destailleur
92624d650f Fix into categorie functions 2012-08-05 23:59:13 +02:00
Laurent Destailleur
8b2f1eee13 Fix: W3C 2012-08-05 22:01:26 +02:00
Regis Houssin
96726c1c9b Fix: function setEventMessage() not in 3.2 2012-08-05 21:18:36 +02:00
Regis Houssin
bbe270d4bf Fix: missing delete shipping and delivery files 
(minimum for possibility to merge with 3.2)

Conflicts:
	htdocs/core/modules/livraison/modules_livraison.php
	htdocs/livraison/class/livraison.class.php
 2012-08-05 20:42:06 +02:00
Regis Houssin
bb74a63d59 Fix: delete pdf if supplier invoice is deleted 
Fix: compatibility with external modules
(minimum for 3.2)
 2012-08-05 18:37:48 +02:00
Regis Houssin
b1f3dbd45e Fix: indentation 2012-08-05 18:37:34 +02:00
Regis Houssin
da8bc79c6d Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-08-05 18:37:17 +02:00
Regis Houssin
54134e3d19 Fix: compatibility with jquery fileupload 2012-08-05 18:36:59 +02:00
Laurent Destailleur
fa4c69c52f Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-05 14:55:21 +02:00
Laurent Destailleur
e1f57b60e3 Qual: Removed bad herit 2012-08-05 14:46:24 +02:00
Regis Houssin
da29ea89a7 Fix: avoid warning with php 5.4 2012-08-05 14:34:37 +02:00
Laurent Destailleur
fe672e1e4b Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-08-05 00:46:39 +02:00
Laurent Destailleur
be4960cfbb Fix: exit code when upgrade is ran from command line 2012-08-05 00:46:10 +02:00
Regis Houssin
e4f7df25b0 Fix: remove unused code for avoid warning with IE9 2012-08-04 13:52:02 +02:00
Laurent Destailleur
3778d206ac Fix: project validation 2012-08-03 19:05:49 +02:00
Laurent Destailleur
f4c9da5e9f Fix: Bad object 2012-08-03 18:53:31 +02:00
Laurent Destailleur
a2641b89e7 Fix: Bad fix 2012-08-03 18:43:30 +02:00
Laurent Destailleur
983c38a33d Fix: tr_TR 2012-08-03 17:10:59 +02:00
Regis Houssin
899f4df9ed Fix: [bug #478] Can access pages belonging to disabled modules 2012-08-03 11:58:33 +02:00
Regis Houssin
ae0a746510 Fix: bad document path with multicompany 2012-08-01 19:35:55 +02:00
Regis Houssin
f6afc75d96 Fix: avoid errors if install directory is deleted before module 
activation
 2012-08-01 14:43:28 +02:00
Regis Houssin
a2db2c5012 Fix: regression (multicompany) 2012-08-01 13:04:32 +02:00
Laurent Destailleur
ae6e3ad5c4 [ bug #464 ] Payment form should allow to add transmitter for bank transfers 2012-07-31 13:44:58 +02:00
Laurent Destailleur
e15834dae2 Fix: Removing chekstyle warning helps me to find real bugs 2012-07-29 15:27:37 +02:00
Laurent Destailleur
8a77ffe58f Fix: Removing chekstyle warning helps me to find real bugs 2012-07-29 15:08:03 +02:00
Marcos García
498ac04ad1 Typo in es_ES translation 2012-07-28 18:39:27 +02:00
Regis Houssin
c77ecc15c9 Fix: reorder include 2012-07-28 09:59:30 +02:00
Marcos García
4ff5f1bf1c Duplicated code 2012-07-27 23:50:36 +02:00
Regis Houssin
a37035c862 Fix: uniformize code 2012-07-27 14:14:26 +02:00
Regis Houssin
cbb5ca229a Merge pull request #259 from FHenry/3.2 
Correct bug 472
 2012-07-27 05:12:16 -07:00
Raphaël Doursenaud
954f46ec62 Fix: Allows to use a comma decimal separator in supplier invoices 
payments
 2012-07-27 13:55:25 +02:00
FHenry
9798ddad80 Correct bug 472 2012-07-27 10:41:26 +02:00
Regis Houssin
c429c421da Fix: Bug #460 - Wrong entity assignment when creating a warehouse 2012-07-26 20:50:24 +02:00
Regis Houssin
51ccb33964 Fix: carriage return 2012-07-26 18:12:02 +02:00
Regis Houssin
c55eabeaff Fix: external user confidentiality 2012-07-26 18:11:50 +02:00
Regis Houssin
a92bb8373a Fix: bad path 2012-07-26 17:04:50 +02:00
Regis Houssin
46304c8d98 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-07-26 14:37:21 +02:00
Regis Houssin
5c93da8a72 Fix: problem with double quote 2012-07-26 14:37:10 +02:00
Laurent Destailleur
087644a861 Update translation for tr_TR 
Conflicts:
	htdocs/langs/tr_TR/admin.lang
	htdocs/langs/tr_TR/agenda.lang
	htdocs/langs/tr_TR/bills.lang
	htdocs/langs/tr_TR/bookmarks.lang
	htdocs/langs/tr_TR/boxes.lang
	htdocs/langs/tr_TR/cashdesk.lang
	htdocs/langs/tr_TR/categories.lang
	htdocs/langs/tr_TR/commercial.lang
	htdocs/langs/tr_TR/companies.lang
	htdocs/langs/tr_TR/compta.lang
	htdocs/langs/tr_TR/dict.lang
	htdocs/langs/tr_TR/install.lang
	htdocs/langs/tr_TR/main.lang
	htdocs/langs/tr_TR/propal.lang
	htdocs/langs/tr_TR/sendings.lang
 2012-07-25 17:59:35 +02:00
Regis Houssin
1b5f540d93 Fix: can't read permissions with an external module in root directory 
instead "custom" directory
 2012-07-25 13:32:25 +02:00
Regis Houssin
a0f78aad4a Fix: for compatibility 2012-07-25 12:57:59 +02:00
Laurent Destailleur
70cf8227a2 Fix: Products with no prices not visible 
Conflicts:
	htdocs/core/class/html.form.class.php
 2012-07-25 12:47:50 +02:00
FHenry
58e61781e1 Remove useless paramater 2012-07-24 17:31:30 +02:00
FHenry
8a2e5b5962 Fix style 2012-07-24 14:34:23 +02:00
FHenry
1891e7364a Fix nb mass mailling receive according other status than read 2012-07-24 14:32:03 +02:00
FHenry
bc9d85b03f Unsubscribe tag spelling correction 2012-07-24 09:28:16 +02:00
FHenry
3e2e3b2bcb Correction mail unsubcribe translation 2012-07-23 18:58:40 +02:00
Laurent Destailleur
ab71e4f891 Better fix 2012-07-23 11:02:53 +02:00
Regis Houssin
a4ec4224b0 Fix: bug #467 2012-07-23 10:31:58 +02:00
Laurent Destailleur
0b77cb3a5d Fix: Translation missing 2012-07-22 23:07:56 +02:00
Laurent Destailleur
b4aa076a82 Fix: escape for create command 2012-07-22 21:53:50 +02:00
Laurent Destailleur
dc532cc2d4 Fix: escape for create command 2012-07-22 21:48:43 +02:00
Laurent Destailleur
3efa77a70f Merge branch '3.2' of git@github.com:Dolibarr/dolibarr.git into 3.2 2012-07-22 17:15:39 +02:00
Laurent Destailleur
a8d32b71bf Merge pull request #254 from marcosgdf/minor-fixes 
Minor fixes
 2012-07-22 08:15:18 -07:00
Laurent Destailleur
8074022e8f Fix: dol_syslog at wrong place. 2012-07-22 16:58:03 +02:00
Laurent Destailleur
bcde526db1 Fix: sql injection for create database 2012-07-22 16:57:57 +02:00
Laurent Destailleur
23c4f78df0 Merge pull request #255 from marcosgdf/fix-bug-452 
Fixed bug #452
 2012-07-22 07:32:10 -07:00
Marcos García
148e40e07c Moved bookmark translations from other.lang to bookmarks.lang, also removed unused translations 2012-07-22 16:17:49 +02:00
Laurent Destailleur
1eae596f98 Prepare 3.2.1 2012-07-22 14:33:22 +02:00
Laurent Destailleur
2a9456cb83 Fix: Brazilian translation 2012-07-22 14:23:13 +02:00
Laurent Destailleur
f1f9c842f8 Fix: The missing feature to close proposal on order close was fixed 
differently.
 2012-07-22 13:13:38 +02:00
Marcos García
7f243d92e5 Removed unnecesary code 2012-07-22 03:30:21 +02:00
Marcos García
10384e3856 Another mini typo 2012-07-22 02:40:49 +02:00
Marcos García
8bc3608717 Allowed MailmanTitle to be translated, also SPIP should be upper-cased 2012-07-22 02:22:01 +02:00
Marcos García
4b62eaeed2 Typos in es_ES and added missing translations 2012-07-22 01:45:46 +02:00
Marcos García
c5e1b367de Merge branch 'fix-spanish-translation-typo' into minor-fixes 2012-07-22 00:43:45 +02:00
Marcos García
06b6c38379 There's no "Código de barra" 2012-07-22 00:39:06 +02:00
Marcos García
ee0f92f6aa Add missing es_ES translations 2012-07-22 00:08:48 +02:00
Marcos García
49d943e57f Removed duplicated code 2012-07-21 23:54:23 +02:00
Marcos García
3d10d6a559 It was showing Products Area instead of Products and Services Area 2012-07-21 01:08:02 +02:00
Marcos García
ccdaf2ffb4 When viewing a product/service, if we don't know the type of the item, then we use a generic page title. Also fixed typo in es_ES 2012-07-21 00:08:43 +02:00
Marcos García
c0c481a746 Translation Typo in es_ES 2012-07-20 22:46:39 +02:00
Marcos García
c2f465a98a Added some missing translations in es_ES and fixed a typo too 2012-07-20 21:45:13 +02:00
Marcos García
f6fc21f5fb Fixed a minor bug with the BackToList link in a budget detail view reported in Dolibarr.es 
You'll see a lot of lines changed because of incorrect line endings
 2012-07-20 21:25:29 +02:00
Marcos García
c3b18a1e38 Spanish translation typo 2012-07-20 21:19:08 +02:00
Marcos García
11430cd555 Php should be upper-cased. Also removed the string from the lang files as it should not be translated. I even think that in China they call it PHP 2012-07-20 20:38:57 +02:00
Marcos García
fa8fad3b04 SMS should be upper-cased 2012-07-20 20:33:12 +02:00
Marcos García
3ed1795096 Added missing translation 2012-07-20 19:53:43 +02:00
Marcos García
5f0491bc6f There's no disec input... 2012-07-20 19:46:37 +02:00
Marcos García
0ff5a7bc9c Fixed little typo 2012-07-20 18:24:23 +02:00
Regis Houssin
34f790b85e Merge pull request #250 from marcosgdf/fix-some-translations 
Fix some typos on translations
 2012-07-19 14:36:24 -07:00