Commit Graph

7572 Commits

Author SHA1 Message Date
phf
ffecdc13ff [CORE] déplacement de la création des tables du module dans le script de migration (#new_ask_price). 2015-02-09 10:38:48 +01:00
phf
a1d2f426b8 [CORE] correction mineurs pour travis (#new_ask_price). 2015-02-09 10:17:28 +01:00
phf
34bc1dbc15 Merge branch 'develop' into new_ask_price 2015-02-09 09:07:50 +01:00
Laurent Destailleur
e8b2b22c32 Merge branch 'bug-1827' of https://github.com/marcosgdf/dolibarr into
marcosgdf-bug-1827

Conflicts:
	ChangeLog
2015-02-07 23:56:38 +01:00
Laurent Destailleur
1314d9ce4e Merge pull request #2311 from marcosgdf/bug-1810
Fix: [ bug #1810 ] [pgsql] Error while upgrading from 3.6 to 3.7
2015-02-07 23:41:48 +01:00
Laurent Destailleur
1d1b3da182 Fix: the syslog handler for chromphp an fiefoxphp was not visible when
they should not.
2015-02-07 19:30:28 +01:00
Laurent Destailleur
64963ef9bd Fix: the syslog handler for chromphp an fiefoxphp was not visible when
they should not.
2015-02-07 19:12:22 +01:00
Laurent Destailleur
90fdc29d5e Fix restore compatibility 2015-02-07 17:41:20 +01:00
aspangaro
71b9098a44 Fix : Typo on merge 2015-02-07 06:42:36 +01:00
Laurent Destailleur
3bdf8864a9 New: Add option MAXTABS_IN_CARD to limit number of visible tabs. 2015-02-07 04:24:31 +01:00
Laurent Destailleur
a21acdeb7c Enable select2 for users combo 2015-02-07 03:41:09 +01:00
Laurent Destailleur
011d39105d Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/accountancy/admin/export.php
	htdocs/accountancy/journal/bankjournal.php
	htdocs/accountancy/journal/sellsjournal.php
	htdocs/core/datepicker.php
	htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
	htdocs/fourn/facture/card.php
2015-02-07 03:28:36 +01:00
Laurent Destailleur
ba5d355eb3 Fix bad property 2015-02-07 02:14:45 +01:00
Laurent Destailleur
553181a5d9 Fixed: Location for file storage from tab attached files was not at same
place than from tab images.
2015-02-06 21:26:41 +01:00
Laurent Destailleur
35129f2192 Fix PROJECT_CAN_ALWAYS_LINK_TO_ALL_SUPPLIERS option not correctly
supported.
Fix: No limit on ldap search on dolibarr side.
2015-02-06 16:33:33 +01:00
Marcos García de La Fuente
b8b9df7b95 Fix: [ bug #1827 ] Tax reports gives incorrect amounts when using external modules that create lines with special codes 2015-02-06 12:36:09 +01:00
phf
bf643c26da [CORE] FIX : des noms des hooks
+ correction nom de variable (#new_ask_price).
2015-02-06 09:50:27 +01:00
Laurent Destailleur
b654ffb627 New: Add option SUPPLIER_ORDER_HIDE_VALIDATED. So a module can remove
this step. Useless when all users have permission to approve supplier
orers.
2015-02-05 11:58:40 +01:00
phf
bcbf29d9a5 [CORE] assainissement du code + traductions FR vers EN (#new_ask_price). 2015-02-04 15:39:57 +01:00
phf
8bfb5839ca [CORE] modification de l'affichage (#new_ask_price). 2015-02-03 16:53:09 +01:00
phf
7ae003fa1a [CORE] modification de l'affichage (#new_ask_price). 2015-02-03 16:52:49 +01:00
phf
f15d18dbb1 [CORE] ajout d'une colonne pour la référence fournisseur sur une demande de prix (#new_ask_price). 2015-02-03 15:21:10 +01:00
Laurent Destailleur
4477a712d6 Fix: calendar was not using option START_WEEK. 2015-02-03 14:02:36 +01:00
Laurent Destailleur
a6e4fdd7c3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-02-03 14:02:07 +01:00
Laurent Destailleur
0b01fa8eb8 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-02-03 13:45:10 +01:00
Laurent Destailleur
f865534b4c Fix some pdf differences 2015-02-03 13:43:37 +01:00
Laurent Destailleur
7ac35593e1 Merge pull request #2314 from aspangaro/3.7-Accountancy
FIXED Accountancy clean code
2015-02-03 13:11:16 +01:00
Laurent Destailleur
96215ccea5 Fix bad operator for and 2015-02-03 13:05:28 +01:00
Laurent Destailleur
41cabeee59 Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 12:40:49 +01:00
Laurent Destailleur
d626d073dc Merge pull request #2304 from frederic34/tooltip
Tooltip
2015-02-03 12:32:40 +01:00
Laurent Destailleur
fe674f8fd5 Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 12:21:30 +01:00
Laurent Destailleur
077fafdb7d Remove log 2015-02-03 12:20:36 +01:00
Laurent Destailleur
01541e4152 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	htdocs/comm/action/card.php
	htdocs/core/datepicker.php
2015-02-03 12:17:45 +01:00
Laurent Destailleur
20121c2fbe Fix pb into date management.
Added phpunit to avoid this in future.
2015-02-03 11:25:51 +01:00
phf
c22bbb23d8 [CORE] ré-indentation d'une ligne (#new_ask_price). 2015-02-03 10:09:25 +01:00
aspangaro
14a078c9a7 FIXED Accountancy clean code 2015-02-03 06:39:44 +01:00
Laurent Destailleur
21c78cc392 Merge remote-tracking branch 'origin/3.7' into develop 2015-02-02 21:45:31 +01:00
frederic34
f69e58cccb Tooltip 2015-02-02 21:09:30 +01:00
Laurent Destailleur
9747f1fd2a Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into origin_dolibarr_develop 2015-02-02 18:38:24 +01:00
Laurent Destailleur
7b209fa0be New: Add hidden option PDF_SHOW_PROJECT to show project ref onto
supplier orders and invoices.
2015-02-02 18:36:49 +01:00
phf
5266542bc9 [CORE] correction bug + trad + ajout de conditions pour le fonctionnement du module (#new_ask_price). 2015-02-02 17:50:33 +01:00
Raphaël Doursenaud
fb865e8184 FIXED Removed deprecated forcing SSLv3 for CURL
Since the Poodle vulnerability, SSLv3 has been supersedded by TLS.
Many services do not offer SSLv3 anymore.
CURL has also been patched in PHP so it now auto-negociates the most appropriate protocol.
This prevented most API calls from working.
2015-02-02 17:13:11 +01:00
phf
d2c4e8c98f [CORE] retrait d'une condition ajout auparavant mais qui est inutile (#new_ask_price). 2015-02-02 16:18:07 +01:00
phf
38551dd468 [CORE] retrait de liens ou champs inutile (#new_ask_price). 2015-02-02 16:17:07 +01:00
Laurent Destailleur
7fbf76ee2a Fix phpcs 2015-02-02 15:43:22 +01:00
phf
a3c29f2e9c [CORE] Avancement du fonctionnement du module, correction bug et épuration de l'affichage (#new_ask_price). 2015-02-02 15:41:14 +01:00
frederic34
482eec1cce Merge remote branch 'upstream/develop' into tooltip 2015-02-02 13:48:39 +01:00
frederic34
fb22de1ecd Merge remote branch 'upstream/develop' into tooltip 2015-02-02 13:46:52 +01:00
Laurent Destailleur
9c087e27d0 Fix permissions 2015-02-02 13:45:55 +01:00
Laurent Destailleur
7809013b96 Message is more clear. 2015-02-02 13:33:16 +01:00