Commit Graph

32478 Commits

Author SHA1 Message Date
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
Regis Houssin
e7a994360e Merge pull request #266 from marcosgdf/typo-spanish-translation
Typo in es_ES translation
2012-07-28 09:35:28 -07:00
Regis Houssin
1dd14d35f7 Fix: add null value in class method 2012-07-28 18:32:54 +02:00
Regis Houssin
edbf104a7b Merge pull request #265 from marcosgdf/fix-commande-addline
Fixed 2 fatal errors in commande/fiche.php and a SQL problem too
2012-07-28 09:11:16 -07:00
Marcos García
241241bf0a Fixed some problems with translations 2012-07-28 17:34:21 +02:00
Marcos García
706b637389 Removed unused BackToList link params 2012-07-28 17:20:17 +02:00
Marcos García
f9dbc6d9be Merge branch 'develop' into typo-spanish-translation
Conflicts:
	htdocs/langs/es_ES/products.lang
2012-07-28 16:31:34 +02:00
Marcos García
bb8dd6ded6 Fixed 2 fatal errors in commande/fiche.php and a SQL problem too 2012-07-28 16:22:01 +02:00
Regis Houssin
2a3a8f5aa5 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2012-07-28 12:35:47 +02:00
Regis Houssin
251640561f Fix: strict mode happy hour 2012-07-28 12:35:11 +02:00
Laurent Destailleur
859c6cee97 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-28 12:32:06 +02:00
Laurent Destailleur
160997cbbe Fix: Bad test 2012-07-28 12:31:37 +02:00
Regis Houssin
a157327859 Fix: strict mode paradise 2012-07-28 11:28:37 +02:00
Regis Houssin
3390a514e1 Fix: include wrong class 2012-07-28 09:57:04 +02:00
Regis Houssin
1e07ed6af6 Fix: broken link 2012-07-28 09:54:47 +02:00
Regis Houssin
a3080acab4 Merge pull request #262 from marcosgdf/minor-fixes-develop
Pull request #254 into develop
2012-07-28 00:31:51 -07:00
Regis Houssin
5fb22d689b Fix: best practice 2012-07-28 09:10:09 +02:00
Laurent Destailleur
bf94d05293 New: Add great britain provinces 2012-07-28 03:12:34 +02:00