Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-17 15:01:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,477 Commits 36 Branches 190 Tags
026e4548258febf35c66351c8ff7cb1556db84e7
Commit Graph

22973 Commits

Author SHA1 Message Date
Frédéric FRANCE
6fc4b1b839 add small photo in box members 2020-10-27 08:17:12 +01:00
Frédéric FRANCE
da4f3fab14 dol_print_date called with a bad value 2020-10-27 08:10:19 +01:00
Laurent Destailleur
d2a2d74f7e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/product.lib.php
	htdocs/langs/am_ET/mrp.lang
	htdocs/langs/ar_SA/mrp.lang
	htdocs/langs/az_AZ/mrp.lang
	htdocs/langs/bg_BG/mrp.lang
	htdocs/langs/bn_BD/mrp.lang
	htdocs/langs/bn_IN/mrp.lang
	htdocs/langs/bs_BA/mrp.lang
	htdocs/langs/ca_ES/mrp.lang
	htdocs/langs/cs_CZ/mrp.lang
	htdocs/langs/da_DK/mrp.lang
	htdocs/langs/de_DE/mrp.lang
	htdocs/langs/el_GR/mrp.lang
	htdocs/langs/en_US/mrp.lang
	htdocs/langs/es_ES/mrp.lang
	htdocs/langs/et_EE/mrp.lang
	htdocs/langs/eu_ES/mrp.lang
	htdocs/langs/fa_IR/mrp.lang
	htdocs/langs/fi_FI/mrp.lang
	htdocs/langs/fr_FR/mrp.lang
	htdocs/langs/gl_ES/mrp.lang
	htdocs/langs/he_IL/mrp.lang
	htdocs/langs/hi_IN/mrp.lang
	htdocs/langs/hr_HR/mrp.lang
	htdocs/langs/hu_HU/mrp.lang
	htdocs/langs/id_ID/mrp.lang
	htdocs/langs/is_IS/mrp.lang
	htdocs/langs/it_IT/mrp.lang
	htdocs/langs/ja_JP/mrp.lang
	htdocs/langs/ka_GE/mrp.lang
	htdocs/langs/km_KH/mrp.lang
	htdocs/langs/kn_IN/mrp.lang
	htdocs/langs/ko_KR/mrp.lang
	htdocs/langs/lo_LA/mrp.lang
	htdocs/langs/lt_LT/mrp.lang
	htdocs/langs/lv_LV/mrp.lang
	htdocs/langs/mk_MK/mrp.lang
	htdocs/langs/mn_MN/mrp.lang
	htdocs/langs/nb_NO/mrp.lang
	htdocs/langs/ne_NP/mrp.lang
	htdocs/langs/nl_NL/mrp.lang
	htdocs/langs/pl_PL/mrp.lang
	htdocs/langs/pt_PT/mrp.lang
	htdocs/langs/ro_RO/mrp.lang
	htdocs/langs/ru_RU/mrp.lang
	htdocs/langs/sk_SK/mrp.lang
	htdocs/langs/sl_SI/mrp.lang
	htdocs/langs/sq_AL/mrp.lang
	htdocs/langs/sr_RS/mrp.lang
	htdocs/langs/sv_SE/mrp.lang
	htdocs/langs/sw_SW/mrp.lang
	htdocs/langs/th_TH/mrp.lang
	htdocs/langs/tr_TR/mrp.lang
	htdocs/langs/uk_UA/mrp.lang
	htdocs/langs/uz_UZ/mrp.lang
	htdocs/langs/vi_VN/mrp.lang
	htdocs/langs/zh_CN/mrp.lang
	htdocs/langs/zh_HK/mrp.lang
	htdocs/langs/zh_TW/mrp.lang
	htdocs/mrp/class/mo.class.php
	htdocs/mrp/mo_agenda.php
	htdocs/mrp/mo_card.php
	htdocs/mrp/mo_document.php
	htdocs/mrp/mo_movements.php
	htdocs/mrp/mo_note.php
	htdocs/mrp/mo_production.php
 2020-10-27 02:55:22 +01:00
Laurent Destailleur
313273f462 Doc 2020-10-27 02:19:43 +01:00
Laurent Destailleur
96ad9d27fa Merge pull request #15174 from frederic34/patch-8 
clean code interface_99_modZapier_ZapierTriggers.class.php
 2020-10-27 01:25:43 +01:00
Laurent Destailleur
f801bc65c8 Merge pull request #15173 from frederic34/patch-6 
Clean code interface_20_all_Logevents.class.php
 2020-10-27 01:25:16 +01:00
Alfredo Altamirano
214cd2c99b Update references of MO translation string 2020-10-26 15:44:26 -06:00
Frédéric FRANCE
4a0dd3b4bc add small photo in picto link 2020-10-26 22:05:40 +01:00
Frédéric FRANCE
0bdd6abca9 Update interface_99_modZapier_ZapierTriggers.class.php 2020-10-26 20:14:45 +01:00
Frédéric FRANCE
557a0caa91 Update interface_20_all_Logevents.class.php 2020-10-26 20:10:19 +01:00
Laurent Destailleur
2340cb654d Merge pull request #15149 from defrance/patch-160 
Display application Title if filled on login page
 2020-10-26 19:32:42 +01:00
Laurent Destailleur
680f4f9fee Update login.tpl.php 2020-10-26 19:32:21 +01:00
Laurent Destailleur
a8fccc67ba Merge pull request #15148 from frederic34/patch-6 
doxygen
 2020-10-26 19:28:11 +01:00
