Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

519 Commits

Author SHA1 Message Date
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
738526e77e Fix br 2019-12-10 14:04:50 +01:00
Laurent Destailleur
fe44d3a4fa FIX #12674 2019-12-10 14:02:03 +01:00
Laurent Destailleur
2d97c0bb79 Try better fix for #12674 2019-12-10 13:55:45 +01:00
Laurent Destailleur
790fdc881c # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Maxime Kohlhaas
3c639772d9 Fix #11228 : VAT dates regarding fiscal year 2019-11-30 17:16:16 +01:00
Scrutinizer Auto-Fixer
df664e790b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-11 23:15:34 +00:00
Laurent Destailleur
cd5c359b83 Fix regression 2019-11-07 12:53:26 +01:00
Laurent Destailleur
4c44f3c109 Merge pull request #12366 from aspangaro/11.0_a3 
NEW VAT list - Add date start & date end
 2019-11-07 11:53:16 +01:00
Alexandre SPANGARO
fd45eeab83 NEW VAT list - Add date start & date end 2019-11-07 08:34:06 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
5a4960f7ae Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
	htdocs/takepos/takepos.php
 2019-10-20 15:30:28 +02:00
Laurent Destailleur
78ac543dee Fix link to list 2019-10-18 20:01:47 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
24570f7165 Look and feel v11. Picto are fontawesome. 2019-10-02 18:14:41 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
6966651d51 Standardize code to use dolSqlDateFilter 2019-09-28 13:22:05 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
 2019-09-27 14:11:14 +02:00
Alexandre SPANGARO
b52e5d51e3 FIX colspan on VAT quadri report 2019-09-26 22:01:59 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
e32772fdc5 Translate 2019-09-20 09:44:49 +02:00
Laurent Destailleur
56a99f6e6d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-12 11:22:13 +02:00
Laurent Destailleur
3f3282400a FIX SQL syntax error and CSRF check on vat reports 2019-09-11 13:57:15 +02:00
Laurent Destailleur
92e7d7bb26 Fix duplicate translation 2019-09-05 16:18:20 +02:00
Laurent Destailleur
999db7ed41 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/salaries/card.php
	htdocs/compta/sociales/class/chargesociales.class.php
	htdocs/takepos/invoice.php
 2019-08-26 16:49:25 +02:00
Alexandre SPANGARO
76691925a4 FIX Missing div for buttons in tax, loan, various payment modules 2019-08-26 15:35:20 +02:00
Laurent Destailleur
b9771db131 Fix phpcs 2019-07-16 17:16:49 +03:00
Eric Seigne
71d984483d Update print VAT document: remove form part and add right title 2019-06-17 14:45:49 +02:00
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Maxime Kohlhaas
6dd01e86e9 Fix : avoid warning and uniformize var use 2019-05-31 15:53:23 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
1409d1a2c8 Fix phpcs 2019-03-24 19:52:48 +01:00
Laurent Destailleur
89b7f1a040 Fix phpcs 2019-03-24 19:52:18 +01:00
Laurent Destailleur
3578c7cb0a Fix phpcs 2019-03-24 18:20:56 +01:00
Laurent Destailleur
364deb1476 Fix phpcs 2019-03-24 16:09:48 +01:00
Laurent Destailleur
28abf5663b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-24 15:06:16 +01:00
Laurent Destailleur
2034ac61ef Fix phpcs 2019-03-24 15:05:02 +01:00
Laurent Destailleur
20f3af066c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/tva/clients.php
 2019-03-23 22:44:14 +01:00
Laurent Destailleur
79ed4bc80b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-03-23 22:36:04 +01:00
Laurent Destailleur
37cc5b7d35 Merge pull request #10901 from fmarcet/8.0 
FIX: The minimum amount filter does not work in VAT report by customer
 2019-03-22 12:27:30 +01:00
Ferran Marcet
f37c1b9287 FIX: The minimum amount filter does not work in the VAT report per customer 2019-03-22 09:28:50 +01:00
Laurent Destailleur
f3cf3482fa Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/paiement/class/paiement.class.php
	htdocs/projet/element.php
 2019-03-18 10:23:14 +01:00