Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
40,390 Commits 36 Branches 189 Tags
f34aadef3df57794de74006bc2c2c9fc4da6be12
Commit Graph

34721 Commits

Author SHA1 Message Date
Laurent Destailleur
551bcba826 Fix: Try to avoid warning 2013-05-14 10:51:09 +02:00
fhenry
f98442d700 Remove the option into admin screen 2013-05-14 09:24:05 +02:00
Laurent Destailleur
f9e0d03b0c Fix: Do not show busy if event not assigned to a user. 2013-05-14 02:46:00 +02:00
Laurent Destailleur
d7e9236455 Fix: Missing include 2013-05-14 01:31:04 +02:00
Laurent Destailleur
ee890a87a3 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/compta/prelevement/class/rejetprelevement.class.php
	htdocs/compta/prelevement/ligne.php
	htdocs/langs/en_US/admin.lang
 2013-05-14 01:15:05 +02:00
Laurent Destailleur
95fac9aace Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:08:58 +02:00
Laurent Destailleur
83b35b5b64 Merge pull request #950 from aponzio/develop 
Translateded missing entries "ThirdPartiesOfSaleRepresentative"
 2013-05-13 16:08:27 -07:00
Laurent Destailleur
0d54294bcf Merge pull request #949 from marcosgdf/holidays-module 
Improvement to holidays module
 2013-05-13 16:07:56 -07:00
Laurent Destailleur
dc28335ed5 Merge pull request #948 from marcosgdf/translations 
Improved translations
 2013-05-13 16:07:22 -07:00
Laurent Destailleur
3898a77da1 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:05:18 +02:00
Laurent Destailleur
656f0bee70 Merge pull request #947 from grandoc/3.4 
fix: center bloc was going under left menu
 2013-05-13 16:05:06 -07:00
Laurent Destailleur
80817fd8fb Fix: translation 2013-05-14 01:04:21 +02:00
Laurent Destailleur
d5cc106a3a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 01:04:10 +02:00
Laurent Destailleur
cc20b000df Merge pull request #945 from zcattacz/translation 
zh_cn/admin.lang reworkred
 2013-05-13 15:46:32 -07:00
Laurent Destailleur
ea4b324e25 Merge pull request #943 from defrance69/patch-7 
Update dolgraph.class.php
 2013-05-13 15:41:36 -07:00
Laurent Destailleur
559bbdf19a Merge pull request #944 from defrance69/patch-8 
Update annuel.php
 2013-05-13 15:40:43 -07:00
Laurent Destailleur
273fbdfa0e Merge pull request #942 from FHenry/3.4 
Remove warning if FetchObjectLinked call
 2013-05-13 15:38:28 -07:00
Laurent Destailleur
0eba9ed731 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-14 00:13:53 +02:00
Laurent Destailleur
03cbe6e208 Fix: Can't read link with some styles 2013-05-13 23:46:37 +02:00
simnandez
0c853b3ebd Fix: Some bugs on withdrawal rejects 2013-05-13 17:35:30 +02:00
simnandez
5fe70e0bee Fix: Some bugs on withdrawal rejects 2013-05-13 17:15:23 +02:00
fhenry
760ae88f39 [ task #531 ] Add a duration on tasks 2013-05-13 17:08:36 +02:00
simnandez
050ca946e9 Fix: Debug of withdrawals rejects 2013-05-13 16:30:52 +02:00
zcattacz
b911afcddb revised 
- unify the usage of full/half-width punctuations characters.
- chk chk
 2013-05-13 22:10:42 +08:00
Alessandro Ponzio
e0365ac900 Translateded missing entry "ThirdPartiesOfSaleRepresentative" 2013-05-13 11:57:20 +02:00
Alessandro Ponzio
e1b4cdb7e3 Translateded missing entry "LinkedToSpecificUsers" 2013-05-13 11:55:51 +02:00
Laurent Destailleur
2c05d99742 Qual: Uniformize code 2013-05-12 20:10:16 +02:00
Laurent Destailleur
4fc1fe798c Fix: Bad check on mandatory parameters 2013-05-12 18:20:28 +02:00
fhenry
757c22a204 Fix bug intervention numbering on validation 2013-05-12 17:54:30 +02:00
fhenry
a78b3149fe Remove debug lines 2013-05-12 17:15:45 +02:00
Laurent Destailleur
df6c796413 Fix: [ bug #889 ] Titre civilité ne s'affiche 2013-05-12 17:09:48 +02:00
Laurent Destailleur
d9e477d748 Fix: Civility translation 2013-05-12 16:38:38 +02:00
fhenry
111fc3153b Fix Extrafield selllist bug in PgSQL 2013-05-12 15:45:23 +02:00
Laurent Destailleur
1e76911890 Fix: Not error when migrating from version using exotic menu manager. 
Fix: Delete of member use id
 2013-05-12 15:26:23 +02:00
Laurent Destailleur
7c543d0c2a Fix: Not error when migrating from version using exotic menu manager. 
Fix: Delete of member use id
 2013-05-12 15:25:12 +02:00
Marcos García
a37392e34e Removed conflict with margins module name and description (already set in admin.lang) 2013-05-12 12:19:26 +02:00
Marcos García
62475866e3 Style improvements and fixed a "bug" that showed "()" when no note was entered 2013-05-12 12:06:45 +02:00
fhenry
9bfb22ad49 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-05-12 11:46:53 +02:00
Marcos García
dcb6bb4c2e Improvement to holidays module 
Creation date can't be higher than today
 2013-05-12 11:38:17 +02:00
Marcos García
c61f48a98f Added missing translation in holidays module 2013-05-12 11:36:49 +02:00
zcattacz
a25fe2e59d Adjust word order 2013-05-12 16:42:43 +08:00
simnandez
dbb0fa09ff Fix: Debug of withdrawals rejects 2013-05-11 18:36:44 +02:00
fhenry
aa7e3c2fdd [ task #892 ] Add option in thridparty customer/supplier admin to hide 
non active in select_company method
 2013-05-11 17:10:11 +02:00
Grand Philippe
23a24909e3 fix: center bloc was going under left menu 2013-05-11 17:00:47 +02:00
fhenry
ccb60e549a Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-11 15:48:49 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Laurent Destailleur
711e7bf9ad Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/adherents/fiche.php
	htdocs/core/lib/functions.lib.php
 2013-05-11 15:18:52 +02:00
Laurent Destailleur
8a90598b23 Fix: Escape entities 2013-05-11 15:12:42 +02:00
Laurent Destailleur
e4dda125d8 Merge branch '3.3' of git@github.com:Dolibarr/dolibarr.git into 3.3 2013-05-11 15:04:56 +02:00
Laurent Destailleur
526a80dd20 Sec: Param not escaped 
Fix: Bad return error
 2013-05-11 15:04:17 +02:00