Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
57,427 Commits 37 Branches 191 Tags
6bfd534a36ebc274f2b0d2ee520c8571bdfd1068
Commit Graph

57427 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
6bfd534a36 NEW PHP 7.1 compatibility 2017-01-16 01:21:33 +01:00
Laurent Destailleur
9d72f1df62 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 01:12:11 +01:00
Laurent Destailleur
a07a77e323 Not yet ready for php 7.1 2017-01-16 01:11:38 +01:00
Laurent Destailleur
94a180a775 Fix POO best practice 2017-01-16 00:54:08 +01:00
Laurent Destailleur
9c1895a03a Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:49:19 +01:00
Laurent Destailleur
846e827e09 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:49:11 +01:00
Laurent Destailleur
f5458b4337 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/admin/modules.php
	htdocs/core/class/html.formfile.class.php
	htdocs/product/stats/card.php
 2017-01-16 00:48:37 +01:00
Laurent Destailleur
9f17e56923 Merge pull request #6279 from hregis/4.0_bug3 
Fix: search problem if name contains accents
 2017-01-16 00:44:56 +01:00
Laurent Destailleur
25958c241b Merge pull request #6278 from hregis/4.0_bug2 
Fix: avoid foreach error
 2017-01-16 00:43:41 +01:00
Laurent Destailleur
0bac99028e Merge pull request #6276 from aljawaid/develop 
Fix: Add Missing Translation String
 2017-01-16 00:43:00 +01:00
Laurent Destailleur
ed6e3fe8a0 Merge pull request #6275 from hregis/4.0_bug 
Fix: preview image not show with multicompany product sharing
 2017-01-16 00:41:15 +01:00
Laurent Destailleur
6903acfe1c Include php 7.1 in tests 2017-01-16 00:22:12 +01:00
Laurent Destailleur
d95ac3bbdd Fix warning 2017-01-16 00:16:20 +01:00
Laurent Destailleur
4ecd657f34 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-16 00:02:43 +01:00
Laurent Destailleur
0671f75417 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-16 00:01:37 +01:00
Laurent Destailleur
0fe844aa00 FIX usage of tag {y} in numbering modules 2017-01-16 00:01:06 +01:00
Laurent Destailleur
7bccaff28a Fix remove warnings 2017-01-15 23:32:14 +01:00
Laurent Destailleur
54a974cb5c Fix position of dropdown tooltip 2017-01-15 21:03:44 +01:00
Laurent Destailleur
d14e4dbaba Fix pagination when MAIN_DISABLE_FULL_SCANLIST is on 2017-01-15 20:49:20 +01:00
Regis Houssin
f9ed1592e1 Fix: search problem if name contains accents 2017-01-15 16:07:04 +01:00
Regis Houssin
c3997194b2 Fix: avoid foreach error 2017-01-15 15:17:32 +01:00
Regis Houssin
fd4a19855d Fix: preview image not show with multicompany product sharing 2017-01-15 12:09:26 +01:00
IJ
79714f7ede Merge pull request #2 from aljawaid/aljawaid-patch-4 
Fix: Add Missing Translation String
 2017-01-15 11:06:51 +00:00
IJ
d5120ae7cc Fix: Add Missing Translation String 
When product batch module is disabled, the translation string is missing for dispatch line.
 2017-01-15 11:04:32 +00:00
Laurent Destailleur
1fd9f5e1fb Fix: host was twice into message id for smtp driver and swiftmailer was 
not using dol_getprefix() to build host.
 2017-01-14 13:27:44 +01:00
Laurent Destailleur
6aa26e0f62 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/compta/paiement.php
	htdocs/product/stock/massstockmove.php
	htdocs/projet/info.php
	htdocs/projet/tasks/time.php
	htdocs/societe/class/societe.class.php
 2017-01-13 16:49:18 +01:00
