lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
99,615 Commits 43 Branches 150 Tags 886 MiB
38ef028310
Commit Graph

99615 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
altairis-noe
86812c13ee no double quote 2021-04-21 09:18:40 +02:00
daraelmin
5fe9815570
Update paymentok.php 2021-04-20 23:54:33 +02:00
Florian HENRY
a15d58065f modifié : .gitignore 2021-04-20 20:25:51 +02:00
Florian HENRY
b2d6b73125 add gitingore for modulebuilders 2021-04-20 20:23:45 +02:00
Florian HENRY
95c7657ace add gitingore for modulebuilders 2021-04-20 20:21:24 +02:00
Florian HENRY
4399e55204 Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0 2021-04-20 19:22:59 +02:00
Dorian Vabre
4c57a6c207 wip on mail, sending ok but no content 2021-04-20 17:28:18 +02:00
altairis-noe
d25298172f Merge branch 'batch_status_dict' of github.com:altairisfr/dolibarr into batch_status_dict 2021-04-20 17:00:47 +02:00
altairis-noe
f1d68c201b conflict resolution 2021-04-20 16:56:15 +02:00
Dorian Vabre
5ad64640c2 removal of var_dump 2021-04-20 16:26:11 +02:00
Noé Cendrier
31bf48ec0f
Merge pull request #7 from altairis-noe/batch_status_dict 
batch status dictionnary
 2021-04-20 16:18:46 +02:00
altairis-noe
d340e21cb3 No translation for dictionary labels 2021-04-20 16:13:36 +02:00
Dorian Vabre
a500d83c0b linked invoice and attendee 2021-04-20 16:09:22 +02:00
altairis-noe
07cd751c59 batch status dictionnary 2021-04-20 15:51:02 +02:00
Dorian Vabre
b70e477f47 removal of the mail sending (not functional yet) in the subscriptionok page, it will be moved to the paymentok after payment or the attendeesubscription if no payment has to be done 2021-04-20 14:49:11 +02:00
Dorian Vabre
2cde31d17c creation of ATT and BOO payment event 2021-04-20 14:39:41 +02:00
Alexandre SPANGARO
1729497d62 FIX Accountancy - Quadra export - wrong data on credit 2021-04-20 13:56:58 +02:00
Laurent Destailleur
891de3350f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-20 13:30:43 +02:00
Laurent Destailleur
4180a9ef62 FIX pb when saving some export profiles 2021-04-20 13:30:18 +02:00
UT from dolibit
771afbc195
Update llx_20_c_departements.sql 
Italy new
 2021-04-20 13:10:29 +02:00
Laurent Destailleur
1bd2bd3237 Fix php8 warning 2021-04-20 12:46:41 +02:00
Dorian Vabre
d0d0e0390b wip on mail 2021-04-20 12:28:34 +02:00
Laurent Destailleur
db5fb42c11 css 2021-04-20 12:27:00 +02:00
Laurent Destailleur
14f009f550 Fix CURLOPT_CONNECT_TO 2021-04-20 12:19:46 +02:00
Laurent Destailleur
455d5233e6 Fix trans 2021-04-20 11:58:51 +02:00
Laurent Destailleur
f1f63cd4e2 Enhance detection of update available 2021-04-20 11:56:26 +02:00
Laurent Destailleur
4fde184afb Add the setup page of module accounting to not search where is setup 2021-04-20 11:40:43 +02:00
UT from dolibit
792c865ac0
Update bom_list.php 
new: $help_url = 'EN:Module_BOM';

moved up:  llxHeader('', $title, $help_url);
 2021-04-20 11:39:27 +02:00
UT from dolibit
634d638a16
Update bom_document.php 
$help_url = 'EN:Module_BOM';
 2021-04-20 11:35:33 +02:00
Dorian Vabre
529909c3d1 wip on sending mails 2021-04-20 11:35:31 +02:00
UT from dolibit
cce6224c91
Update bom_card.php 
$help_url ='EN:Module_BOM';
llxHeader('', $title, $help_url);
 2021-04-20 11:33:47 +02:00
UT from dolibit
3a1f70fe34
Update bom_agenda.php 
$help_url = 'EN:Module_Agenda_En|FR:Module_Agenda|ES:Módulo_Agenda';
 2021-04-20 11:31:45 +02:00
UT from dolibit
53a89180d9
Update element.php 
merging by
- if (!empty($conf->facture->enabled))
- if (!empty($conf->loan->enabled))
 2021-04-20 11:22:12 +02:00
Dorian Vabre
5c490ca57e security added to subscriptionok page 2021-04-20 10:56:45 +02:00
Dorian Vabre
3b17a0d66a wip on paymentok page 2021-04-20 10:42:50 +02:00
Dorian Vabre
b43e85dbf4 added global dolibarr_main_instance_unique_id in attendeesubscription page 2021-04-20 10:27:32 +02:00
Dorian Vabre
7405813ad0 now displays only buttons if the corresponding boolean is checked 2021-04-20 10:24:36 +02:00
altairis-noe
81907191ca product card typo 2021-04-20 10:17:08 +02:00
Gauthier PC portable 024
70f739b332 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 10:03:20 +02:00
Gauthier PC portable 024
72ea2a56ea NEW : help text 2021-04-20 10:02:53 +02:00
Dorian Vabre
f82d1d246d cleanup on the index registration page 2021-04-20 09:45:32 +02:00
Gauthier PC portable 024
cbfb2d9b47 Merge branch '13.0_new_collapse_batch_detail' of github.com:atm-gauthier/dolibarr into develop_new_collapse_batch_detail 2021-04-20 09:44:24 +02:00
Gauthier PC portable 024
e5df10133e Merge branch '13.0' of github.com:Dolibarr/dolibarr into 13.0_new_collapse_batch_detail 2021-04-20 09:06:05 +02:00
Alexandre SPANGARO
d27030df3f Merge remote-tracking branch 'upstream/develop' into 14a39 2021-04-20 04:43:14 +02:00
Alexandre SPANGARO
d66540bf00 Revert "Split mod fournisseur" 
This reverts commit 78dbf4f7ff.
 2021-04-20 04:42:51 +02:00
Laurent Destailleur
39654260d6 Sync transifex 2021-04-20 00:45:48 +02:00
Laurent Destailleur
22daecbeec Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-04-19 22:52:26 +02:00
Laurent Destailleur
ea97992c3d css 2021-04-19 22:52:13 +02:00
Anthony Berton
d294bd544d Update list.php 2021-04-19 22:42:38 +02:00
Laurent Destailleur
0ac380f23e
Merge pull request #17248 from altairisfr/batch_mask_product 
Batch mask product
 2021-04-19 22:16:22 +02:00