Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
78,589 Commits 36 Branches 190 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

17660 Commits

Author SHA1 Message Date
Laurent Destailleur
84714f39e2 Fix setup of terminal 2019-05-09 13:37:20 +02:00
Laurent Destailleur
52153d6aa2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-09 12:38:27 +02:00
Laurent Destailleur
677b333d0a FIX: Add hidden option MAIN_PDF_HIDE_SITUATION to hide situation (quick 
hack to fix output pb).
 2019-05-09 12:38:00 +02:00
Laurent Destailleur
6e69db8a1a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/expensereport/doc/pdf_standard.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/product/doc/pdf_standard.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
	htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php
	htdocs/filefunc.inc.php
 2019-05-09 12:27:14 +02:00
Laurent Destailleur
f1fd4108ae Debug/Clean code 2019-05-09 12:17:20 +02:00
Laurent Destailleur
d3bbb93ada Fix template for situation 
Conflicts:
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
 2019-05-09 12:16:43 +02:00
atm-arnaud
4c90ba1a64 FIX attached files list with link file was broked 2019-05-09 12:11:18 +02:00
Laurent Destailleur
725de78d29 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-09 10:16:01 +02:00
Laurent Destailleur
ed98817f0d Fix template for situation 2019-05-09 10:15:38 +02:00
Laurent Destailleur
e5b613562a Merge pull request #11148 from andreubisquerra/master 
TakePOS Terminals
 2019-05-09 09:18:41 +02:00
Laurent Destailleur
c2abedeb24 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 9.0 2019-05-08 21:43:57 +02:00
Laurent Destailleur
74875690a0 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/core/tpl/massactions_pre.tpl.php
 2019-05-08 19:14:31 +02:00
Laurent Destailleur
96c021773e Update takepos.lib.php 2019-05-08 19:11:17 +02:00
Laurent Destailleur
c3693cb007 Fix phpcs 2019-05-08 19:10:12 +02:00
Laurent Destailleur
f6de2d091d FIX Sending email to mass actions send same email on same customer 2019-05-08 19:07:12 +02:00
andreubisquerra
84cfa00bf1 Terminals 2019-05-08 18:29:00 +02:00
Laurent Destailleur
590b1d1e90 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
 2019-05-08 18:24:50 +02:00
Laurent Destailleur
f2e24ed96e Fix bad contact used 2019-05-08 18:20:28 +02:00
Laurent Destailleur
3a3b04f31b Fix showdocument for external modules 2019-05-08 17:31:50 +02:00
Laurent Destailleur
8812b95ce0 Merge pull request #11144 from aspangaro/develop 
Fix Eldy menu
 2019-05-08 02:09:35 +02:00
Laurent Destailleur
eb9b9e44d8 Merge pull request #11137 from OPEN-DSI/fix-card-presend-shipment 
Fix contact address substitution before sending by mail in shipment card
 2019-05-08 02:06:36 +02:00
Laurent Destailleur
b58a73cfaf Merge pull request #11139 from code-chicken/patch-1 
FIX Add support for units
 2019-05-08 02:02:22 +02:00
Laurent Destailleur
2ee72e2fdf Update html.form.class.php 2019-05-08 02:02:07 +02:00
Laurent Destailleur
1e036f3513 Correct support for type price on module builder 
Fix link of ref in cash fence list
 2019-05-08 01:09:38 +02:00
Laurent Destailleur
dc1ee29fef Fix default permission of new users 2019-05-07 23:03:45 +02:00
gauthier
f661b926fa FIX : use dol_sanitizeFileName() function to remove double spaces in filenames, as well as done on document.php when we want to download pdf 
Example : if you upload a file like "my  file.pdf" (with 2 spaces), it's impossible to download it after. then we have to remove at least 1 space
 2019-05-07 14:33:17 +02:00
Alexandre SPANGARO
a386f0e9ea Fix Eldy menu 2019-05-07 09:18:27 +02:00
Laurent Destailleur
c4798c34b0 Fix autocompletion of product on stock correction 2019-05-07 00:26:31 +02:00
Rüdiger Hahn
4008e26328 Add support for units 
Fetch units from db when they've been enabled in configuration
 2019-05-06 13:12:41 +02:00
Lionel VESSILLER
8bb4b3f339 Fix contact address substitution before sending by mail in shipment card 2019-05-06 11:12:56 +02:00
Laurent Léonard
8d659d8078 Fix date format in customer orders documents 2019-05-04 07:12:13 +02:00
Laurent Destailleur
9115df7439 Debug v10 2019-05-03 11:25:53 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
 2019-05-02 17:40:41 +02:00
Laurent Destailleur
8d7f24a6d9 FIX Default value on form to send email 2019-05-02 15:34:29 +02:00
Laurent Destailleur
4f9ea912ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/website.inc.php
 2019-05-02 14:41:56 +02:00
Laurent Destailleur
1378d5e89b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-05-02 14:03:47 +02:00
Laurent Destailleur
263b6cafbc Fix var 2019-05-02 14:03:35 +02:00
Laurent Destailleur
8c76c404bd Merge pull request #11088 from defrance/patch-141 
planned_timespent not present on task
 2019-05-02 14:01:19 +02:00
Laurent Destailleur
e81f10c790 Debug hidden option MAIN_MULTICURRENCY_ALLOW_SYNCHRONIZATION 2019-05-02 13:45:49 +02:00
Laurent Destailleur
425dd6faf7 Merge branch 'develop' into patch-2 2019-05-02 12:38:38 +02:00
Laurent Destailleur
86f5889a72 Merge pull request #11078 from Supermanu/help_extrafields 
Show help text for extrafields in forms
 2019-05-02 12:36:15 +02:00
Laurent Destailleur
ceeb9752ce Fix PHPCS 2019-05-02 12:28:40 +02:00
Laurent Destailleur
0f8c7df6fe Debug api of module BOM 2019-05-02 12:19:43 +02:00
Laurent Destailleur
90a1181dc5 Debug module Ticket 2019-05-01 20:41:03 +02:00
Laurent Destailleur
9955af5194 Debug ticket module 2019-05-01 17:53:41 +02:00
Laurent Destailleur
a75c6a81d1 FIX Follow rule to create a new page 2019-05-01 17:15:42 +02:00
Frédéric FRANCE
ac304f58b0 clean new commits 2019-04-30 20:37:59 +02:00
Frédéric FRANCE
5766bb0b8a Merge remote-tracking branch 'upstream/develop' into patch-2 2019-04-30 20:16:43 +02:00
Laurent Destailleur
61bf731d17 FIX Balance of td 2019-04-30 18:11:35 +02:00