Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
41,866 Commits 36 Branches 189 Tags
4b9d1b901bccd39b6cd8967ae13b84f8221b0e00
Commit Graph

5546 Commits

Author SHA1 Message Date
Laurent Destailleur
5715e9c986 Merge remote-tracking branch 'origin/3.5' into develop 2013-11-28 17:06:11 +01:00
Grand Philippe
5b2f9af7dc fix management of all errors messages 2013-11-28 16:44:57 +01:00
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Cédric Salvador
ec3fc4e6e6 indentation 2013-11-28 15:53:28 +01:00
Cédric Salvador
2da88a2966 made getVATRates synchronous to avoid concurrency problems 2013-11-28 15:52:26 +01:00
Laurent Destailleur
88ae0a7945 Fix: the rename function is bugged with some windows. I add a 
workaround.
Fix: Add also a workaround for [ bug 1064 ] Date/Time in ICS incorrect.
 2013-11-28 12:58:02 +01:00
Laurent Destailleur
b71406f12d Merge pull request #1322 from aspangaro/develop 
Improvement of the Skype button
 2013-11-26 07:29:37 -08:00
Laurent Destailleur
0383dc4706 Fix: 2 bugs during validation of a member 2013-11-26 13:10:00 +01:00
Laurent Destailleur
854cfc741e Fix: 2 bugs during validation of a member 2013-11-26 13:04:15 +01:00
aspangaro
e1b4d01235 Improvement of the Skype button 
Perm & add a button"Chat"
 2013-11-24 21:28:15 +01:00
Florian Henry
8f9143cef7 revert param_ihm 2013-11-24 18:07:40 +01:00
Laurent Destailleur
73408479ba Merge remote-tracking branch 'origin/3.5' into develop 2013-11-24 13:19:41 +01:00
Laurent Destailleur
aa3c16b6af Fix: chars were lost by function 2013-11-23 16:34:08 +01:00
Laurent Destailleur
8e313ef32d Fix: Can add ban record but was not possible to delete 2013-11-23 16:17:20 +01:00
Laurent Destailleur
64031f92fa Fix: Problem with W3C and wrapping of some title lines. 2013-11-23 14:50:13 +01:00
Laurent Destailleur
4b16551f88 Merge pull request #1316 from defrance69/patch-20 
Update modAgenda.class.php
 2013-11-23 05:05:55 -08:00
Laurent Destailleur
a171c40531 Merge pull request #1317 from GPCsolutions/develop-fixaddline 
Made update price synchronous to avoid dependency hell
 2013-11-23 05:03:01 -08:00
Florian Henry
f852c9a5bb Fix [ bug #1145 ] Agenda button list type do not display 2013-11-22 14:43:15 +01:00
Laurent Destailleur
04fdfb4047 Fix: Problem with W3C and wrapping of some title lines. 2013-11-22 11:45:42 +01:00
Cédric Salvador
2b6a5508c7 debug the Soleil model 2013-11-22 09:51:48 +01:00
Cédric Salvador
c73057ead9 show page number 2013-11-22 09:51:48 +01:00
Cédric Salvador
eb04d8b076 show signature space on the last page only 2013-11-22 09:51:47 +01:00
Raphaël Doursenaud
302a230bf2 Made update price synchronous to avoid dependency hell 2013-11-21 18:00:27 +01:00
BENKE Charles
1bb7ddc2b1 Update modAgenda.class.php 
export extensions
 2013-11-21 17:32:11 +01:00
Florian Henry
7f950d8b45 Fix user pram_ihm, display tab and allow modify button only is user 
right allow it is OK
 2013-11-21 12:28:51 +01:00
Laurent Destailleur
358175b357 Merge remote-tracking branch 'origin/3.4' into develop 2013-11-20 23:48:06 +01:00
Laurent Destailleur
cb539399a0 Merge pull request #1302 from FHenry/develop 
Fix output of extrafield select list from table
 2013-11-20 14:42:50 -08:00
Florian Henry
f88e9425ec Remove useless code (the tag replacement into footer and header is 
already done by SetVar method)
 2013-11-20 14:01:43 +01:00
Regis Houssin
4c29bddfda Fix: wrong variable name 
Fix: restore address.class.php, this class is used
 2013-11-20 09:40:56 +01:00
Florian Henry
ed21b573ea Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-20 00:46:50 +01:00
Laurent Destailleur
69f0d596ba Fix: Pagination 2013-11-18 12:20:53 +01:00
Laurent Destailleur
4356496ee8 Qual: File is not a class of a module 2013-11-18 00:20:05 +01:00
Laurent Destailleur
6a5b3e2020 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-17 23:26:37 +01:00
Laurent Destailleur
48570f599a Fix: form is not allowed into a table. This break some javascript and 
make some browsers crazy.
 2013-11-17 23:25:25 +01:00
Florian Henry
a2368daa57 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-11-17 17:07:00 +01:00
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +01:00
Laurent Destailleur
45aac81b71 Doc: More comments 2013-11-16 18:12:13 +01:00
Laurent Destailleur
8ec50fce23 Move warning at correct place. 
Fix: Reset of amount was not working
 2013-11-16 14:26:42 +01:00
Laurent Destailleur
b7190d2609 Fix: Several bugs. 2013-11-16 13:00:21 +01:00
Laurent Destailleur
5b243abe4b Fix: Miscellaneous fixes 2013-11-16 12:00:08 +01:00
Florian Henry
7696730680 Fix output of extrafield select list from table (in case of filter with 
extrafields table)
 2013-11-15 15:44:04 +01:00
Laurent Destailleur
c324f6a9a3 Merge pull request #1295 from FHenry/develop 
Display customer code (according setting) into list
 2013-11-15 05:05:36 -08:00
Laurent Destailleur
b3a1d695cd Qual: Better message for total of buying price 
Fix: Little debug of add link feature. Link was broken because of
missing http, fix W3C making output wrong with some browsers.
 2013-11-15 11:43:16 +01:00
Laurent Destailleur
2e5320a532 Qual: Clean and uniformize code 2013-11-13 23:35:33 +01:00
Laurent Destailleur
cf3d6d410c Fix: Use correct css 2013-11-13 21:50:16 +01:00
Florian Henry
fe0006c71d Merge from dev 2013-11-13 21:34:02 +01:00
Florian Henry
a8e31ad956 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/company.lib.php

Change-Id: Iec6a98430bfd500defda256862a1ed7869ef407a
 2013-11-13 21:33:12 +01:00
Laurent Destailleur
588a30fa80 Fix: Bad status 2013-11-13 21:14:11 +01:00
Laurent Destailleur
5a8f4905d6 Fix: bad link into ecm module 2013-11-13 20:36:07 +01:00
Laurent Destailleur
d57aa65d30 Fix: Add option to fix warning not visible when there is preactivated 
modules
 2013-11-13 18:45:36 +01:00