Commit Graph

35674 Commits

Author SHA1 Message Date
Laurent Destailleur
4cb671f4db Qual: Clean deprecated code. 2014-04-28 11:55:08 +02:00
Laurent Destailleur
e5012a1670 Fix: Bad parameter type 2014-04-28 04:27:49 +02:00
Laurent Destailleur
d5c781158d Merge pull request #1555 from aspangaro/develop
HRM Area - Typo & presentation
2014-04-28 02:41:36 +02:00
Laurent Destailleur
4a23a8a789 Merge branch 'category_translate' of github.com:aternatik/dolibarr into
aternatik-category_translate

Conflicts:
	ChangeLog
2014-04-28 02:39:56 +02:00
Laurent Destailleur
c600003807 Merge pull request #1552 from aternatik/ws_prodlang
Add multilang support into product webservice
2014-04-28 02:36:11 +02:00
Laurent Destailleur
f749ae6052 Fix: With LDAP we refused empty password because some LDAP are "opened"
for anonymous access so connexion is a success.
2014-04-28 02:31:11 +02:00
Laurent Destailleur
7ba2f19106 Update support page with link to local forums. 2014-04-28 02:01:15 +02:00
Laurent Destailleur
e5c5b15ecc Qual: Start to clean module ECM (Code is to complex). Prepare for
replacement with another tool.
New: A module can add its own ECM view.
New: A module can disable a standard ECM view.
2014-04-28 01:46:11 +02:00
Laurent Destailleur
8c5bc11def Qual: Better error message for LDAP connection 2014-04-27 14:16:29 +02:00
aspangaro
e03be4f6ed HRM Area - Typo & presentation 2014-04-27 04:08:34 +02:00
Laurent Destailleur
8c7ff91341 Fix: Removed html5 warnings 2014-04-27 01:51:50 +02:00
Laurent Destailleur
8beaf30e88 Qual: Removed useless use of js 2014-04-27 01:51:31 +02:00
Laurent Destailleur
ba9dc57912 Fix: Avoid wrapping 2014-04-27 01:49:57 +02:00
Laurent Destailleur
0ab4265456 Fix: Missing translation key. 2014-04-27 01:20:32 +02:00
Laurent Destailleur
5f1e690039 New: Show invoice ref in boxes for supplier invoices. 2014-04-26 23:15:45 +02:00
Laurent Destailleur
97fce71218 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/core/lib/functions2.lib.php
	htdocs/install/mysql/migration/repair.sql
	htdocs/langs/en_US/errors.lang
	htdocs/product/fiche.php
	htdocs/projet/tasks/task.php
2014-04-26 22:35:35 +02:00
Laurent Destailleur
4fa472518e Fix: doxygen 2014-04-26 22:23:46 +02:00
Laurent Destailleur
bd8cdd337a Fix: Option MAIN_INVERT_SENDER_RECIPIENT broken with typhon template. 2014-04-26 22:17:11 +02:00
Laurent Destailleur
537ada96a8 Fix: [ bug #1354 ] Tasks disapear in same sub-task
Conflicts:
	htdocs/install/mysql/migration/repair.sql
	htdocs/projet/class/project.class.php
2014-04-26 21:47:15 +02:00
Laurent Destailleur
4ecfa1d6e0 Clean corrupted data for categories
Conflicts:
	htdocs/install/mysql/migration/repair.sql
2014-04-26 21:40:57 +02:00
Laurent Destailleur
af2cf0b66f Fix: [ bug #1354 ] Tasks disapear in same sub-task 2014-04-26 21:36:58 +02:00
Laurent Destailleur
950c59eb61 Fix: [ bug #1356 ] Bank accountancy number is limited to 8 numbers. 2014-04-26 17:34:39 +02:00
Laurent Destailleur
6968304641 Fix: [ bug #1352 ] Removing a shipping does not remove the delivery. 2014-04-26 17:27:59 +02:00
Laurent Destailleur
c54d9d9171 Fix: [ bug #1351 ] VIES verification link broken 2014-04-26 16:27:06 +02:00
Laurent Destailleur
4ade14b841 Qual: Removed code we should not have. 2014-04-26 16:15:35 +02:00
Laurent Destailleur
2bd8da4e70 Missing property 2014-04-25 20:36:13 +02:00
Laurent Destailleur
71ca269c71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
2014-04-25 20:29:29 +02:00
Laurent Destailleur
9a320cc50f Removed a function we should not have. 2014-04-25 20:18:26 +02:00
Laurent Destailleur
196cf53dbd Fix: Pb of return values 2014-04-25 20:11:38 +02:00
Laurent Destailleur
ae23d78c74 Add field nb_holidays and salary. 2014-04-25 20:06:19 +02:00
Laurent Destailleur
b117ea83be Fix: missing trans
Fix: detection of html content
2014-04-25 16:45:14 +02:00
jfefe
dbaddd1fbd Add translation support into categories arbo 2014-04-25 15:36:37 +02:00
jfefe
098fa7027c Remove unused note into category translation 2014-04-25 15:36:00 +02:00
jfefe
d256799abf Work on adding catgory translation 2014-04-25 15:17:12 +02:00
Laurent Destailleur
3a7a15cff8 Trans: text more clear 2014-04-25 15:00:18 +02:00
Laurent Destailleur
298da30200 New: Extrafields can be used as substitution key %EXTRA_XXX% into emails
texts for members.
2014-04-25 14:39:34 +02:00
jfefe
b2b8fbb227 Fix : bad call of extrafields into categories 2014-04-25 14:28:22 +02:00
jfefe
afaf5698a5 Fix : bad link to categorie admin page 2014-04-25 14:25:49 +02:00
jfefe
f9e08c23d9 Add multilang support into getProductOrService webservice method 2014-04-25 13:32:31 +02:00
jfefe
181a49c18c Add multilang support into getProductsForCategory webservice method 2014-04-25 13:31:38 +02:00
jfefe
e6e45862a1 Work into multilang into product webservice 2014-04-25 13:31:38 +02:00
Laurent Destailleur
0b1bfa56e2 Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2014-04-24 01:26:53 +02:00
Laurent Destailleur
889ed4a49c Fix: div was opened and not close or the oposite. 2014-04-24 01:26:28 +02:00
Laurent Destailleur
03d73bce9c Merge pull request #1550 from GPCsolutions/staticanalysis
Various fixes to defects found using statical analysis tooling
2014-04-23 21:20:39 +02:00
Laurent Destailleur
078a7f4162 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-04-23 21:19:06 +02:00
Laurent Destailleur
693529c40b Merge pull request #1549 from atm-maxime/develop
Fix : proposal validation was converting third as customer
2014-04-23 21:18:34 +02:00
Laurent Destailleur
6c56302fd2 Merge pull request #1547 from GPCsolutions/jsinjection
Qual: Prevent potential JS injection
2014-04-23 21:14:22 +02:00
Laurent Destailleur
5e2c360d38 Merge pull request #1546 from GPCsolutions/linkfix
Fix undeclared variable
2014-04-23 21:13:06 +02:00
Laurent Destailleur
8d6e80d016 Merge pull request #1545 from GPCsolutions/dolidb
Dolidb
2014-04-23 21:12:43 +02:00
Laurent Destailleur
82d57c20cc Merge pull request #1542 from FHenry/develop
add filter to effectif select
2014-04-23 21:10:07 +02:00