Laurent Destailleur
4b402aa6d1
Fix regression on name of array
2018-10-31 15:41:00 +01:00
Laurent Destailleur
07719eaf1e
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-31 15:31:44 +01:00
Laurent Destailleur
ca726e6c94
FIX Error generating ODT when option to use contact on doc on
2018-10-31 15:31:22 +01:00
Laurent Destailleur
68804cf8a5
Merge pull request #9890 from atm-maxime/fix_import_societe_alias
...
FIX missing name alias field in societe import/export #9091
2018-10-30 15:00:34 +01:00
Laurent Destailleur
b0ef8680ff
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-10-30 14:28:25 +01:00
Maxime Kohlhaas
abb343d37e
Fix missing name alias field in societe import/export #9091
2018-10-27 09:42:08 +02:00
Marc de Lima Lucio
16c35035c1
FIX: pdf typhon: order reference duplicate
2018-10-25 12:07:40 +02:00
Laurent Destailleur
2b67da3f34
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/core/modules/commande/doc/pdf_einstein.modules.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/propale/doc/pdf_azur.modules.php
2018-09-19 14:52:43 +02:00
Frédéric FRANCE
cdbb79a26c
correct typo in multicurrency doc pdf
2018-09-19 09:26:56 +02:00
ias-ceo
fece67b629
use correct resultset
2018-09-12 19:00:19 +02:00
Laurent Destailleur
b6f4b1dff7
Merge pull request #9363 from frederic34/patch-21
...
Update modSociete.class.php
2018-09-01 13:31:23 +02:00
Josep Lluís
bfaf7ae473
Fix: undefined rights_class on modules
...
When a module has the permission variable rights_class undefined, on unactivate the module are deleted all rows in cronjobs and menu tables with module=''.
2018-09-01 12:44:16 +02:00
Frédéric FRANCE
2eade6ea68
Update modSociete.class.php
2018-08-30 23:22:06 +02:00
Laurent Destailleur
0c654bd452
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-08-16 14:47:56 +02:00
florian HENRY
20309665e6
fix : ODT project substitution
2018-08-14 10:45:08 +02:00
Laurent Destailleur
2d571acc03
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/commande/list.php
2018-08-12 19:25:44 +02:00
Laurent Destailleur
30b4d88428
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/compta/facture/list.php
htdocs/product/reassort.php
htdocs/societe/list.php
2018-08-12 19:23:45 +02:00
gauthier
391230babc
FIX : global $mysoc missing (to avoid php notice on lines 279, 280 & 281)
2018-08-10 15:39:49 +02:00
Ferran Marcet
5ce31f65a4
Fix: Bad position when document have incoterms/notes
2018-08-07 11:40:11 +02:00
florian HENRY
ceb85cfa45
fix : odt project and task extrafields management
2018-07-31 17:29:08 +02:00
Laurent Destailleur
20f178fdfe
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/comm/action/index.php
htdocs/core/lib/functions.lib.php
2018-07-24 19:22:00 +02:00
Frédéric FRANCE
4341e367d2
remove % in supplier order pdf
2018-07-23 10:30:28 +02:00
Laurent Destailleur
a1180f79bd
Fix missing customer code and ref customer
2018-07-21 12:56:18 +02:00
Laurent Destailleur
9c5d34fc5f
Fix translation
2018-07-02 12:26:32 +02:00
Laurent Destailleur
11021353da
Fix text in payment area of crabe pdf
2018-07-02 11:33:33 +02:00
Laurent Destailleur
3a06918b16
FIX Missing extrafields in export of stock or products
2018-05-23 18:00:27 +02:00
Laurent Destailleur
d1d8494666
FIX Missing extrafields in export
2018-05-23 17:48:18 +02:00
Laurent Destailleur
f6ca1eb624
Fix permission name
2018-05-05 13:24:46 +02:00
Laurent Destailleur
013f95f54b
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-18 00:02:51 +02:00
atm-greg
90f1ab8af4
add hooks on supplier documents
2018-04-16 06:46:22 +02:00
Laurent Destailleur
e437989853
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-04-12 13:25:27 +02:00
atm-greg
ae34fa6fbd
add supplier contact name on supplier documents
2018-04-11 17:42:26 +02:00
Laurent Destailleur
0223d54107
FIX Support or multicompany for sheduled jobs
...
FIX Use priority to define order of sheduled jobs
Conflicts:
htdocs/cron/list.php
2018-04-05 12:38:42 +02:00
Laurent Destailleur
934d2d8881
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/filefunc.inc.php
2018-03-25 15:27:31 +02:00
florian HENRY
1feb22ea9c
fix user right on modRessource
2018-03-21 22:24:11 +01:00
Laurent Destailleur
55d3e72463
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
...
Conflicts:
htdocs/contact/class/contact.class.php
htdocs/societe/card.php
2018-03-12 19:02:30 +01:00
Laurent Destailleur
897b3f7b79
Fix setup
2018-03-11 00:31:26 +01:00
Maxime Kohlhaas
c008853842
Fix #8057
2018-03-10 23:05:33 +01:00
florian HENRY
f37d482331
fix warning and sql error
2018-03-09 11:37:23 +01:00
Regis Houssin
a0774d523d
Fix: avoid conflict between invoice and invoicenumber sharings
2018-03-07 15:24:23 +01:00
Laurent Destailleur
004839b368
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
2018-03-07 13:03:40 +01:00
Laurent Destailleur
8b9041b93e
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
2018-03-07 13:02:18 +01:00
Laurent Destailleur
4caefbe926
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
2018-03-07 12:59:52 +01:00
Marc de Lima Lucio
dd208348c4
FIX: add planned delivery to order exports
2018-03-07 12:18:08 +01:00
Laurent Destailleur
8d11f1efa1
FIX Payment mode not correctly set in donation and document
2018-03-02 12:32:49 +01:00
Laurent Destailleur
a01287b211
Fix template donation
2018-03-02 12:25:43 +01:00
Laurent Destailleur
41638e6dff
Fix back link of look and feel v7
2018-02-26 09:20:05 +01:00
Laurent Destailleur
6c16f2af1e
Merge pull request #8226 from hregis/7.0_multicompany
...
Fix: differentiate sharing of "member" and "member_type"
2018-02-25 12:54:51 +01:00
Laurent Destailleur
619e0d3792
FIX Bad var for substitution of free text
2018-02-24 14:03:27 +01:00
Laurent Destailleur
03d9bf1376
Restore deprecated var
2018-02-24 12:35:36 +01:00