Laurent Destailleur
c1cd25fb6b Merge pull request #15151 from frederic34/patch-8 
selectTypeContact return void
 2020-10-26 19:27:52 +01:00
Laurent Destailleur
12289ceb9e Merge pull request #15159 from Ahuahuachi/10.0 
FIX #15111 Fix special characters output in PDF
 2020-10-26 19:20:53 +01:00
Laurent Destailleur
130591480a Merge pull request #15171 from frederic34/cleantriggers 
clean triggers
 2020-10-26 18:54:54 +01:00
Frédéric FRANCE
360ea91be5 clean triggers 2020-10-26 18:46:03 +01:00
Frédéric FRANCE
66fbddb892 clean triggers 2020-10-26 18:35:27 +01:00
Frédéric FRANCE
3e686e167c clean triggers 2020-10-26 18:31:45 +01:00
Laurent Destailleur
efce53abd1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/boxes/box_services_contracts.php
	htdocs/expensereport/class/expensereport.class.php
 2020-10-26 18:17:23 +01:00
Laurent Destailleur
2c2142ddba Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-10-26 18:13:47 +01:00
Laurent Destailleur
adeddc70ca FIX Deletion of expensereport + other generated object not complete. 2020-10-26 18:10:58 +01:00
Florian HENRY
3295c4b68f Merge branch 'dev_new_add_desc_when_select_product' of github.com:FHenry/dolibarr into dev_new_add_desc_when_select_product 2020-10-26 16:40:42 +01:00
Florian HENRY
9aa3368627 syntax 2020-10-26 16:33:13 +01:00
stickler-ci
a53e907706 Fixing style errors. 2020-10-26 15:32:00 +00:00
Florian HENRY
76824c868b clean get price for fourn and labal for supplier coducment 2020-10-26 16:31:07 +01:00
quentin
fd1f5bbe01 FIX table making extrafield too small advtagertmailing 2020-10-26 15:03:32 +01:00
quentin
5694a19c6a FIX table making extrafield input too small advtargetmailing 2020-10-26 14:51:13 +01:00
stickler-ci
541dab5737 Fixing style errors. 2020-10-26 13:40:05 +00:00
Marc de Lima Lucio
bb850ad0d0 NEW: ref in product customer price: add ref in PDFs + hidden conf to choose refs to show 2020-10-26 13:05:07 +01:00
Florian HENRY
8c935661ee Merge github.com:Dolibarr/dolibarr into dev_new_add_desc_when_select_product 2020-10-26 10:29:35 +01:00
Alfredo Altamirano
1b82b6af4d FIX #15111 Fix special characters output in PDF 2020-10-25 22:17:02 -06:00
Laurent Destailleur
2638d4596a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/actions_sendmails.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/facture/card.php
 2020-10-25 21:33:13 +01:00
Laurent Destailleur
9dfc08d2bd Fix bad var name 2020-10-25 21:11:05 +01:00
Florian HENRY
7c2b5b614f NEW: preload product description on selection for customer propal/order/invoice 2020-10-25 19:13:09 +01:00
Frédéric FRANCE
f2d21d68d6 selectTypeContact return void 2020-10-25 18:23:00 +01:00
Laurent Destailleur
6c1f60f6c0 Fix regression 2020-10-25 17:19:15 +01:00
Laurent Destailleur
8578a7cd7c Fix regressions 2020-10-25 17:02:25 +01:00
BENKE Charlene
3efcb0dfeb Display application Title if filled on login page 2020-10-25 16:19:16 +01:00
Laurent Destailleur
cd4d738a56 Merge branch 'translateModLivraison2ModDelivery' of 
https://github.com/orebd/dolibarr into develop

# Conflicts:
#	htdocs/install/mysql/migration/12.0.0-13.0.0.sql
 2020-10-25 16:01:18 +01:00
Frédéric FRANCE
1f4bd8476b doxygen 2020-10-25 15:42:15 +01:00
Laurent Destailleur
6fa174d13f Merge pull request #15051 from laudeco/feature/11878_select_bank_account 
11878 - select the only bank account
 2020-10-25 14:56:08 +01:00
Laurent Destailleur
dbf626b92b Update html.form.class.php 2020-10-25 14:55:52 +01:00
Laurent Destailleur
e7743948cb Merge pull request #15120 from frederic34/patch-6 
Update commonobject.class.php
 2020-10-25 14:50:56 +01:00
Laurent Destailleur
b80d135fcb Merge pull request #15119 from FHenry/12.0_fix_mailerrormessage 
fix mail error message
 2020-10-25 14:50:23 +01:00
Laurent Destailleur
4d9c8e2225 Merge pull request #15124 from frederic34/retrieve 
retrieve the spelling
 2020-10-25 14:48:51 +01:00
Laurent Destailleur
cc17f08409 Merge pull request #15131 from frederic34/patch-13 
doxygen
 2020-10-25 14:45:24 +01:00
Laurent Destailleur
f31b4ee49d Merge pull request #15127 from frederic34/task_universal 
fix unknown property db
 2020-10-25 14:35:03 +01:00
Laurent Destailleur
c6cee2f96f Merge pull request #15128 from frederic34/patch-11 
doxygen
 2020-10-25 14:34:15 +01:00
Laurent Destailleur
180d01e76e Merge pull request #15132 from frederic34/patch-14 
doxygen
 2020-10-25 14:34:04 +01:00