lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
94,025 Commits 43 Branches 150 Tags 886 MiB
04a55a3df3
Commit Graph

22769 Commits

Author SHA1 Message Date
Günter Lukas
04a55a3df3 Fix #17146 2021-04-07 09:08:34 +02:00
Indelog
4d60fe8ff9 Fix empty $sublang dolSavePageAlias 
Avoid to loop on `explode(',', $object->otherlang)` if
`$object->otherlang` is empty. Else we loop once on empty string which
is set in `$sublang` and erase the main alias for the page.
 2021-04-06 22:21:00 +02:00
Laurent Destailleur
5d7efcc0d1
Merge pull request #17063 from aspangaro/13p31 
FIX: Periodicity by default on fiscal year, according to the now date, we have plus 1 year added
 2021-04-02 01:53:24 +02:00
Florian Mortgat
f5617a6247 FIX 13.0 warning - missing quotes around 'label' 2021-04-01 12:33:23 +02:00
Alexandre SPANGARO
b5702fcb13 Merge branch '13.0' into 13p31 2021-04-01 04:38:08 +02:00
Alexandre SPANGARO
530b122f1e FIX: Periodicity by default on fiscal year, according to the date, we have plus 1 year added 2021-04-01 04:37:47 +02:00
Laurent Destailleur
89dbd745bf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/modules/modAccounting.class.php
 2021-03-31 13:53:36 +02:00
Laurent Destailleur
1880cb92a4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-31 13:47:00 +02:00
Ferran Marcet
b6faa6b605 FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-31 09:40:12 +02:00
Alexandre SPANGARO
14a62442c4 FIX: Accountancy - Import in general ledger 2021-03-31 05:07:05 +02:00
Ferran Marcet
b4f638602a FIX: Show Ref.Supplier in LinkToObjectBlock 2021-03-30 11:10:07 +02:00
Laurent Destailleur
2689bc938d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-29 21:40:01 +02:00
Laurent Destailleur
f4ae8af9ea Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/accountancy/bookkeeping/listbyaccount.php
	htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
 2021-03-29 21:39:53 +02:00
Laurent Destailleur
6057d8aabd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2021-03-29 21:37:21 +02:00
ksar
ccd6d28f6f
FIX #16843 
https://fontawesome.com/how-to-use/on-the-web/setup/upgrading-from-version-4

fa-mail-forward => fa-share
 2021-03-25 14:39:42 +01:00
Laurent Destailleur
a4aa806e44
Merge pull request #16933 from daraelmin/daraelmin-patch-2 
Fix #16794 V13 order by status instead of statut
 2021-03-25 08:31:44 +01:00
Laurent Destailleur
21a9779fe2 FIX inconsistency in margin recording with option "Force to sale price" 2021-03-24 21:49:45 +01:00
ATM john
4f693b86c2 shhhhhh ! There is nothing here... 2021-03-23 19:27:40 +01:00
Laurent Destailleur
af593099df Clean string 2021-03-22 23:52:14 +01:00
daraelmin
6ba878725e
Fix #16794 V13 order by status instead of statut 2021-03-22 07:28:16 +01:00
Laurent Destailleur
861a5becf1
Merge pull request #16884 from daraelmin/daraelmin-patch-3 
#Fix #16767 v13 unremovable attached file in mailmodel
 2021-03-20 19:51:07 +01:00
daraelmin
2d7f858c1a
#Fix #16767 unremovable attached file in mailmodel 
#Fix #16767 unremovable attached file in mailmodel
 2021-03-20 14:04:20 +01:00
Florian HENRY
df4a243f18 fix: PRODUIT_PDF_MERGE_PROPAL options do not work with new product feature 2021-03-18 17:13:34 +01:00
Laurent Destailleur
f514dec6ab Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/compta/paiement_charge.php
	htdocs/compta/sociales/card.php
 2021-03-16 14:50:06 +01:00
Frédéric FRANCE
7a2e28497d
fix number is already used doesn't propose new code with elephant 2021-03-12 13:14:53 +01:00
Regis Houssin
5375add08c FIX just add mp4 2021-03-12 08:41:56 +01:00
Regis Houssin
290f49a3e0 FIX wrong extension 2021-03-12 08:39:36 +01:00
Regis Houssin
05532ca6b7 FIX missing video mime 2021-03-12 08:35:13 +01:00
Laurent Destailleur
680f6257a0 FIX warning if setup of chart of account is not yet done. 2021-03-10 11:04:28 +01:00
Laurent Destailleur
9cb4dce485 Fix option MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT_COLUMN missing 2021-03-09 16:12:30 +01:00
Laurent Destailleur
2f0c4038fb Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/action/class/api_agendaevents.class.php
	htdocs/compta/sociales/card.php
	htdocs/societe/consumption.php
 2021-03-08 19:27:34 +01:00
ksar
ec8baa6bff Update commondocgenerator.class.php 
#16341
 2021-03-08 10:00:19 +01:00
Laurent Destailleur
e5d8267786
Merge pull request #16546 from FHenry/12.0 
fix: set class attribute at right place
 2021-03-06 11:18:02 +01:00
Laurent Destailleur
98c7814fa3 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:37 +01:00
Laurent Destailleur
6aa929cbf8 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-03-05 18:28:15 +01:00
Laurent Destailleur
1cd822bd75 Fix DOS attack on emailings wrappers 2021-03-05 14:54:17 +01:00
Florian HENRY
6de6782458 fix: set class at right place 2021-03-05 08:41:04 +01:00
Laurent Destailleur
eda0b4dc37
Merge pull request #16531 from FHenry/12.0 
avoid warning into modulebuilder
 2021-03-04 16:52:47 +01:00
Laurent Destailleur
dcff298c5f FIX #16533 2021-03-04 15:57:03 +01:00
Laurent Destailleur
98eb0fc969 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-04 15:34:44 +01:00
Laurent Destailleur
ffa0e6c391 FIX Timezone management for datetime on list of events 2021-03-04 15:34:29 +01:00
atm-greg
c41b59b14c Fix : when we have got models in database attached files are cleared even if we did not have selected a model 2021-03-04 14:23:08 +01:00
Juanjo Menent
a04a4806e0 Fix: lost selecteds items in ticket creation 2021-03-04 11:50:46 +01:00
Laurent Destailleur
7bc2e1ffad FIX Timezone management for datetime with modulebuilder and extrafields 2021-03-04 10:31:31 +01:00
Florian HENRY
bf775855f6 avoid warning into modulebuilder 2021-03-04 10:28:41 +01:00
Laurent Destailleur
5553bae3a1 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:44:01 +01:00
Laurent Destailleur
33c4180781 FIX Timezone management for datetime with modulebuilder 2021-03-04 09:36:19 +01:00
Laurent Destailleur
aa1551bf1f FIX class not found when creating recuring invoice from invoice+discount 2021-03-03 22:46:25 +01:00
Laurent Destailleur
da8b67da83 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-03-03 12:07:42 +01:00
Laurent Destailleur
093eab188e Code comment 2021-03-03 12:02:57 +01:00