Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-19 07:51:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
58,497 Commits 36 Branches 190 Tags
95fbe0147d35196abe72b7776f753896e460ceb1
Commit Graph

11089 Commits

Author SHA1 Message Date
Laurent Destailleur
8c2b70c4a7 Fix filechecker 2017-03-25 20:51:02 +01:00
Laurent Destailleur
292bcae592 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-25 00:05:04 +01:00
Laurent Destailleur
6b33a755ba Add more log on tableDnD 2017-03-24 23:52:06 +01:00
Laurent Destailleur
278bbf184c Merge pull request #6546 from aspangaro/6.0-new_bank_direct_input 
New : Add Various payment submodule linked to the accountancy to replace free input in bank
 2017-03-24 22:52:39 +01:00
Laurent Destailleur
df17de9d48 Merge pull request #6543 from laudeco/feature/expenseNoteFusionPdf 
add 'fusion pdf' in mass action of expense report
 2017-03-24 22:50:54 +01:00
Laurent Destailleur
d1a988a0be Fix document_preview is possible on files with + chars inside. 2017-03-24 17:32:38 +01:00
Laurent Destailleur
38660418b4 Include preview of pdf into dol_banner 2017-03-23 22:27:44 +01:00
Laurent Destailleur
664380d304 Css enhancement 2017-03-23 21:24:57 +01:00
Laurent Destailleur
f241bfefd0 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 20:20:59 +01:00
Laurent Destailleur
be0d5bee78 Fix phpcs 2017-03-23 20:07:46 +01:00
Laurent Destailleur
eb145faffd Replace parameter mixte with textselect 2017-03-23 19:57:45 +01:00
Laurent Destailleur
d1c29bf698 Merge pull request #6552 from defrance/patch-91 
NEW : introducing "mixte" mode for select_duration
 2017-03-23 19:54:33 +01:00
Laurent Destailleur
3cc312d485 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/main.lang
 2017-03-23 19:48:34 +01:00
Laurent Destailleur
3adb43c6e5 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/boxes/box_produits.php
	htdocs/core/boxes/box_produits_alerte_stock.php
	htdocs/langs/en_US/bills.lang
	htdocs/product/class/product.class.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
 2017-03-23 12:52:19 +01:00
Laurent Destailleur
7df9c25e60 Several fixes on multicurrency 2017-03-23 12:44:20 +01:00
Laurent Destailleur
fec3a89aa5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-23 11:38:46 +01:00
Laurent Destailleur
996cb9d3f1 NEW Add function ajax_autoselect 2017-03-23 11:16:30 +01:00
Laurent Destailleur
0a35d17207 CSS enhancement 2017-03-23 10:59:13 +01:00
BENKE Charlie
7999cb9a46 introducing "mixte" mode for select_duration 
If 'select' then input hour and input min is a combo,
if 'text' input hour is in text and input min is a text, 
if 'mixte' input hour is in text and input min is a combo
 2017-03-21 23:48:06 +01:00
Laurent Destailleur
ee8112dde7 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/projet/class/project.class.php
 2017-03-21 19:20:14 +01:00
Laurent Destailleur
acdfd6ab9e css enhancement 2017-03-21 18:23:58 +01:00
Laurent Destailleur
e7a45a7f6a NEW Use html5 type "number" on select field for year and duration. 2017-03-21 17:50:43 +01:00
Laurent Destailleur
1e63b98731 Fix responsive 2017-03-21 17:06:27 +01:00
Laurent Destailleur
a0fe79a113 Fix duplicate include. 2017-03-21 16:46:12 +01:00
Laurent Destailleur
b5e646daa0 NEW Show by default README.md file found into root dir of ext module. 2017-03-21 16:43:09 +01:00
Laurent Destailleur
a5c11dc840 NEW Add function dolMd2Html 2017-03-21 16:03:13 +01:00
Laurent Destailleur
e2e76b40da FIX list of projects 
Conflicts:
	htdocs/core/boxes/box_project.php
 2017-03-21 13:43:48 +01:00
Laurent Destailleur
36630b9404 FIX Picto of project on dol_banner and box 
Conflicts:
	htdocs/core/boxes/box_project.php
 2017-03-21 13:43:05 +01:00
Laurent Destailleur
68257283e4 Enhance select list 2017-03-21 13:39:42 +01:00
Laurent Destailleur
aa71710a74 FIX list of projects 2017-03-21 13:38:00 +01:00
Laurent Destailleur
0e997c973f FIX Picto of project on dol_banner and box 2017-03-21 13:13:00 +01:00
Laurent Destailleur
1b0b4c9609 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-20 23:53:47 +01:00
Laurent Destailleur
b9a9997688 Page societe/soc.php and compta/facture.php was renamed into card.php 
to match page naming conventions.
 2017-03-20 21:29:22 +01:00
Laurent Destailleur
47e325cc66 NEW Can set the default value of any field on any create page with 
option MAIN_DEFAULT_FOR_path-to-file_fieldname
 2017-03-20 20:35:24 +01:00
Laurent Destailleur
ac19aba07e FIX multicurrency management on supplier order/invoice 
Conflicts:
	htdocs/core/modules/supplier_payment/pdf/pdf_cow.modules.php
 2017-03-19 15:41:55 +01:00
Laurent Destailleur
e85206dee5 FIX multicurrency management on supplier order/invoice 2017-03-19 15:37:07 +01:00
Laurent Destailleur
b169f93abc Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-03-19 14:27:12 +01:00
Laurent Destailleur
4831fb4dcb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/class/adherent.class.php
	htdocs/filefunc.inc.php
 2017-03-19 11:26:49 +01:00
Alexandre SPANGARO
36f279837f Update work 2017-03-19 08:17:32 +01:00
Laurent Destailleur
b9d6122c53 Add comments 2017-03-18 19:56:53 +01:00
De Coninck Laurent
a05ebb6c65 add 'fusion pdf' in mass action of expense report 
Add a mass action 'fusion pdf (build doc)' in expense report list
 2017-03-18 11:51:45 +01:00
Laurent Destailleur
f7e71d1de2 FIX LOG_ERROR does not exists. Use LOG_ERR. 2017-03-18 11:48:02 +01:00
Laurent Destailleur
f0dddae6d1 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-03-18 11:38:32 +01:00
Laurent Destailleur
597fb11d08 Fix error management in duplicate trigger 2017-03-18 11:36:48 +01:00
Alexandre SPANGARO
16b12b33fc First step : remove BANK_DISABLE_DIRECT_INPUT 2017-03-18 07:24:55 +01:00
De Coninck Laurent
8c65c47b1f fix the from e-mail on mass action 
In mass action e-mail (like on facture), the from e-mail was not taken into account.
 2017-03-17 17:55:25 +01:00
Laurent Destailleur
7dd0f14563 Fix link to reconciliated function 2017-03-16 21:03:35 +01:00
Laurent Destailleur
68d3a93027 Fix link to reconcile 2017-03-16 20:36:51 +01:00
Laurent Destailleur
35b79818b7 Uniformize css rules 2017-03-16 20:33:51 +01:00
Laurent Destailleur
dba6d99686 Minor look enhancement 2017-03-16 17:02:30 +01:00