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

28015 Commits

Author SHA1 Message Date
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
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
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
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
Laurent Destailleur
7883124958 New: [ task #454 ] Add "No category" into filters on category 2012-07-28 00:53:51 +02:00
Marcos García
c14d9ce13b Typo in es_ES translation 2012-07-28 00:00:46 +02:00
Laurent Destailleur
eb79646315 Fix: restore correct test (empty instead of ! isset) 2012-07-27 23:30:23 +02:00
Laurent Destailleur
a2e745fab6 Fix: Function return was missing in some case. Save bug of empty 
category.
 2012-07-27 23:21:22 +02:00
Marcos García
2204c09e5a Applied commits 16-22 2012-07-27 23:04:05 +02:00
Marcos García
a6c8838b8f Applied patches 9-15 2012-07-27 21:27:03 +02:00
Laurent Destailleur
bd20ab3500 New: Auto check box on page to edit interface options of user. 2012-07-27 20:47:17 +02:00
Laurent Destailleur
1c557a96bd Prepare task 473 2012-07-27 19:26:54 +02:00
Laurent Destailleur
86ac10995f Fix perm 2012-07-27 19:26:38 +02:00
Laurent Destailleur
42d6ed91f7 Fix: Closing tab 2012-07-27 18:41:52 +02:00
Marcos García
5fd7fcb6c4 Applied commits 1-8 2012-07-27 18:40:06 +02:00
Laurent Destailleur
56ced6e5f0 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2012-07-27 16:04:28 +02:00
Laurent Destailleur
0b048ebb94 [ bug #40 ] Export de donnes dangereux 2012-07-27 16:03:20 +02:00
Regis Houssin
6a69b55e5e Fix: tabulation 2012-07-27 14:10:56 +02:00
Raphaël Doursenaud
9ffb6317cf Fix: Allows to use a comma decimal separator in supplier invoices 
payments
 2012-07-27 13:54:16 +02:00
Regis Houssin
20ed6bd5c5 Fix: Bug #460 - Wrong entity assignment when creating a warehouse 2012-07-26 20:52:05 +02:00
Regis Houssin
79181f9183 Fix: add external user filter 2012-07-26 18:24:54 +02:00
Regis Houssin
b2317fd3ee Fix: external user confidentiality 2012-07-26 18:11:06 +02:00
Regis Houssin
5318fb54d5 Fix: bad path 2012-07-26 17:07:10 +02:00
Regis Houssin
b83fbf981d Fix: problem with double quote 2012-07-26 14:33:25 +02:00
Regis Houssin
a6758c2557 Fix: use span instead div for align image warning 2012-07-26 11:34:43 +02:00
Regis Houssin
28a98f6bd9 Fix: wrong action 2012-07-26 10:45:19 +02:00
Regis Houssin
68196e638a Fix: compatibility with edit in place 2012-07-26 09:32:54 +02:00
Laurent Destailleur
ac81e1732e Fix: bad field name 2012-07-26 03:01:15 +02:00
Laurent Destailleur
97906568e3 Typo fix 2012-07-26 02:57:35 +02:00
Laurent Destailleur
ef86d8e2dc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 17:39:44 +02:00
Laurent Destailleur
9392cf2832 Update translation for tr_TR 2012-07-25 17:39:17 +02:00
Laurent Destailleur
105e91dfea Fix: Redirect after delete to correct page 2012-07-25 15:03:06 +02:00
Regis Houssin
e3a3dd0454 Fix: it's for margin module 2012-07-25 12:53:02 +02:00
Laurent Destailleur
126979efe1 Fix: All "isset" must not be replaced by "GETPOST". If isset is used to 
know if value is defined (and not to know if value is null), we must
keep the isset.
 2012-07-25 12:25:45 +02:00
Laurent Destailleur
75e9d93e69 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2012-07-25 12:21:04 +02:00
Laurent Destailleur
dce9b96260 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/lib/repair.lib.php
	htdocs/install/mysql/migration/3.2.0-3.3.0.sql
 2012-07-25 12:20:45 +02:00
Regis Houssin
7d2f7e9800 Fix: strict mode crazy 2012-07-25 11:46:33 +02:00
Laurent Destailleur
ea54523181 Checkstyle 2012-07-25 11:40:23 +02:00
Laurent Destailleur
b63820c013 Checkstyle 2012-07-25 11:37:43 +02:00
Laurent Destailleur
7d08bd45d6 Checkstyle 2012-07-25 11:35:34 +02:00
Laurent Destailleur
de621f0567 Fix: Restore compatibility. Try to isolate "charges" feature with 
a condition (i did not understand what it means and goal, i'm afraid
other users should not understand too).
 2012-07-25 11:32:48 +02:00
Laurent Destailleur
758d613908 Fix: Checkstyle 2012-07-25 11:29:45 +02:00
Laurent Destailleur
276e32dc22 Fix: Products with no prices not visible 2012-07-25 11:27:25 +02:00
Laurent Destailleur
b47ced7507 Fix: syntax error 2012-07-25 10:56:30 +02:00
Regis Houssin
e12604cb71 Fix: avoid warning and strict mode story 2012-07-25 09:09:56 +02:00
Regis Houssin
8e953a6858 Fix: external modules workflow compatibility 2012-07-24 20:18:37 +02:00
Regis Houssin
f8f50a722d Fix: patch of Terry (language) 2012-07-24 18:38:35 +02:00