Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 11:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
122,559 Commits 36 Branches 190 Tags
e65c85dc44f7ddbb9d2931be2d01eaed85b51a99
Commit Graph

584 Commits

Author SHA1 Message Date
Laurent Destailleur
66a288a343 Merge pull request #12235 from frederic34/scopeindent 
clean indent
 2019-10-30 02:57:59 +01:00
Laurent Destailleur
4eedf4a113 Merge branch '10.0' of https://github.com/dolibarr/dolibarr into develop 2019-10-29 11:48:36 +01:00
Laurent Destailleur
9483e367ca Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:48:11 +01:00
Laurent Destailleur
e58ecaaa64 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/product/stock/replenishorders.php
 2019-10-29 11:43:35 +01:00
Laurent Destailleur
21d15c3bcb FIX Set unpaid of expense report 2019-10-29 11:35:33 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
8768c553b1 Debug modulebuilder 2019-10-24 11:16:06 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Alexandre SPANGARO
1c13a38ce9 Typo abscissa 2019-09-23 21:45:23 +02:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
92e7d7bb26 Fix duplicate translation 2019-09-05 16:18:20 +02:00
John Botella
bc0508164b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_dashboard 2019-08-06 09:57:49 +02:00
Laurent Destailleur
b294f22285 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-04 13:07:09 +02:00
Laurent Destailleur
5339bb71ac FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:57:21 +02:00
Laurent Destailleur
7f42380f83 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:57 +02:00
Laurent Destailleur
f3e38f4b09 FIX Fatal situation if payment removed on expense report. Action 
set_unpaid was not available.
 2019-08-03 20:53:18 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
Laurent Destailleur
11e3aa5860 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 11:07:11 +02:00
Laurent Destailleur
7931f0b422 Fix sql error 2019-07-29 11:06:39 +02:00
Laurent Destailleur
a5e3adc6f1 Fix travis 2019-07-29 10:51:17 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
79bb9d951f Fix phpcs 2019-07-29 01:36:05 +02:00
Laurent Destailleur
9a7113f4f5 FIX Update the file index table when we validate/rename a ref. 2019-07-28 22:26:55 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
4ed7571a3f Merge 2019-07-26 16:36:39 +02:00
Laurent Destailleur
1646f426c5 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2019-07-26 16:33:55 +02:00
Laurent Destailleur
471a947e8a FIX Attachment was lost when we validate an expense report 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
 2019-07-26 16:33:32 +02:00
Laurent Destailleur
97c950badb FIX Attachment was lost when we validate an expense report 2019-07-26 16:30:16 +02:00
Laurent Destailleur
5d1a50bcb4 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-20 14:03:18 +02:00
Laurent Destailleur
ac8a776113 FIX Column 'paid' missing in expense report 2019-07-20 14:02:53 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00
Laurent Destailleur
091132de2f Signatures of methods createFromClone() has been standardized. All 
methods requires the object User as first parameter.
 2019-04-25 12:11:32 +02:00
Laurent Destailleur
8d18915746 Work on edit link of expense report line and files 2019-04-12 18:18:04 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
5ff76e2c13 WIP file attachment on expense report lines 2019-03-24 12:15:19 +01:00
Laurent Destailleur
aab9734f52 WIP Save link to file in expensereport lines 2019-03-22 18:03:08 +01:00
Laurent Destailleur
8ca5b2e45f Rename field 2019-03-22 17:43:53 +01:00
Laurent Destailleur
413ecd1d68 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-03-15 15:08:09 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Philippe GRAND
9f420bdd08 update with html5 compliant code 2019-03-14 19:02:37 +01:00
Laurent Destailleur
799271daa5 Try to add more log to debug expense report creation error 2019-03-09 01:45:11 +01:00
Laurent Destailleur
b766031abf Try to fix error on pgsql 2019-03-08 20:06:09 +01:00
Laurent Destailleur
0798f7b719 NEW Can upload files from the edit page of expense report 2019-03-07 20:53:03 +01:00
Laurent Destailleur
daaa4ca0c2 Merge pull request #10749 from frederic34/PSR2.Classes.PropertyDeclaration.VarUsed 
PSR2.Classes.PropertyDeclaration.VarUsed
 2019-03-07 12:49:13 +01:00
Laurent Destailleur
e67890bd22 NEW Can enter price with or without tax when entering expense repor line 2019-03-07 11:09:04 +01:00
Laurent Destailleur
c513116717 FIX missing vat_src_code when inserting an expense report line 2019-03-07 10:56:48 +01:00
Frédéric FRANCE
2745f98644 PSR2.Classes.PropertyDeclaration.VarUsed 2019-03-05 22:10:46 +01:00
Frédéric FRANCE
f283782445 change visibility 2019-03-04 19:57:46 +01:00