Juanjo Menent
0a33f0728a
Fix translations of contract exports
2015-08-26 21:01:01 +02:00
Juanjo Menent
4cd61073e2
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-26 20:26:27 +02:00
Juanjo Menent
6321e96e49
Close #3223
2015-08-26 20:25:52 +02:00
Laurent Destailleur
603c44c37c
Merge pull request #3405 from aspangaro/3.8-13
...
Fast review 3.8
2015-08-26 11:27:16 +02:00
Juanjo Menent
9deaa3cceb
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-25 22:01:33 +02:00
Juanjo Menent
f32a7ba228
Close #3224
2015-08-25 21:59:46 +02:00
aspangaro
73d8f20c6b
Fix: Correct directory where the donation is generated & add the action to remove_file who are generated
2015-08-25 08:09:14 +02:00
Laurent Destailleur
feed3f714c
Fix to avoid warning
2015-08-24 11:17:11 +02:00
Laurent Destailleur
1b409538a8
Fix #3400
...
Conflicts:
htdocs/core/lib/date.lib.php
2015-08-20 15:51:28 +02:00
Laurent Destailleur
4541d189ac
Fix #3400
2015-08-20 15:50:00 +02:00
Laurent Destailleur
fabd751be4
Fix Server hang with long loop when reading specimen pdf and high number
...
of tasks.
2015-08-17 20:07:14 +02:00
Laurent Destailleur
76ce98630f
Fix translation
2015-08-17 19:42:19 +02:00
Laurent Destailleur
fc8a822f1d
Merge remote-tracking branch 'origin/3.7' into develop
2015-08-13 04:03:23 +02:00
Laurent Destailleur
c73fe965d2
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:58:32 +02:00
Laurent Destailleur
1595765ec8
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
2015-08-13 03:18:02 +02:00
Laurent Destailleur
f1e87478ff
Fix translation of printing menu
2015-08-12 23:12:15 +02:00
Laurent Destailleur
d4aabf99db
Fix permission of module
2015-08-12 22:32:29 +02:00
Juanjo Menent
a6d7977d4f
Merge pull request #3354 from defrance/patch-74
...
New pdf for project - listing of elements
2015-08-10 20:51:58 +02:00
Marcos García de La Fuente
f3ef4fed93
Fix: [ bug #3313 ] Error enabling module with PostgreSQL database
...
Close #3313
2015-08-09 13:58:03 +02:00
Juanjo Menent
f695b5cd11
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-07 13:01:53 +02:00
Juanjo Menent
38afb1a4e6
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/modules/modBarcode.class.php
2015-08-07 12:57:16 +02:00
Juanjo Menent
12b83fd3e8
Fix #3304
2015-08-07 12:45:27 +02:00
BENKE Charlie
01671d02d1
New pdf for project - listing of elements
2015-08-07 00:39:44 +02:00
Juanjo Menent
98072ec73e
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-06 18:00:59 +02:00
Florian HENRY
2a7f5da4a7
FIX : export SQL instruction on modProduct with extrafields
2015-08-04 11:49:26 +02:00
Juanjo Menent
9ae31f3a08
Merge remote-tracking branch 'origin/3.8' into develop
2015-08-01 15:01:19 +02:00
Juanjo Menent
05b0a9b675
Merge remote-tracking branch 'origin/3.7' into 3.8
...
# Conflicts:
# htdocs/core/menus/standard/eldy.lib.php
2015-08-01 14:50:07 +02:00
Laurent Destailleur
13dee1876a
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/resultat/clientfourn.php
2015-07-30 15:07:22 +02:00
Laurent Destailleur
a6bac40f0a
Fix bad translation
2015-07-29 13:03:52 +02:00
Laurent Destailleur
ff8969073c
Merge remote-tracking branch 'origin/3.7' into 3.8
...
Conflicts:
htdocs/contrat/class/contrat.class.php
htdocs/core/class/extrafields.class.php
htdocs/main.inc.php
2015-07-28 18:57:13 +02:00
fmarcet
6676114501
Fix: Not showing product supplier reference when page break
2015-07-27 16:31:40 +02:00
fmarcet
e130af8033
Fix: Not showing delivery date on rouget pdf (expedition)
2015-07-27 13:11:07 +02:00
Laurent Destailleur
cb98d6cb93
Merge remote-tracking branch 'origin/3.8' into develop
2015-07-19 15:32:20 +02:00
Laurent Destailleur
2f2b0df6f8
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/contact/exportimport.php
htdocs/contact/info.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/modules/DolibarrModules.class.php
htdocs/core/modules/modSociete.class.php
htdocs/core/tpl/document_actions_pre_headers.tpl.php
htdocs/langs/fr_FR/categories.lang
htdocs/main.inc.php
htdocs/product/reassort.php
htdocs/projet/list.php
htdocs/societe/info.php
2015-07-19 12:26:31 +02:00
Laurent Destailleur
2bb1945a2f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
htdocs/compta/prelevement/class/rejetprelevement.class.php
htdocs/compta/sociales/class/paymentsocialcontribution.class.php
htdocs/contact/exportimport.php
htdocs/contact/ldap.php
htdocs/contact/perso.php
htdocs/contact/vcard.php
htdocs/core/class/commonobject.class.php
htdocs/product/reassort.php
htdocs/projet/liste.php
htdocs/societe/consumption.php
htdocs/societe/info.php
2015-07-19 12:04:30 +02:00
aspangaro
b9b6abd7a8
Merge remote-tracking branch 'Upstream/3.8' into 3.8-1
2015-07-18 05:29:57 +02:00
Juanjo Menent
06684ea362
Merge pull request #3250 from aspangaro/3.8-patch7
...
Fix : #3228 [Export] Missing member ID field in users
2015-07-17 19:15:53 +02:00
Juanjo Menent
0971e88531
Merge pull request #3249 from aspangaro/3.8-patch6
...
Fix : #3230 [Leaves] Module setup page is useless
2015-07-17 19:15:31 +02:00
aspangaro
a0d74cc1a1
Fix : #3228 [Export] Missing member ID field in users
2015-07-16 22:50:50 +02:00
aspangaro
440e144892
Fix : #3230 [Leaves] Module setup page is useless
2015-07-16 22:29:04 +02:00
aspangaro
2d3d78ecc0
Fix : #3232 [Agenda] Setup page tab order is weird
2015-07-16 22:16:11 +02:00
Laurent Destailleur
cbce66bba8
Merge pull request #3190 from hregis/3.8_bug2
...
Fix: wrong path and add index.html
2015-07-16 10:07:31 +02:00
aspangaro
4ae15adc69
Fix: wrong link on leave tabs in user card
2015-07-16 06:10:51 +02:00
aspangaro
59e88590e0
Move my address email to new one
2015-07-15 20:30:33 +02:00
Laurent Destailleur
a9289de616
Several fixes. Fix #2927
2015-07-13 11:22:18 +02:00
Regis Houssin
f23afc3453
Fix: wrong path and add index.html
2015-07-13 10:07:38 +02:00
Laurent Destailleur
8690b5e70e
FIX #3173 Overlapping of shipment ref
2015-07-12 16:22:06 +02:00
Laurent Destailleur
688562a816
Fix regression: We can't yet set method __construct of DolibarrModules
...
abstract because this break compatibility with a lot of external module
and generate FATAL errors after migration. Because PHP is not yet able
to manage try catch on FATAL error, we can't catch such error. Using
bstract on constructor is so postponed.
2015-07-10 09:40:18 +02:00
Marcos García de La Fuente
eff573e753
Removed duplicated code from core modules
2015-07-07 13:08:26 +02:00
Marcos García de La Fuente
56ff0c7350
Created abstract functions DolibarrModules::__construct, DolibarrModules::init and DolibarrModules::remove
2015-07-07 13:08:12 +02:00