Laurent Destailleur
29f07d3e89 The tutorial to add cron is sometimes false. Quick hack for a solution 
to hide it.
 2017-01-13 16:39:35 +01:00
Laurent Destailleur
31818e8816 Fix missing translation 2017-01-13 15:32:20 +01:00
Laurent Destailleur
3a2f44adac Fix security permissions to edit/delete time spent 2017-01-13 14:24:39 +01:00
Laurent Destailleur
380b61a0e9 FIX Can make a stock transfert on product not on sale/purchase. 2017-01-12 21:56:50 +01:00
Laurent Destailleur
c3e5e0dd3f Update doc 2017-01-12 21:50:35 +01:00
Laurent Destailleur
edb79de54e FIX javascript error 2017-01-12 18:07:19 +01:00
Laurent Destailleur
32a453e8e6 Fix label combo 2017-01-12 15:44:20 +01:00
Laurent Destailleur
f185a09693 FIX Security access problem with external users on projects/tasks 2017-01-12 15:26:00 +01:00
Laurent Destailleur
8d5c853267 FIX Protection so even if link is output for external user, links is 
disabled.
 2017-01-12 15:12:53 +01:00
Laurent Destailleur
13787881d4 Fix css 2017-01-12 11:46:13 +01:00
Laurent Destailleur
4349eac7ea Merge pull request #6225 from aspangaro/5.0-18 
Expense report - Better presentation - return lines order by date
 2017-01-12 11:37:31 +01:00
Laurent Destailleur
9671810d13 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-01-12 11:33:25 +01:00
Laurent Destailleur
2c6672d17a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/login.tpl.php
 2017-01-12 11:32:51 +01:00
Laurent Destailleur
b28ba7a5ff Merge pull request #6252 from gnovaro/develop 
Improve cashdesk code style. Ticket now have ticket.css file
 2017-01-12 11:31:51 +01:00
Laurent Destailleur
32a3f74ea1 Merge pull request #6108 from defrance/patch-51 
NEW Can send contract by mail from contract card
 2017-01-12 11:26:44 +01:00
Laurent Destailleur
4d134a4a4e Merge pull request #6085 from defrance/patch-49 
NEW Extend option PDF_HIDE_PRODUCT_REF_IN_SUPPLIER_LINES to change supplier ref display mode in PDF
 2017-01-12 11:19:54 +01:00
Laurent Destailleur
25dcb10c1d Merge pull request #6066 from atm-florian/dev_exportthirdparty 
NEW : Can export thirdparty with sale representative that is a subordinate (Need hidden option SOCIETE_EXPORT_SUBORDINATES_CHILDS)
 2017-01-12 11:17:15 +01:00
Laurent Destailleur
0548e9cc4e Merge pull request #6226 from aspangaro/5.0-19 
NEW Expense report now send email on different validatin steps (Remove DEPLACEMENT_TO_CLEAN)
 2017-01-12 11:15:14 +01:00
Laurent Destailleur
e82aa97d0e Merge pull request #6266 from simnandez/4.0 
FIX #6245 Thirdparty link in supplier invoices list, links to "comm/card" instead of "fourn/card" page
 2017-01-12 11:13:14 +01:00
Laurent Destailleur
64b932f78c Merge pull request #6261 from GPCsolutions/travis-php7.1 
[Qual] Add PHP 7.1 to Travis test matrix
 2017-01-12 11:12:25 +01:00
Laurent Destailleur
c42b48636a Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/commande/class/api_commande.class.php
	htdocs/core/class/CMailFile.class.php
	htdocs/societe/class/api_contact.class.php
 2017-01-12 11:06:24 +01:00
Laurent Destailleur
762dd8030e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-01-12 10:59:41 +01:00
Laurent Destailleur
7476a3c8ae Fix error during migration 2017-01-12 10:59:27 +01:00
Laurent Destailleur
e802ff3385 Fix POO declaration 2017-01-12 10:57:15 +01:00