lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
37,383 Commits 43 Branches 150 Tags 886 MiB
aaaca05711
Commit Graph

32231 Commits

Author SHA1 Message Date
Cédric Salvador
8ad2fad817 fixed select_thirdparty_list call in the select_company function 2013-06-06 18:31:52 +02:00
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +02:00
Laurent Destailleur
09526dd234 Merge pull request #1025 from grandoc/develop 
code was displayed twice
 2013-06-06 00:59:49 -07:00
Laurent Destailleur
4083d9a819 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-06 09:49:54 +02:00
Laurent Destailleur
4bc8cbc993 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-06 09:43:02 +02:00
Laurent Destailleur
bf8fd7d34f Fix: CSS 2013-06-06 09:42:39 +02:00
Grand Philippe
db6d226ffd code was displayed twice 2013-06-06 09:22:26 +02:00
Laurent Destailleur
8bad0fc97d Merge pull request #1024 from csalvador/updateline-bug 
fixed bug when editing a supplier order line
 2013-06-05 15:41:02 -07:00
Laurent Destailleur
b7f697e8c4 Remove a call of a deprecated function 2013-06-05 22:27:02 +02:00
Laurent Destailleur
8e13c4eddf Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 22:11:28 +02:00
Laurent Destailleur
56f9d8f50c Fix: missing style 2013-06-05 22:10:43 +02:00
Laurent Destailleur
7e53f98baa Qual: Uniformize code 2013-06-05 22:01:35 +02:00
Laurent Destailleur
52407f88c4 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 21:59:23 +02:00
Laurent Destailleur
0b481f285a Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 21:56:37 +02:00
Laurent Destailleur
61d5359f23 Fix: Uniformize menu entries 2013-06-05 21:55:51 +02:00
Laurent Destailleur
e25651204c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/lib/admin.lib.php
 2013-06-05 18:56:41 +02:00
Cédric Salvador
37ef86379f fixed bug when editing a supplier order line 2013-06-05 18:19:50 +02:00
Regis Houssin
c9a71439b2 Fix: EOF 2013-06-05 16:24:32 +02:00
Raphaël Doursenaud
686f5add82 Normalized line endings to LF 2013-06-05 16:12:07 +02:00
Laurent Destailleur
ebb8f05f09 Subscription to ML can also be done according to member type 2013-06-05 15:53:27 +02:00
Laurent Destailleur
e9ed4472d4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-05 15:44:59 +02:00
Laurent Destailleur
eac4aa7e28 New: Module mailman can subscribe/unsubscribe to ML according to 
categories of member.
 2013-06-05 15:44:42 +02:00
simnandez
26b36f3a4e Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:10:31 +02:00
simnandez
097fbaacd0 Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:30 +02:00
Laurent Destailleur
e4a3929a5c Fix: Minor fixes into style. 2013-06-05 14:23:49 +02:00
Laurent Destailleur
3e1d2c3e63 Qual: Mutualized and uniformize code 2013-06-05 11:21:45 +02:00
Laurent Destailleur
c4f90f8174 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-05 11:10:25 +02:00
Laurent Destailleur
7aa145ae6a Fix: Previous fix was not complete 2013-06-05 11:09:54 +02:00
Laurent Destailleur
650158dd59 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-05 10:51:09 +02:00
Laurent Destailleur
f83ab0de70 Fix: ModelDoc Activation bug 2013-06-05 10:49:12 +02:00
Laurent Destailleur
a34ab5a13f Look: Email at a better place 2013-06-04 23:19:04 +02:00
Laurent Destailleur
eadfa66f2c Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/core/class/infobox.class.php
 2013-06-04 22:59:28 +02:00
Laurent Destailleur
7b0897a669 fix: LF 2013-06-04 22:03:11 +02:00
Laurent Destailleur
d3cf8479e3 Try to commit a file with a line with CRLF and see... 2013-06-04 19:36:41 +02:00
Laurent Destailleur
3ee668b4da Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2013-06-04 12:11:56 +02:00
Laurent Destailleur
c6c4a83850 Fix: Removed deprecated code fo local tax type 7 since we can use now 
the fiscal stamp that is a better implementation.
 2013-06-04 12:04:04 +02:00
Laurent Destailleur
3cb6e196b6 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:31:54 +02:00
Laurent Destailleur
073a04f8cb Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-06-04 00:31:04 +02:00
Laurent Destailleur
205ff535a9 Fix: [ bug #919 ] SQL error in product/stock/product.php 2013-06-04 00:30:38 +02:00
Laurent Destailleur
c60e94c723 Merge pull request #1018 from fappels/develop 
Added flemish legal forms to belgium entries
 2013-06-03 14:43:35 -07:00
Laurent Destailleur
2e1170297c Merge pull request #1015 from defrance69/patch-17 
Update fiche.php
 2013-06-03 14:37:19 -07:00
Laurent Destailleur
a5800fbd8b Merge pull request #1014 from defrance69/patch-16 
Update fichinter.class.php
 2013-06-03 14:36:47 -07:00
Laurent Destailleur
b1a280de32 Fix: error message 2013-06-03 23:11:36 +02:00
Laurent Destailleur
22bde298de Fix: First permission must start with 1 2013-06-03 23:06:15 +02:00
Laurent Destailleur
26ac8f9f28 Fix: Missing translation 2013-06-03 22:17:03 +02:00
Laurent Destailleur
12973dbdb4 Look: Minor enhancement 
Fix: Option to fix bug to send email on by default.
 2013-06-03 22:06:28 +02:00
Laurent Destailleur
205335f347 Fix: Readonly mode for email was ok for eldy only. 2013-06-03 20:16:07 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
b4c5114ee6 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:26:01 +02:00
Laurent Destailleur
1ccde6ad04 Fix: syntax error 2013-06-03 19:25:12 +02:00