lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,949 Commits 43 Branches 150 Tags 886 MiB
83b35b5b64
Commit Graph

36949 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
simnandez
83ffaecc40 Update ChangeLog 2013-05-13 17:37:56 +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
ff3282275d New: Working on script ot export bank receipts. Next step. 2013-05-12 23:43:19 +02:00
Laurent Destailleur
b906691fdf Start to work onto export bank receipt 2013-05-12 21:02:48 +02:00
Laurent Destailleur
2c05d99742 Qual: Uniformize code 2013-05-12 20:10:16 +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
62475866e3 Style improvements and fixed a "bug" that showed "()" when no note was entered 2013-05-12 12:06:45 +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
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
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
zcattacz
a00f298f22 Chinese transaltion reworked for admin.lang 
- unsure translation start with *
- unused translation (by me) revert to English string
  the original machine translation is barely readable :(
 2013-05-11 14:02:50 +08:00
Laurent Destailleur
8717b1dd3c Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-11 02:16:06 +02:00
Laurent Destailleur
fa4fc8495b Fix: Missing translation key 
Fix: Minor css style missing
Fix: Create draft proposal return error if no contact defined.
Fix: W3C
 2013-05-11 02:12:34 +02:00
BENKE Charles
ea130724b1 Update annuel.php 
Add Debt and Cred graphic at the bottom of the page
 2013-05-10 23:16:41 +02:00
BENKE Charles
4f28c3dd41 Update dolgraph.class.php 
jflot can't manage more than 2 bars but can manage more than 3 lines.
 2013-05-11 00:13:27 +03:00
Marcos García
d2257b9fb0 Typo in skeleton module class 2013-05-10 17:53:12 +02:00
Marcos García
b2a4f5d1bb Typo in skeleton module class 2013-05-10 17:50:26 +02:00
simnandez
d228005e17 Fix: Remove windows CR/LF 2013-05-10 17:43:55 +02:00
Laurent Destailleur
d1d9a65de5 Merge pull request #940 from aponzio/develop 
Fixed odd translation
 2013-05-10 07:31:44 -07:00
Laurent Destailleur
cb3b0996ce Merge pull request #941 from FHenry/3.3 
Fix security breach (SQL injection)
 2013-05-10 07:28:22 -07:00
Laurent Destailleur
e67bb18062 Merge pull request #939 from FHenry/3.4 
Fix bug [ bug #885 ] silent pgsql errors with click2dial
 2013-05-10 07:26:46 -07:00
Laurent Destailleur
9992fc803d Merge pull request #937 from marcosgdf/skeleton 
Typo in skeleton module class
 2013-05-10 07:26:06 -07:00
fhenry
cdc1e55b26 Fix bug on Extrafield order and propal 2013-05-10 15:39:54 +02:00
fhenry
aab3e0a8a5 Fix Extrafield problem on propal pages 2013-05-10 15:33:28 +02:00
fhenry
0a26be3f04 Fix security leak 2013-05-10 15:11:49 +02:00
fhenry
9427e32e2e Fix security breach (SQL injection) 2013-05-10 15:04:16 +02:00
fhenry
358f051b8e Merge branch '3.4' of https://github.com/Dolibarr/dolibarr.git into 3.4 2013-05-10 14:53:13 +02:00
Alessandro Ponzio
0817d035a3 Updated SQL query that fetches invoices by adding the 'ORDER BY' clause 2013-05-10 14:38:15 +02:00
Laurent Destailleur
9b30f116f1 Fix: Some lib missing when jmobile enabled. 2013-05-10 12:48:11 +02:00
fhenry
a4e8e8eb4b Add fecth extrafield into fetch user class 2013-05-10 12:03:27 +02:00
Alessandro Ponzio
a5199962f3 Fixed odd translation 2013-05-10 08:16:36 +03:00
Alessandro Ponzio
3666999c37 Fixed bug in jsgantt.js showing 'NaN' when start/end date were missing 2013-05-10 07:10:05 +02:00
Laurent Destailleur
ce6e1dc2a6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-05-09 23:35:04 +02:00
Laurent Destailleur
e5ef27b168 Fix: no underline onto link that are disabled. 2013-05-09 22:43:01 +02:00
Laurent Destailleur
cc500cceba Fix: form into table is not W3C (broken with some uncommon browsers). 2013-05-09 22:39:31 +02:00
Alessandro Ponzio
d7527b68da Fixed odd translation 
Improved translation of general-purpose entry ("Trimestre" instead of "Quadri")
 2013-05-09 19:03:40 +02:00
fhenry
30fb1e5e05 Fix bug [ bug #885 ] silent pgsql errors with click2dial 2013-05-09 10:26:04 +02:00