Commit Graph

44184 Commits

Author SHA1 Message Date
Laurent Destailleur
639d4f03a0 Experimentation option PROJECT_SHOW_REF_INTO_LISTS 2014-10-22 17:47:12 +02:00
Laurent Destailleur
d267a788d0 Fix: use getpost 2014-10-21 20:02:16 +02:00
Laurent Destailleur
8e63f09764 Fix: Confirm validate must be set on yes by default. 2014-10-20 23:37:28 +02:00
BENKE Charles
c103a5927a Update commondocgenerator.class.php
add : outstanding limit on ODT 
fix  : only public note are display on ODT (private stay private)
2014-10-20 22:28:08 +02:00
Laurent Destailleur
9278d21048 Add missing translation 2014-10-20 13:25:30 +02:00
Laurent Destailleur
e324df2cb9 Some fix again into event list. 2014-10-20 13:20:19 +02:00
Florian HENRY
1eba744e8b Add hook method to simply display child lines in order/invoice/propal 2014-10-20 13:15:48 +02:00
Laurent Destailleur
866b2a7a88 Fix: Label 2014-10-20 13:14:33 +02:00
Laurent Destailleur
881d338fca Fix: label of events 2014-10-20 13:07:54 +02:00
Laurent Destailleur
42a600412d Fix: Regression with favorite. 2014-10-20 12:41:18 +02:00
Laurent Destailleur
4df9fb38fb Add option AGENDA_ALWAYS_HIDE_AUTO 2014-10-20 12:29:35 +02:00
Laurent Destailleur
0fba70d4d1 Fix: Triggers sending email for intervention and classify billed 2014-10-20 11:35:34 +02:00
Laurent Destailleur
718b3b19b4 Fix: user and date modification not updated 2014-10-20 11:16:51 +02:00
Laurent Destailleur
8d937d2d36 Uniformize position of "Create link" on categories. 2014-10-19 20:37:46 +02:00
Laurent Destailleur
3fe4c58e95 Use span class="badge" for notes. 2014-10-19 19:57:42 +02:00
Laurent Destailleur
9b24cccd0b Fix: Better layout detection 2014-10-19 12:24:36 +02:00
Frédéric FRANCE
a14d07930a Update soc.php 2014-10-18 22:52:54 +02:00
Frédéric FRANCE
761fc32cc1 Update list.php 2014-10-18 22:51:24 +02:00
Frédéric FRANCE
8133b67878 Update product.php 2014-10-18 22:50:17 +02:00
Frédéric FRANCE
5e946d6466 Update card.php 2014-10-18 22:49:07 +02:00
Frédéric FRANCE
5b9a134d69 Update objectonoff.php 2014-10-18 22:47:12 +02:00
Frédéric FRANCE
a1bedcc263 Update ajax.lib.php 2014-10-18 22:46:13 +02:00
Laurent Destailleur
4a60d57544 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/product/fiche.php
	htdocs/product/liste.php
2014-10-18 21:08:09 +02:00
Frédéric FRANCE
3144fd6845 Update product.php 2014-10-18 18:52:16 +02:00
Frédéric FRANCE
3ab8e13157 Update list.php 2014-10-18 18:51:25 +02:00
Frédéric FRANCE
446e73d8b8 Update card.php 2014-10-18 18:49:47 +02:00
Frédéric FRANCE
eefb211be7 Update ajax.lib.php 2014-10-18 18:48:13 +02:00
Frédéric FRANCE
8bb0ce0f7f Update ajax.lib.php 2014-10-18 17:17:41 +02:00
Frédéric FRANCE
489045d715 Rename productonoff.php to objectonoff.php 2014-10-18 17:11:47 +02:00
Frédéric FRANCE
dd5ea670e2 Update ajax.lib.php 2014-10-18 17:11:02 +02:00
Grégory DAVID
a794180586 Document the ability to export agenda calendar restricted to project ID 2014-10-18 16:41:47 +02:00
Frédéric FRANCE
830ec9c9cb Update list.php 2014-10-18 16:36:28 +02:00
Frédéric FRANCE
2107a61bbe Update ajax.lib.php
For use in a list of object
2014-10-18 16:32:32 +02:00
Laurent Destailleur
e78baab579 Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.6 2014-10-18 16:29:34 +02:00
Laurent Destailleur
48b2d818da Update changelog 2014-10-18 16:29:22 +02:00
Laurent Destailleur
1d0d3ab747 Merge pull request #1943 from ndrosis/patch-9
Fix Error when trying to clone an Order
2014-10-18 16:28:43 +02:00
Laurent Destailleur
9c69ab966f Fix: When closing shipment, status was not visible until refresh. 2014-10-18 16:27:15 +02:00
Laurent Destailleur
0193b31a37 Fix: td balance 2014-10-18 16:18:03 +02:00
Laurent Destailleur
13590a876b Fix: A little clean of dol_hash usage. 2014-10-18 16:08:15 +02:00
Frédéric FRANCE
b80b45c086 Update card.php 2014-10-18 15:55:10 +02:00
Laurent Destailleur
873f8a6f27 If there is at least one favorite into countries, then add a separator
into list to show limit between sorted entries and not sorted entries.
2014-10-18 15:53:42 +02:00
Frédéric FRANCE
3a49965820 Update product.php 2014-10-18 15:52:37 +02:00
Frédéric FRANCE
98db599c69 Update card.php 2014-10-18 15:51:05 +02:00
Frédéric FRANCE
96aee6eed4 Update ajax.lib.php 2014-10-18 15:48:59 +02:00
Laurent Destailleur
2466a55193 Merge branch 'aspangaro-develop-favorite' into develop 2014-10-18 15:46:02 +02:00
Laurent Destailleur
e53c328767 Merge branch 'develop-favorite' of github.com:aspangaro/dolibarr into
aspangaro-develop-favorite

Conflicts:
	ChangeLog
	htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2014-10-18 15:45:44 +02:00
Laurent Destailleur
331e047c6d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-10-18 15:39:24 +02:00
Laurent Destailleur
720cf0782f Merge branch 'atm-maxime-mkoevols' into develop 2014-10-18 15:39:02 +02:00
Laurent Destailleur
ad0f842b60 Merge branch 'mkoevols' of github.com:atm-maxime/dolibarr into
atm-maxime-mkoevols

Conflicts:
	htdocs/commande/card.php
2014-10-18 15:38:49 +02:00
Laurent Destailleur
1f5b64c98e Merge pull request #1964 from frederic34/patch-3
Use javascript On/Off tosell-tobuy if enabled
2014-10-18 15:36:17 +02:00