Commit Graph

32495 Commits

Author SHA1 Message Date
Laurent Destailleur
a429a930d0 Fix: Uniformize code and PHPUnit tests 2012-07-29 20:07:03 +02:00
Laurent Destailleur
b40c0a5d86 Fix: Check conditions to run test 2012-07-29 19:40:20 +02:00
Laurent Destailleur
d85bd3d41c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-29 18:47:03 +02:00
Laurent Destailleur
77e4b088ac Doc 2012-07-29 18:27:53 +02:00
Laurent Destailleur
6739d5fd8d Fix: Add missing error message 2012-07-29 16:51:16 +02:00
Regis Houssin
28851b46c4 Fix: remove duplicate code 2012-07-29 16:44:19 +02:00
Regis Houssin
30ca31de6c Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 16:12:05 +02:00
Regis Houssin
a64723ea74 Fix: replace with new event message system 2012-07-29 16:11:52 +02:00
Laurent Destailleur
56e9ffb685 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-29 15:55:59 +02:00
Laurent Destailleur
8c5e8e0690 Fix: [ bug #466 ] Module MailmanSpip 2012-07-29 15:55:19 +02:00
Regis Houssin
1591a5ac3b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 15:47:40 +02:00
Regis Houssin
0aa6694c95 Fix: broken event message 2012-07-29 15:47:24 +02:00
Laurent Destailleur
e8b2489c1c Checkstyle 2012-07-29 15:28:39 +02:00
Laurent Destailleur
b43c7e1b35 Qual: Removed warning 2012-07-29 14:23:33 +02:00
Laurent Destailleur
d6a5b224fb Revert bad practice: setEvent use SESSION. Such usage is limited to HTML
page context and can be used inside any pages.
However usage of _SESSION must never be used inside a library (except
for function dedicated to HTML page context), and never inside
object classes (we must use $this->errors, $this->mesgs or
$this->warnings instead).
2012-07-29 14:15:29 +02:00
Laurent Destailleur
0ee08418cc New: Add test on mandatory field 2012-07-29 13:47:42 +02:00
Laurent Destailleur
bd22581687 Update doc 2012-07-29 13:47:21 +02:00
Laurent Destailleur
71f3ff8e33 To match debian rules 2012-07-29 13:30:13 +02:00
Regis Houssin
eee5653c54 Fix: try to use the new message system 2012-07-29 12:54:19 +02:00
Regis Houssin
77a5ef0b22 Fix: move ajax response in ajax directory 2012-07-29 10:24:42 +02:00
Regis Houssin
beedf13324 Fix: restore broken feature, disable token renewal in ajax response 2012-07-29 09:54:58 +02:00
Regis Houssin
b37a1b3daa Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-29 08:27:02 +02:00
Regis Houssin
9cdba5bb61 Fix: try another method more clean and can be deployed on any type of
message
2012-07-29 08:26:33 +02:00
Regis Houssin
f2239c897e Merge pull request #273 from marcosgdf/translations
Fixed some minor es_ES translation typos
2012-07-28 13:29:48 -07:00
Regis Houssin
cdc9dda11e Fix: best practice 2012-07-28 22:28:33 +02:00
Regis Houssin
a27e347ee0 Fix: for backward compatibility 2012-07-28 22:20:58 +02:00
Marcos García
535e6f1756 es_ES typos 2012-07-28 22:16:39 +02:00
Regis Houssin
75588c2eb3 Merge pull request #272 from marcosgdf/backtolist-links
Created BackToList links
2012-07-28 13:15:42 -07:00
Marcos García
ec36ffd73c Missing expeditions and stocks BackToList links 2012-07-28 22:14:53 +02:00
Regis Houssin
61fc592434 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 22:08:05 +02:00
Regis Houssin
c7bacecf10 Fix: try to use another method for messages 2012-07-28 22:07:27 +02:00
Marcos García
04c34b0042 BackToList links in Contacts section 2012-07-28 21:54:36 +02:00
Marcos García
9dc38f4382 Created rest of BackToList links 2012-07-28 21:49:47 +02:00
Marcos García
2eeaad1352 BackToList links in Financial section 2012-07-28 21:22:59 +02:00
Marcos García
32a3477ccb BackToList links in Interventions section 2012-07-28 21:05:00 +02:00
Marcos García
b3b33b7aca BackToList links in Contracts section 2012-07-28 20:59:57 +02:00
Marcos García
90963ca84a BackToList links in Client orders section 2012-07-28 20:54:07 +02:00
Marcos García
472397d5c2 BackToList links in Supplier order section 2012-07-28 20:47:12 +02:00
Regis Houssin
1816886135 Merge pull request #271 from marcosgdf/translations
Removed space before colon
2012-07-28 11:30:25 -07:00
simnandez
8a19946e4a Trad: Commissions and margins
Conflicts:
	htdocs/langs/fr_FR/margins.lang
2012-07-28 20:22:38 +02:00
Marcos García
16df86003d Removed space before : 2012-07-28 20:20:56 +02:00
Marcos García
8c68b096fd Removed space before : 2012-07-28 20:16:54 +02:00
Regis Houssin
af0b36c1d1 Merge pull request #269 from marcosgdf/translations
Fixed some typos in es_ES and allowed some strings to be translated
2012-07-28 11:16:20 -07:00
Marcos García
de7595922e Fixed some typos in es_ES and allowed some strings to be translated 2012-07-28 19:53:13 +02:00
Regis Houssin
9a80f0351d New: add phpmailer class 2012-07-28 19:11:05 +02:00
Regis Houssin
bdc9dbfb01 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 19:05:28 +02:00
Raphaël Doursenaud
d34c4518d2 Removed BOM from UTF-8 files
Fix: convert line delimiters (regis)

Conflicts:
	htdocs/core/filemanagerdol/browser/default/js/common.js
	htdocs/core/filemanagerdol/browser/default/js/fckxml.js
2012-07-28 19:04:50 +02:00
Regis Houssin
97655ae836 Merge pull request #268 from simnandez/develop
Trad: Export de données dangereux
2012-07-28 09:57:09 -07:00
simnandez
b03fd00c3a Trad: Export de données dangereux 2012-07-28 18:53:05 +02:00
Regis Houssin
49bacc6fda Merge pull request #267 from marcosgdf/trans-and-link-fixes
Fixed es_ES translations and some BackToList links
2012-07-28 09:36:28 -07:00