Commit Graph

40390 Commits

Author SHA1 Message Date
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
e7989d9e51 Merge pull request #1017 from GPCsolutions/idea
Added an ignore rule for JetBrains IntelliJIDEA IDE projects
2013-06-03 14:42:57 -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
0530b231bb Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 2013-06-03 19:52:53 +02:00
Laurent Destailleur
e871ea64eb Fix: Regression 2013-06-03 19:52:34 +02:00
Laurent Destailleur
3127d66b17 Fix: Regression 2013-06-03 19:46:43 +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
Raphaël Doursenaud
e797563d34 Added an ignore rule for JetBrains IntelliJIDEA IDE projects
This also include derived products such as PHPstorm
2013-06-03 12:23:04 +02:00
Raphaël Doursenaud
6856ca3993 Added a gitattribute file to let git deal with line ending issues 2013-06-03 12:10:07 +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
c8c9ea797d Merge pull request #1009 from marcosgdf/bug-903
Fixed bug #903: Fatal error: Call to undefined function dol_get_first_da...
2013-06-02 04:17:07 -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
Francis Appels
7c0f7e1630 Added flemish legal forms to belgium entries
Added flemish legal forms to belgium entries, so flemish company can
show correct info on his commerial documents
2013-06-01 17:21:39 +02:00
Francis Appels
221bac2791 FIX: translations for correct Commercial PDF docs
Corrected translations, so correct Commercial PDF documents will be
generated. Corrected also some auto translations.
2013-06-01 17:12:04 +02:00
Marcos García
cf1d269f15 Avoid warnings 2013-06-01 16:11:45 +02:00
Marcos García
7b20757449 Fix: [bug #908] Erreur lors de la configuration du module 2013-06-01 15:51:17 +02:00
Marcos García
8ae0939ae5 Fixed bug #903: Fatal error: Call to undefined function dol_get_first_day() in htdocs/commande/liste.php 2013-06-01 15:39:45 +02:00
Laurent Destailleur
c6411477d7 Clean dead comments 2013-06-01 15:36:37 +02:00
Laurent Destailleur
520101bdfb Fix: Missing vat rate 2013-06-01 02:52:25 +02:00
Laurent Destailleur
9b96e38a35 Fix: Update vat rates for canada
Conflicts:
	htdocs/langs/fr_CA/main.lang
2013-06-01 02:49:44 +02:00
Laurent Destailleur
0b3a52395d Fix: Missing mayotte 2013-06-01 02:21:39 +02:00
Laurent Destailleur
b3b80701fd Fix: Bug with jmobile 2013-06-01 02:03:19 +02:00
Laurent Destailleur
9934852f13 Trans 2013-06-01 01:16:42 +02:00
Laurent Destailleur
0f27a9e4d4 Merge remote-tracking branch 'origin/3.4' into develop 2013-06-01 00:29:09 +02:00
Laurent Destailleur
a7a8d73d3c Merge remote-tracking branch 'origin/3.4' into develop 2013-06-01 00:25:33 +02:00
Laurent Destailleur
4b0b6fdd55 Fix: Avoid pb with jmobile 2013-06-01 00:24:13 +02:00
Laurent Destailleur
3395fd6d8d Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	htdocs/langs/fr_CA/main.lang
	htdocs/main.inc.php
2013-06-01 00:04:51 +02:00