Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-20 08:21:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,221 Commits 36 Branches 190 Tags
0a057c8277b26e2429b51f9f2c54e81a0445fd6c
Commit Graph

71221 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John BOTELLA
a380d3e89b Fix missing group by in query 2018-10-24 09:21:30 +02:00
Frédéric FRANCE
2bc208675f Update pdf_cyan.modules.php 2018-10-24 09:06:54 +02:00
Frédéric FRANCE
d9d346aab2 Update pdf_sponge.modules.php 2018-10-24 08:22:17 +02:00
Frédéric FRANCE
4747e93e39 Update pdf_eratosthene.modules.php 2018-10-24 08:18:21 +02:00
Frédéric FRANCE
2a6478a2c4 fix phpcs 2018-10-24 08:15:00 +02:00
Laurent Destailleur
eaab953ba2 Renamed mouvement.php into movement_list.php to follow dev rules 2018-10-24 03:50:18 +02:00
Laurent Destailleur
65a39269d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
 2018-10-24 03:39:33 +02:00
Laurent Destailleur
047d130081 Fix phpcs 2018-10-24 03:38:12 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
 2018-10-24 03:35:44 +02:00
Laurent Destailleur
f0dc2df526 Fix code comment 2018-10-24 03:30:06 +02:00
Laurent Destailleur
2794439da5 Merge pull request #9839 from oas-services/7.0 
NEW Compatibility with new Paybox HMAC requirement
 2018-10-24 03:27:12 +02:00
Laurent Destailleur
1d80e16ad1 Merge pull request #9831 from frederic34/payment 
payments
 2018-10-24 03:25:01 +02:00
Laurent Destailleur
5c72a7630e Merge pull request #9833 from IAS-SYSTEMS-CSC/develop 
Fix : missing semicolon
 2018-10-24 03:24:09 +02:00
Laurent Destailleur
094625f27c Merge pull request #9821 from frederic34/fixpdf 
fix new pdf
 2018-10-24 03:02:28 +02:00
Laurent Destailleur
0f48cc1d0f Merge branch 'develop' into fixpdf 2018-10-24 03:01:52 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
 2018-10-24 02:58:29 +02:00
Laurent Destailleur
ff7640bb3a Merge branch 'aspangaro-9.0_accountancy' into develop 2018-10-24 02:55:06 +02:00
Laurent Destailleur
612e3a9805 Merge branch '9.0_accountancy' of https://github.com/aspangaro/dolibarr 
into aspangaro-9.0_accountancy

# Conflicts:
#	htdocs/accountancy/bookkeeping/thirdparty_lettering_customer.php
#	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
#	htdocs/accountancy/class/lettering.class.php
 2018-10-24 02:54:57 +02:00
Laurent Destailleur
bd994cbead Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-10-24 02:50:12 +02:00
Laurent Destailleur
769bae75e9 Update list.php 2018-10-24 02:48:38 +02:00
Laurent Destailleur
a9736c1eef Merge pull request #9828 from frederic34/patch-15 
code comment
 2018-10-24 02:44:46 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/theme/md/style.css.php
 2018-10-24 02:40:57 +02:00
Laurent Destailleur
a3d6146bed Code comment 2018-10-24 02:32:01 +02:00
Laurent Destailleur
c266084db7 Merge pull request #9841 from laudeco/fix/9824_pdf_merge 
FIX the pdf merge
 2018-10-24 02:31:48 +02:00
Laurent Destailleur
4060dd5377 Merge pull request #9826 from frederic34/patch-9 
Update ajax.lib.php
 2018-10-24 02:29:20 +02:00
Laurent Destailleur
52364f0fd9 Merge pull request #9834 from frederic34/patch-19 
missing semicolon in MD style css
 2018-10-24 02:29:02 +02:00
Laurent Destailleur
2ba6f96765 Update style.css.php 2018-10-24 02:27:59 +02:00
Laurent Destailleur
5a7f2c7e33 Merge pull request #9832 from frederic34/patch-18 
fix phpunit
 2018-10-24 02:26:12 +02:00
Laurent Destailleur
92b5346a6c Merge pull request #9840 from frederic34/patch-21 
code comment categories class
 2018-10-24 02:25:23 +02:00
Laurent Destailleur
6c3e1f6d26 Merge pull request #9842 from fappels/8.0 
Deprecate class property expeditionbatch before removing it.
 2018-10-24 02:25:02 +02:00
Laurent Destailleur
e39e57c5b9 Update expeditionbatch.class.php 2018-10-24 02:24:47 +02:00
Laurent Destailleur
ddd267f4c3 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-10-24 02:21:53 +02:00
Laurent Destailleur
4b4d422126 Merge pull request #9835 from frederic34/patch-20 
Update ajaxdirtree.php
 2018-10-24 02:21:19 +02:00
Laurent Destailleur
065d715d41 FIX #9837 - The fetchAllXXX was not managing correctly the limit 2018-10-24 02:20:07 +02:00
Laurent Destailleur
acaaf53085 Merge pull request #9843 from ATM-Nicolas/fix_variable 
FIX : Variable name
 2018-10-24 02:07:11 +02:00
Laurent Destailleur
83dacf6290 Merge pull request #9845 from frederic34/patch-22 
remove deprecated form_confirm
 2018-10-24 02:06:54 +02:00
Laurent Destailleur
f10cb76597 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-24 02:00:56 +02:00
Laurent Destailleur
ae44c4c7f5 Disable duplicate feature with emailing module and field "unsubscribe 
requested"
 2018-10-24 02:00:43 +02:00
Laurent Destailleur
03b93781a0 Merge pull request #9848 from bafbes/abb80038 
New : parameter for getnomurl in field specification
 2018-10-24 01:53:19 +02:00
Laurent Destailleur
d5285ca359 Update commonobject.class.php 2018-10-24 01:53:07 +02:00
Laurent Destailleur
f8ea9e7099 Merge pull request #9857 from atm-john/add_combo_seach_by_fourn_ref 
NEW hidden conf to search product by supplier ref
 2018-10-24 01:48:17 +02:00
Laurent Destailleur
6161d8300c Merge pull request #9850 from simnandez/develop 
New: works with variants:
 2018-10-24 01:47:39 +02:00
Laurent Destailleur
914e4f0501 Merge pull request #9855 from atm-john/Fix_printer 
FIX/ADD missing print button for delivery form
 2018-10-24 01:46:20 +02:00
Laurent Destailleur
c6cfb977bb Merge pull request #9852 from atm-john/fix_develop_travis 
Fix travis messages
 2018-10-24 01:45:12 +02:00
Laurent Destailleur
54b0fa1057 Merge pull request #9846 from bafbes/abb80037 
Fix:empty value instead of 0 for empty links
 2018-10-24 01:43:37 +02:00
Laurent Destailleur
592bfafd51 Merge pull request #9829 from frederic34/patch-16 
code comment
 2018-10-24 01:42:41 +02:00
Laurent Destailleur
652bef3e61 Merge pull request #9830 from frederic34/patch-17 
change class name from lettering to Lettering
 2018-10-24 01:42:22 +02:00
Laurent Destailleur
fe665a060d Merge branch 'develop' into patch-17 2018-10-24 01:42:02 +02:00
Laurent Destailleur
23a9416c19 Fix deprecated field 2018-10-23 23:51:27 +02:00
atm-john
82f40fb4b9 NEW hidden conf to search by supplier ref 2018-10-23 23:21:30 +02:00