Commit Graph

44243 Commits

Author SHA1 Message Date
Laurent Destailleur
7ca2e275df Track travis bug 2014-11-08 00:10:05 +01:00
Laurent Destailleur
429cae5d2e Recherche bug travis 2014-11-07 23:58:30 +01:00
Laurent Destailleur
6762b98c00 Minor look enhancement during debug 2014-11-07 23:25:39 +01:00
Laurent Destailleur
4c1b1408ed Fix: Removed duplicate menu entry 2014-11-07 23:15:02 +01:00
Laurent Destailleur
e3f4db85af Fix divers 2014-11-07 23:07:15 +01:00
Laurent Destailleur
8a89997c79 Fix: bug into edition of extrafields 2014-11-07 22:40:13 +01:00
Laurent Destailleur
83d441f8ff Show field alwayseditable 2014-11-07 22:24:52 +01:00
Laurent Destailleur
3d5a45e274 Fix: textarea too small 2014-11-07 22:19:31 +01:00
Laurent Destailleur
0b70d26275 Keep commented code to keep a chance for old php version to work. 2014-11-07 22:06:51 +01:00
Laurent Destailleur
0559e29c92 Prepare freeze 2014-11-07 21:52:50 +01:00
Laurent Destailleur
5094c2c066 Merge pull request #1998 from frederic34/iconstock
Try to improve stock display for all stock increase/decrease options
2014-11-07 21:48:04 +01:00
Laurent Destailleur
5cb6b11878 Merge pull request #2007 from aspangaro/develop-search
Improvement into list & presentation/typo
2014-11-07 21:47:37 +01:00
Laurent Destailleur
9e92b469b9 Merge pull request #2005 from altairis-fr/hidemargininfos
improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option
2014-11-07 21:47:06 +01:00
Laurent Destailleur
5ad6b69ce9 Merge pull request #2006 from frederic34/patch-1
Update antispamimage.php
2014-11-07 21:45:08 +01:00
Juanjo Menent
3880013940 Fix hooks from supplierorder to supplierinvoice 2014-11-06 23:10:21 +01:00
Juanjo Menent
2f30e769f6 Fix: [ bug #1535 ] Supplier invoice Extrafields are not shown 2014-11-06 22:16:27 +01:00
aspangaro
64a9c2dba0 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-06 20:06:08 +01:00
aspangaro
acbbe823e8 Typo 2014-11-06 20:04:51 +01:00
aspangaro
a8b3153f54 Improve search in list 2014-11-06 19:47:27 +01:00
Juanjo Menent
e421741fc4 Trad: More accurate trad of holidays. Update form transifex 2014-11-06 17:33:05 +01:00
Laurent Destailleur
633e34da52 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-06 13:47:38 +01:00
Laurent Destailleur
9ec71e18fc Try to track travis pb 2014-11-06 13:47:15 +01:00
Laurent Destailleur
b68bfac593 Fix: Usage of migration scripts from command line 2014-11-06 13:46:12 +01:00
Juanjo Menent
0f22ebb7b5 Trad: More accurate trad es_ES of after order. Update form transifex 2014-11-06 12:26:15 +01:00
Juanjo Menent
c422024cb9 Trad: More accurate trad of notifications. Update form transifex 2014-11-06 11:55:26 +01:00
Juanjo Menent
6f9d283ddc Fix: Module notifications DB Error "unknown field type" into third tab
notifications
2014-11-06 11:20:47 +01:00
aspangaro
b60f834d8d Improve search into supplier command list 2014-11-06 07:19:16 +01:00
aspangaro
4c95cab35f Improve search in customer command list 2014-11-06 07:13:03 +01:00
aspangaro
16126891a6 Merge remote-tracking branch 'Upstream/develop' into develop-search 2014-11-06 06:41:09 +01:00
aspangaro
b47e899e57 Merge remote-tracking branch 'origin/develop-patch' into develop-search 2014-11-06 06:40:50 +01:00
Laurent Destailleur
0ae1bfab04 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-06 00:58:43 +01:00
Juanjo Menent
eadb10e71e Trad: update es_ES from transifex 2014-11-05 22:31:23 +01:00
aspangaro
89296e3011 Typo search list 2014-11-05 22:27:26 +01:00
Frédéric FRANCE
4cb3dc4238 Update antispamimage.php
If imagecreate fail, we can't see error message
2014-11-05 20:02:58 +01:00
Laurent Destailleur
cc1b14e9f8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-05 17:42:11 +01:00
Laurent Destailleur
b601afc92b Merge pull request #1994 from aspangaro/develop-patch
Update module accounting
2014-11-05 17:40:51 +01:00
Laurent Destailleur
e052010941 Merge pull request #2004 from Devensys/Develop-FixErrorFormOther
fix error FormOther in user/card.php
2014-11-05 17:39:29 +01:00
Laurent Destailleur
60ca5aa026 Debug of module withdraw. 2014-11-05 17:32:42 +01:00
Christophe Battarel
44882f4035 improve "hide margin infos" button : hide ALL informations relatives to margin AND store the state of the button in a cookie instead of shared config option 2014-11-05 17:03:53 +01:00
Laurent Destailleur
5e0946bdc2 Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/adherents/fiche.php
	htdocs/core/lib/date.lib.php
	htdocs/langs/fr_FR/bills.lang
	htdocs/resource/class/resource.class.php
2014-11-05 16:37:07 +01:00
Laurent Destailleur
4f08408065 Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
2014-11-05 16:28:44 +01:00
Laurent Destailleur
31c38cedbc Fix: checkstyle 2014-11-05 16:26:11 +01:00
Laurent Destailleur
f7e71d8848 Fix: checkstyle 2014-11-05 16:23:10 +01:00
Laurent Destailleur
90fb05805c Fix: Missing translation 2014-11-05 16:21:17 +01:00
Andrelec1
5742e42689 Fix require FormOther !
If agenda module is desable
2014-11-05 14:24:02 +01:00
Teddy
e37741c114 Merge pull request #4 from Dolibarr/develop
Merge pull request #4 from Dolibarr/develop
2014-11-05 11:20:59 +01:00
Laurent Destailleur
0d62556fa0 Maj doc 2014-11-05 11:01:53 +01:00
Laurent Destailleur
606a3f9917 Merge remote-tracking branch 'origin/3.4' into 3.5 2014-11-04 17:54:09 +01:00
Laurent Destailleur
504a9a92a4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2014-11-04 17:42:22 +01:00
Laurent Destailleur
5656773430 Update doc 2014-11-04 17:42:01 +01:00