Marcos García de La Fuente
ec661d0c6c
Removed index.php and replaced them with blank index.html as it is more appropriate
2014-07-12 23:18:57 +02:00
Raphaël Doursenaud
94bcb0dc40
Labels and autofocus for company card forms
2014-07-12 14:45:23 +02:00
Raphaël Doursenaud
f1853c435b
More labels and autofocus for thirdparty and contact forms
2014-07-12 12:04:39 +02:00
KreizIT
b6edde320b
Conflict solved
2014-07-12 09:20:00 +02:00
Raphaël Doursenaud
78ce6c0b1c
Added labels on form elements for company creation
2014-07-11 19:57:51 +02:00
Florian HENRY
b9df48d48c
Fix
...
http://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/50854-multi-societe-options-cookies
2014-07-11 15:53:31 +02:00
KreizIT
b8499a80ec
Refactor: LINK_* trigger
2014-07-11 15:08:01 +02:00
Laurent Destailleur
728ca22183
Merge pull request #1730 from GPCsolutions/accessibility
...
Accessibility
2014-07-11 14:57:02 +02:00
Laurent Destailleur
4dfaf9ce38
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2014-07-11 13:56:57 +02:00
Laurent Destailleur
32b015e661
New: Type of thirdparties can accept a country (to show list of types
...
specific for a country).
2014-07-11 13:56:35 +02:00
Raphaël Doursenaud
55d062784d
Added labels on objectline form elements
2014-07-11 13:25:44 +02:00
Florian HENRY
3f23b116c6
[ bug #1522 ] Liste des propositions commerciales non filtée depuis un
...
projet
2014-07-11 11:44:54 +02:00
frederic34
c8e6387e52
Merge remote branch 'upstream/develop' into selectbank
...
Conflicts:
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-07-08 22:46:38 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
Laurent Destailleur
688d58413b
Merge pull request #1710 from aspangaro/develop-accounting2
...
New feature :: Add fiscal year
2014-07-07 21:28:35 +02:00
frederic34
0cb5220d4d
Use english for the function name
2014-07-07 20:54:41 +02:00
frederic34
9949713d20
Some cleaning
2014-07-07 18:40:18 +02:00
KreizIT
4e08e2b5d5
Fix rollback and test errno
2014-07-07 11:32:56 +02:00
Laurent Destailleur
96ec3ad7f4
Fix: Allow percent to solve presentation pb by some pages.
2014-07-07 00:14:24 +02:00
Laurent Destailleur
4dbc1dd1c6
Merge remote-tracking branch 'origin/3.6' into develop
2014-07-06 21:09:10 +02:00
frederic34
f29eeceb1a
Select bank account for propal and order
2014-07-06 20:49:34 +02:00
aspangaro
e294fe1edd
Update
2014-07-05 21:58:39 +02:00
aspangaro
7892852f44
Merge branch 'Upstream/develop'
2014-07-05 21:56:47 +02:00
Florian HENRY
02574a7af2
Fix Ajax combobox in Extrafeilds
...
Add Extrafield on contract
2014-07-05 11:17:50 +02:00
Laurent Destailleur
fa82cbceb9
Qual: Removed useless function
2014-07-05 08:59:41 +02:00
aspangaro
9eaeaae2fb
Merge branch 'Upstream/develop'
2014-07-05 08:48:51 +02:00
aspangaro
be78e96313
Bug fix & add tab info
2014-07-05 08:47:01 +02:00
Laurent Destailleur
8e2999f73f
Fix: phpcs
2014-07-04 14:19:03 +02:00
Laurent Destailleur
be4fe3d0d0
Merge branch 'syslog' of github.com:marcosgdf/dolibarr into
...
marcosgdf-syslog
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/fichinter/class/fichinter.class.php
htdocs/projet/class/project.class.php
htdocs/projet/class/task.class.php
2014-07-04 13:43:50 +02:00
aspangaro
a2ac578712
Merge branch 'Upstream/develop'
2014-07-04 06:21:00 +02:00
Juanjo Menent
24b2b83b85
use count() instead sizeof()
2014-07-03 18:55:03 +02:00
Juanjo Menent
e30649dcd2
[ task #1063 ] Allow edit localtaxes rate for thirds. Works with company
2014-07-03 17:39:31 +02:00
Marcos García de La Fuente
460fb7a453
Removed new SQL double-debug
2014-07-02 21:29:07 +02:00
Marcos García de La Fuente
7e1cf124b8
Merge branch 'develop' into syslog
...
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/commonobject.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/product/class/product.class.php
htdocs/product/stock/lib/replenishment.lib.php
htdocs/societe/soc.php
2014-07-02 21:20:02 +02:00
Laurent Destailleur
31c27b8f7c
New: More option to define default filter setting of agenda views.
2014-06-29 23:35:00 +02:00
aspangaro
46320071a0
Merge branch 'Upstream/develop'
2014-06-29 05:42:37 +02:00
aspangaro
8cfdfbe47d
Update
2014-06-29 05:41:24 +02:00
Laurent Destailleur
6f0250cb94
Fix: typo
2014-06-29 04:25:42 +02:00
Laurent Destailleur
330c965cb9
New: Add hook "searchAgendaFrom".
2014-06-29 02:45:55 +02:00
Laurent Destailleur
6916d251b5
New: Can filter events on a group of users.
2014-06-28 20:49:10 +02:00
Laurent Destailleur
03c6d8fdc3
New: Can create proposal from an intervention.
2014-06-28 19:47:51 +02:00
Laurent Destailleur
2c493a4fe3
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
2014-06-28 14:55:04 +02:00
Laurent Destailleur
71ee974ddb
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/fourn/class/fournisseur.commande.class.php
2014-06-28 14:53:28 +02:00
Laurent Destailleur
ef8b555750
Fix: When using option MAIN_MAIL_ALLOW_SENDMAIL_F, a mail was sent to
...
sender.
2014-06-28 14:48:00 +02:00
Laurent Destailleur
7d72b6c3a1
Add comments
2014-06-28 14:06:29 +02:00
Laurent Destailleur
29dfb71bbd
Merge branch 'patch-11' of github.com:defrance69/dolibarr into
...
defrance69-patch-11
Conflicts:
htdocs/core/class/commonobject.class.php
2014-06-26 23:04:26 +02:00
BENKE Charles
8acd702cd1
Using hidden constant to use the feature
...
MARGININFO_HIDE_SHOW = 0 feature not used
MARGININFO_HIDE_SHOW = 1 feature used, displayed on open
MARGININFO_HIDE_SHOW = 2 feature used, not displayed on open
2014-06-26 22:34:40 +02:00
Laurent Destailleur
a2f610ffbe
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
...
develop
Conflicts:
ChangeLog
2014-06-26 21:41:45 +02:00
Laurent Destailleur
a79aa1f203
Merge branch 'develop' of github.com:FHenry/dolibarr into FHenry-develop
...
Conflicts:
htdocs/product/class/product.class.php
2014-06-26 21:38:03 +02:00
Laurent Destailleur
abfe36620a
Merge pull request #1686 from KreizIT/movetrig
...
Fix [ bug #1459 ]
2014-06-26 21:01:48 +02:00
