2
0
forked from Wavyzz/dolibarr
Commit Graph

34721 Commits

Author SHA1 Message Date
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
simnandez
a4841dacda Fix: Warning missing argument 2 into withdrawals 2013-06-05 15:09:13 +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
94d1f23721 Merge pull request #1019 from GPCsolutions/3.3-societefix
Fixed field name
2013-06-04 10:19:44 -07:00
Raphaël Doursenaud
880a27f827 Fixed field name 2013-06-04 18:40:46 +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
Laurent Destailleur
1aa5535741 New: Add function to get http content 2013-06-03 17:44:55 +02:00
Francis Appels
1a480b4e68 modified abrviation of code 227 2013-06-03 16:34:44 +02:00
Laurent Destailleur
c1dd2f20cd Qual: Clean code. 2013-06-03 15:18:36 +02:00
Laurent Destailleur
1ff175f14e Fix: Bad regex 2013-06-03 12:46:25 +02:00
Laurent Destailleur
4b3413c84c Fix: Loading of boxes from external modules 2013-06-03 12:43:14 +02:00
Laurent Destailleur
7dc984fd6f Fix: Loading of boxes from external modules 2013-06-03 11:33:13 +02:00
Laurent Destailleur
a1a8fac25c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-03 11:15:15 +02:00
Laurent Destailleur
6cf1d25529 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
2013-06-03 11:09:40 +02:00
BENKE Charles
d331596d19 Update fiche.php
Add contract link
2013-06-03 01:49:49 +02:00
BENKE Charles
949a2c0ac5 Update fichinter.class.php
add contract link
2013-06-03 02:43:12 +03:00
Laurent Destailleur
4f0758f9b1 Merge pull request #1011 from marcosgdf/minor
Avoid warnings
2013-06-02 04:29:23 -07:00
Laurent Destailleur
25e8b39ca8 Merge pull request #1010 from marcosgdf/bug-908
Fix: [bug #908] Erreur lors de la configuration du module
2013-06-02 04:17:48 -07:00
Laurent Destailleur
1a8c349d6a Merge pull request #1012 from fappels/221bac2791e7eb3b2a2b9d24e38b0103a8de84f5
FIX: translations for correct Commercial PDF docs
2013-06-02 04:14:41 -07:00
Laurent Destailleur
b75893b3de Merge pull request #1013 from marcosgdf/style
Fixed empty table when few modules are activated in product card view
2013-06-02 04:07:49 -07:00
Marcos García
c12da33dcd Fixed empty table when few modules are activated in product card view 2013-06-02 00:37:33 +02:00
Laurent Destailleur
c5783215c4 Fix: Var not initialized
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:46:36 +02:00
Laurent Destailleur
8348596aea Fix: Var not initialized
Fix: Pb of duplicate run of javascript with jmobile
2013-06-01 23:45:03 +02:00