Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
75,225 Commits 36 Branches 189 Tags
cfa414b2de51c08ad9c110bf7a0a3d7b51d3a093
Commit Graph

1435 Commits

Author SHA1 Message Date
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
2174e70414 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-04-08 14:09:29 +02:00
Laurent Destailleur
321ffb859b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
	htdocs/projet/activity/perday.php
	htdocs/projet/activity/perweek.php
 2019-04-08 14:09:18 +02:00
Laurent Destailleur
f4efc86dd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-04-08 14:05:14 +02:00
Laurent Destailleur
2b87c8b663 Merge pull request #10810 from mwelters/patch-1 
NEW improve Expensereport, Inverse Receiver
 2019-04-08 14:04:08 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
atm-arnaud
0b6c7d2d63 FIX shipping default warehouse if only one warehouse 2019-04-04 11:17:44 +02:00
Laurent Destailleur
2b41d0c59d Merge pull request #10938 from inoveaconseil/HookPrintFieldLIstFooter 
FIX missing hook
 2019-03-31 18:44:07 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Nicolas ZABOURI
0ab6b15779 FIX missing hook printFieldListFooter 2019-03-28 17:27:30 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
markus
f942917f53 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into patch-1 2019-03-24 17:42:49 +01:00
Laurent Destailleur
930720decd WIP Start to replace use of property ->brouillon 2019-03-21 18:13:51 +01:00
Laurent Destailleur
1a8902f23e Fix migration for compatibility 2019-03-19 12:03:02 +01:00
Laurent Destailleur
99e67bcc21 Fix phpcs 2019-03-15 02:48:13 +01:00
Laurent Destailleur
7c59629e66 Fix phpcs 2019-03-15 02:32:21 +01:00
Laurent Destailleur
86c5dc20e3 NEW Can choose the root category to show for TakePOS module 2019-03-15 02:12:40 +01:00
Laurent Destailleur
0ef6fd36f9 Merge and clean TakePOS CSS 2019-03-15 00:49:44 +01:00
Laurent Destailleur
c44d9bf8e2 Fix phpcs 2019-03-14 23:27:50 +01:00
Laurent Destailleur
5be2c45d61 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expedition/card.php
	htdocs/expedition/shipment.php
	htdocs/livraison/card.php
 2019-03-14 19:23:59 +01:00
Laurent Destailleur
a35a2faacb Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/expedition/card.php
	htdocs/livraison/card.php
 2019-03-14 19:06:21 +01:00
Laurent Destailleur
cdf6e4b65a Fix some PSR rules 2019-03-14 16:43:27 +01:00
Laurent Destailleur
39e6e71b0d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/class/accountancyexport.class.php
 2019-03-14 14:20:34 +01:00
Laurent Destailleur
d7735ff272 FIX #10822 2019-03-14 14:15:35 +01:00
Marc de Lima Lucio
36b44b1348 FIX: several hooks in shipping/delivery cards 2019-03-12 11:28:36 +01:00
Frédéric FRANCE
13042ade53 replace html by html5 in expedition 2019-03-10 09:13:13 +01:00
markus
1e4ed531b4 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-08 11:47:08 +01:00
Frédéric FRANCE
f283782445 change visibility 2019-03-04 19:57:46 +01:00
markus
c905575d3e Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-03-04 17:26:40 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
Laurent Destailleur
b3fb0eaf5b Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
2448d1deaa fk_projet -> fk_project 2019-02-27 15:32:18 +01:00
Frédéric FRANCE
81f2f99db5 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-26 21:16:01 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
markus
d38bff6f14 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2019-02-26 12:31:24 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +01:00
Frédéric FRANCE
6ee186096c Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-24 23:48:51 +01:00
Frédéric FRANCE
27218b7087 wip 2019-02-24 23:32:09 +01:00
Frédéric FRANCE
894123fb06 PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
markus
01b12793d2 fix typo in comment 2019-02-12 13:59:55 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
fe1188c4ea Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/filefunc.inc.php
 2019-02-08 10:44:45 +01:00
Laurent Destailleur
679a13e48c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
 2019-02-08 10:22:36 +01:00
Marc de Lima Lucio
64739098ae FIX: expedition: reset status on rollback + replace hardcoded status with const 2019-02-05 11:58:49 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
markus
bc2c6282d9 Merge branch 'develop' of https://github.com/mwelters/dolibarr into develop 2019-02-03 17:48:04 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b2e2b2e186 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-31 18:27:27 +01:00
Laurent Destailleur
2bed90e9db Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/sociales/class/chargesociales.class.php
 2019-01-31 10:24:52 +01:00