Commit Graph

27676 Commits

Author SHA1 Message Date
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
Marcos García
af9c8abe9c Fixed Catalan typos too 2012-07-19 20:06:08 +02:00
Marcos García
50129ec945 Contracts box name wasn't being translated 2012-07-19 19:40:56 +02:00
Raphaël Doursenaud
2160e86928 French wording
Réception -> Traitement en cours
2012-07-19 19:34:15 +02:00
Raphaël Doursenaud
0b2e07964f French spelling
Chiffre d'affaire -> Chiffre d'affaires
2012-07-19 19:34:06 +02:00
Regis Houssin
5386f00b0e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-07-19 19:33:55 +02:00
Raphaël Doursenaud
78b0f14b1a Text: Chiffrer 2012-07-19 19:33:37 +02:00
Regis Houssin
467bf090dd Merge pull request #246 from simnandez/3.2
Trad: Better translation
2012-07-19 10:25:31 -07:00
Regis Houssin
4fcbe39fd9 Merge pull request #248 from marcosgdf/fix-contract-translation
The tab Documents of the Contracts module wasn't being translated
2012-07-19 10:25:02 -07:00
Regis Houssin
7ad2de61d1 Merge pull request #249 from marcosgdf/fix-security-seconds-translation
Replaced "Seconds" for "seconds"
2012-07-19 10:24:15 -07:00
Marcos García
d5c95b76a5 Added missing translation and fixed some typos 2012-07-19 19:06:23 +02:00
Marcos García
e7d117c920 Fixed some spanish & catalan translations 2012-07-19 18:41:36 +02:00
Marcos García
9b21aa0a60 Replaced "Seconds" for "seconds" 2012-07-19 18:05:09 +02:00
Laurent Destailleur
f5a4f32b0f [ bug #445 ] Hex escaping in descriptions 2012-07-19 18:04:56 +02:00
Laurent Destailleur
674aa0cf12 Fix: Duplicate begin 2012-07-19 17:28:13 +02:00
Marcos García
d1646e245a The tab Documents of the Contracts module wasn't being translated 2012-07-19 17:18:41 +02:00
Laurent Destailleur
03f85bef83 [ bug #444 ] Regression on auto-closing for proposals and orders 2012-07-19 16:57:10 +02:00
Laurent Destailleur
d68a2cb0d8 Fix: Removed warning 2012-07-19 16:27:03 +02:00
simnandez
5a1e29cc08 Trad: Better translation 2012-07-19 12:28:47 +02:00
Regis Houssin
45b24fff0d Merge pull request #244 from simnandez/3.2
Trad: Add missing translation
2012-07-18 23:44:12 -07:00
Marcos García
4f2a47c4fc Fixed bug https://doliforge.org/tracker/?func=detail&aid=456&atid=246&group_id=144 2012-07-19 02:26:41 +02:00
Laurent Destailleur
f4f2db33f0 Better translation
Conflicts:
	htdocs/langs/en_US/workflow.lang
	htdocs/langs/fr_FR/workflow.lang
2012-07-17 15:30:52 +02:00
Laurent Destailleur
b73014c044 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr.git into 3.2 2012-07-17 01:27:08 +02:00
Laurent Destailleur
53cc1667d5 Fix: error when validating shipment for non predefined products with a
selected warehouse.
2012-07-17 01:26:31 +02:00
simnandez
af9b03e7c7 Trad: Add missing translation 2012-07-14 22:25:14 +02:00
Regis Houssin
dd7c3ed2f8 Merge pull request #243 from simnandez/3.2
Trad: Add missing translations
2012-07-13 07:28:46 -07:00
Regis Houssin
7e25172f03 Fix: missing entity filter 2012-07-13 16:24:12 +02:00
simnandez
a83c118a8f Trad: Add missing translations 2012-07-13 15:56:55 +02:00
simnandez
8014713795 Fix: Bad local taxes if price base type is TTC 2012-07-13 15:02:02 +02:00
simnandez
10e632375f Fix: Bad local taxes if price base type is TTC 2012-07-13 14:40:51 +02:00
Laurent Destailleur
9327858bee Fix: Bad merge 2012-07-13 12:23:17 +02:00
Laurent Destailleur
b801a391a4 Fix: Phone not saved when using web service 2012-07-13 12:15:16 +02:00
Regis Houssin
20704d6a5c New: classify billed order if invoice billed (workflow
manager)

Conflicts:
	htdocs/core/class/commonobject.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/langs/en_US/workflow.lang
	htdocs/langs/fr_FR/workflow.lang
2012-07-13 12:14:41 +02:00
Regis Houssin
1af4834f10 Fix: for multicompany transverse mode 2012-07-10 13:43:38 +02:00
Regis Houssin
02f30aeee2 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-10 13:40:17 +02:00
Laurent Destailleur
58b2b91928 Fix: removed warning 2012-07-08 16:55:42 +02:00
Regis Houssin
3686fad393 Fix: compatibility with multicompany and transverse mode 2012-07-07 15:25:21 +02:00
Regis Houssin
8b832f475f Fix: getpost error 2012-07-07 12:53:27 +02:00
Regis Houssin
925bded6d9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 12:29:04 +02:00
Regis Houssin
dd60c384a5 Fix: missing object 2012-07-07 12:27:45 +02:00
Regis Houssin
293e0ac831 Change-Id: I5f8bcf59cf2fc0d902edb4d61f8c20a2880765a2 2012-07-07 12:21:40 +02:00
Regis Houssin
250e3555c3 Fix: more bugs with multicompany 2012-07-07 11:03:16 +02:00
Regis Houssin
8ee06f02b1 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 11:02:59 +02:00
Regis Houssin
ba896c024d Fix: problem with template 2012-07-07 11:01:48 +02:00
Regis Houssin
41dcd9370a Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-07 08:01:48 +02:00
Regis Houssin
928af1a2b3 Fix: security 2012-07-07 08:00:18 +02:00
Regis Houssin
c8eb666826 Fix: compatibility with multicompany 2012-07-06 20:53:18 +02:00
Regis Houssin
6f919da5d9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-06 10:24:24 +02:00
Regis Houssin
7382f4e3ee Fix: bad link and uniformize code 2012-07-06 10:23:28 +02:00
Regis Houssin
ff048175f7 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-06 09:54:54 +02:00
Regis Houssin
a3c74aa9bd Fix: price field is obsolete 2012-07-06 09:53:45 +02:00
Regis Houssin
ce7f45ab1f Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-05 15:51:42 +02:00
Regis Houssin
59c84747ac Revert "Fix: wrong link"
This reverts commit 45f09da98a.
2012-07-05 15:49:45 +02:00
Regis Houssin
8befcb9477 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-05 15:41:22 +02:00
Regis Houssin
45f09da98a Fix: wrong link 2012-07-05 15:40:13 +02:00
Regis Houssin
bf9fd6a2da Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-03 21:15:02 +02:00
Regis Houssin
5c2d8656cc Fix: missing images files filter 2012-07-03 21:13:58 +02:00
Regis Houssin
ab6129a1cc Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-03 16:43:42 +02:00
Regis Houssin
a13bf2b93f Fix: test if ckeditor is enable 2012-07-03 16:42:34 +02:00
Regis Houssin
b0ab71db5f Fix: merge problem 2012-07-02 22:47:19 +02:00
Regis Houssin
7f021ad5d9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 22:43:00 +02:00
Regis Houssin
65304f2e77 Fix: missing shipping linked object box 2012-07-02 22:40:48 +02:00
Regis Houssin
3e30cde02e Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 20:07:44 +02:00
Regis Houssin
ea21064ca2 Fix: access problem if thirdparty module is disable 2012-07-02 20:06:08 +02:00
simnandez
b5a12ff088 Trad: Add missing translations 2012-07-02 17:36:41 +02:00
Regis Houssin
92858a7b47 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 17:13:39 +02:00
Regis Houssin
9623d50f48 Fix: big problem with linked elements 2012-07-02 17:11:35 +02:00
Regis Houssin
deecfe5d07 Fix: wrong sql request 2012-07-02 16:14:44 +02:00
Regis Houssin
067a9b0820 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1

Conflicts:
	htdocs/product/class/product.class.php
2012-07-02 15:49:04 +02:00
Regis Houssin
1f98a23587 Fix: compatibility with multicompany
Conflicts:
	htdocs/product/class/product.class.php
2012-07-02 15:46:31 +02:00
Regis Houssin
cd3df1d6e1 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-07-02 10:39:40 +02:00
Regis Houssin
1d5db424a1 Fix: missing contract reference 2012-07-02 10:38:40 +02:00
Regis Houssin
b632c2233b Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into 3.2.1
2012-07-02 10:17:42 +02:00
Regis Houssin
8d0cafc687 Fix: sql request error 2012-07-02 10:15:03 +02:00
Laurent Destailleur
bdd8b393f9 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-30 01:15:50 +02:00
Regis Houssin
123b45aa4b Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-29 10:10:18 +02:00
Regis Houssin
55ac02382b Fix: missing parameters ! 2012-06-29 10:09:15 +02:00
Regis Houssin
87f2ec663d Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-29 09:37:46 +02:00
Regis Houssin
70cd7b87e9 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-29 09:36:33 +02:00