lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
98,668 Commits 43 Branches 150 Tags 886 MiB
d6617f82ca
Commit Graph

98668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
d6617f82ca
Merge branch 'develop' into develop 2021-05-04 00:23:28 +02:00
Laurent Destailleur
b500f27796
Merge pull request #17482 from daraelmin/daraelmin-patch-2 
Fix undefined translation key
 2021-05-04 00:20:23 +02:00
Laurent Destailleur
816acaa4c2 css 2021-05-04 00:17:47 +02:00
Laurent Destailleur
b2901bfae0 Make code simpler 2021-05-04 00:15:06 +02:00
Laurent Destailleur
af9b2414a0
Merge pull request #17480 from bb2a/ajax-pdf-option 
Use AJAX PDF Options
 2021-05-04 00:06:18 +02:00
Laurent Destailleur
16f1651d4e Add missing action events in trigger 2021-05-04 00:04:44 +02:00
Laurent Destailleur
04930c2a98 Fix filter 2021-05-03 23:21:39 +02:00
Laurent Destailleur
b3af666697 Clean code 2021-05-03 23:09:11 +02:00
Laurent Destailleur
826e3d2855
Merge pull request #17314 from atm-jpb/develop_mcurrencyRate 
NEW mcurrency rate
 2021-05-03 23:01:33 +02:00
Laurent Destailleur
9e5fdfdec3
Update multicurrency_rate.php 2021-05-03 23:01:05 +02:00
Anthony Berton
9ef49a15e4 Update pdf.php 2021-05-03 22:28:40 +02:00
daraelmin
6644fd3a73
Fix undefined translation key 2021-05-03 22:15:40 +02:00
Laurent Destailleur
6e32efdb40 Fix phpcs 2021-05-03 20:22:36 +02:00
Laurent Destailleur
e4499976e9 Disable empty tabs 2021-05-03 19:56:31 +02:00
Laurent Destailleur
a3431a790a
Merge pull request #17404 from bb2a/doctemplate 
New Add option for doctemplate
 2021-05-03 19:45:40 +02:00
Laurent Destailleur
08806a6d9a
Merge pull request #17403 from kastoras/product_variants_api_add_stock_to_response 
New/NEW Product Variants API, add variant stock to response
 2021-05-03 19:39:50 +02:00
Laurent Destailleur
9973085613 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/comm/propal/card.php
	htdocs/compta/bank/releve.php
	htdocs/compta/paiement/rapport.php
	htdocs/core/class/extrafields.class.php
	htdocs/core/modules/expedition/doc/pdf_espadon.modules.php
	htdocs/reception/card.php
	htdocs/societe/societecontact.php
 2021-05-03 19:36:49 +02:00
Laurent Destailleur
9dc36d13c3 Enhance error management 2021-05-03 19:25:16 +02:00
Laurent Destailleur
a36df785b0 Fix lang 2021-05-03 19:20:49 +02:00
Laurent Destailleur
17ea41660f
Merge pull request #17469 from indelog/fix_order_payreport 
Fix show table of pdf payments repports in file order
 2021-05-03 19:19:00 +02:00
Laurent Destailleur
bb5e1c59c7
Merge pull request #17478 from FHenry/13_fix_eventfromcontact 
FIX: create event from contact card preselect contact correctly
 2021-05-03 19:17:52 +02:00
Laurent Destailleur
cbc481dc60 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/adherents/list.php
	htdocs/adherents/type.php
	htdocs/core/lib/company.lib.php
 2021-05-03 19:01:47 +02:00
Laurent Destailleur
17cb441569 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:50 +02:00
Laurent Destailleur
540e4f3d2e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-05-03 18:58:41 +02:00
Laurent Destailleur
b7816f3d96 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-05-03 18:58:03 +02:00
Laurent Destailleur
2d7ecb8a44 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/boxes/box_produits_alerte_stock.php
 2021-05-03 18:57:52 +02:00
Laurent Destailleur
04ef2c6da6
Merge pull request #17479 from WimpyMan/13.0 
FIX #17476 releve.php: Fix SQL statement
 2021-05-03 18:55:34 +02:00
Laurent Destailleur
1d2f8b09d9
Update releve.php 2021-05-03 18:55:25 +02:00
Laurent Destailleur
03e8f2aee1 Fix for performance troubles 2021-05-03 18:49:37 +02:00
WimpyMan
706545081c FIX #17476 releve.php: Fix SQL statement 
Single quotes `'` should be uses instead of double quotes `"` for
string values.
 2021-05-03 18:29:53 +02:00
Laurent Destailleur
28b1d83ae9 Make some performance enhancements 2021-05-03 18:29:21 +02:00
Florian HENRY
9278228e20 FIX: create event from contact card preselect contact correctly 2021-05-03 18:08:49 +02:00
Indelog
c18848c944 Fix: simplify code with dol_dir_list() 2021-05-03 17:17:44 +02:00
Laurent Destailleur
c5449fdd66 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 16:48:53 +02:00
Laurent Destailleur
49a0304071 Add TODO 2021-05-03 16:48:40 +02:00
Laurent Destailleur
e6b4f1eab6
Merge pull request #17442 from atm-john/11.0_fix_showInputField_checkbox_selection 
FIX : Show input field checkbox selection
 2021-05-03 16:16:56 +02:00
Laurent Destailleur
33a20ae9a1
Update extrafields.class.php 2021-05-03 16:16:44 +02:00
Laurent Destailleur
9ce510f5f9
Merge pull request #17443 from Hystepik/develop#1 
Fix : Error on knowledgemanagement_list error $sql extrafields
 2021-05-03 16:16:04 +02:00
Indelog
dba9b17275 Fix forgot payment filter on file name 2021-05-03 16:00:14 +02:00
Laurent Destailleur
5962f1cccd
Merge pull request #17445 from OPEN-DSI/new-societe-compta-code-digiteria 
NEW rise code tries in digeteria customer and supplier accountant code
 2021-05-03 15:57:46 +02:00
Laurent Destailleur
7b706d6fe5 Fix phpunit for crop of image 2021-05-03 15:56:56 +02:00
Laurent Destailleur
5aa9927784 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 15:37:40 +02:00
Laurent Destailleur
5d870d5802 FIx #17447 2021-05-03 15:36:34 +02:00
Laurent Destailleur
ec544cb20e
Merge pull request #17451 from daraelmin/daraelmin-new-amntbyadhtype 
NEW #17292 default subscription amount by adherent type
 2021-05-03 15:32:39 +02:00
Laurent Destailleur
52035287f3 Rename file 2021-05-03 15:29:06 +02:00
Laurent Destailleur
d7e03c4dca
Merge pull request #17470 from dolibit-ut/patch-317 
Create EORI.info
 2021-05-03 15:28:14 +02:00
Laurent Destailleur
f720f58d8d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-05-03 15:24:39 +02:00
Laurent Destailleur
be8b866b39 Add test to detect bad value for DIRECTION in lang file 2021-05-03 15:24:19 +02:00
Laurent Destailleur
1847180c52
Merge pull request #17449 from mafzalzadeh/develop 
fixed Persian themes direction to rtl
 2021-05-03 15:20:16 +02:00
Laurent Destailleur
0dc2c0050c
Merge pull request #17452 from daraelmin/daraelmin-patch-3 
Fix #17352 card nb overlaps exp date on payment with stripe
 2021-05-03 15:00:53 +02:00