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

9416 Commits

Author SHA1 Message Date
Laurent Destailleur
9127892c71 Fix several minor bugs 2017-07-13 02:33:48 +02:00
Laurent Destailleur
3fae3a9eda Fix typo 2017-07-13 00:44:04 +02:00
Laurent Destailleur
23fbef3dae Fix the delete dir functions does not return real nb of deleted files. 2017-07-13 00:26:05 +02:00
Laurent Destailleur
0d4d4516c8 Fix template for css and js 2017-07-12 22:52:56 +02:00
Laurent Destailleur
24863337da Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-12 20:34:22 +02:00
Laurent Destailleur
a487492a7a Fix purge of log files was missing some log files. 2017-07-12 20:23:35 +02:00
Laurent Destailleur
33ceb22b8b Fix error management into modulebuilder 2017-07-12 13:25:18 +02:00
Laurent Destailleur
40b3ae2a15 Debug modulebuilder 2017-07-12 11:52:07 +02:00
Laurent Destailleur
11cc1f04c4 Work on modulebuilder 2017-07-12 01:55:07 +02:00
Laurent Destailleur
b016b1ca5f Fix typo 2017-07-11 23:19:47 +02:00
Laurent Destailleur
ceeb9d7f1b Debug modulebuilder 2017-07-11 20:47:49 +02:00
Laurent Destailleur
be09c911ce Debug module websites 2017-07-10 23:44:46 +02:00
Laurent Destailleur
6b4cecd0a8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-09 19:43:21 +02:00
Laurent Destailleur
e3943155f3 Sync transifex 2017-07-09 19:32:35 +02:00
Laurent Destailleur
9fc17d8988 Translation 2017-07-09 13:43:23 +02:00
Laurent Destailleur
4d560a8e03 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-08 22:18:12 +02:00
Laurent Destailleur
a562e5a919 Maxi debug of accountancy ledger page. 2017-07-08 20:52:53 +02:00
Laurent Destailleur
cf6745b1ae Debug module builder 2017-07-08 17:08:07 +02:00
Laurent Destailleur
8db4e91888 Debug modulebuilder 2017-07-08 15:43:36 +02:00
AlainRnet
8d1c8e2da7 Update main.lang 
StatusInterInvoiced missing and I don't know its wording.
 2017-07-08 08:09:02 +02:00
Laurent Destailleur
a9468ad84a Look and feel v6 2017-07-08 00:42:55 +02:00
Laurent Destailleur
de24e93cca Merge pull request #7097 from fappels/develop_nbr_suppliers_prod_list 
NEW: Add column with nbr suppliers prices and WAP to product list.
 2017-07-07 19:42:25 +02:00
Laurent Destailleur
8abec461a6 Fix total with tax does not include local taxes. To solve, i show both 
totals.
 2017-07-07 12:31:00 +02:00
Laurent Destailleur
de1a7042d4 Fix filter on list of actions 2017-07-07 10:55:42 +02:00
phf
6ab0ec4b1b Fix travis and rename 2 fields 2017-07-07 10:22:37 +02:00
phf
49b8689f2d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_event_with_multi_contact 2017-07-05 11:02:39 +02:00
phf
b8865c425f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report 2017-07-05 10:48:01 +02:00
phf
1beec51928 New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE 2017-07-05 10:44:52 +02:00
Laurent Destailleur
95cf36c43b Fix use the getUrl function instead of hard coded curl 2017-07-04 10:55:53 +02:00
Laurent Destailleur
0ee93fb00c Fix conflict between option login and logina and logint in agenda export 2017-07-04 10:29:38 +02:00
Laurent Destailleur
cb1c461b69 Work on module builder 2017-07-03 12:28:52 +02:00
Laurent Destailleur
8b91f4fb5e Debug module website 2017-07-03 12:04:45 +02:00
Laurent Destailleur
9e26e6b0a3 Fix bad value for ref of old contracts 2017-07-03 11:42:17 +02:00
Laurent Destailleur
565de9bc8d Debug module website 2017-07-02 23:38:19 +02:00
Laurent Destailleur
b7218c1bcd Fix menu consistency 2017-07-01 03:18:17 +02:00
Laurent Destailleur
31fe8ebcee Debug v6 2017-07-01 02:22:08 +02:00
fappels
989084e4de WAP always 2 decimals 2017-06-30 10:56:05 +02:00
Laurent Destailleur
f7ba3ddc07 Fix translation 2017-06-29 15:59:46 +02:00
Laurent Destailleur
7e6e0ee3a4 Fix link to image of MD files 2017-06-27 20:02:46 +02:00
Laurent Destailleur
5dd8d1c4ef Rename button to make clear for user that the export is not the real 
journal but a temporary situation.
 2017-06-27 17:56:45 +02:00
fappels
e3f7402e07 Merge remote-tracking branch 'refs/remotes/Dolibarr/develop' into develop_nbr_suppliers_prod_list 2017-06-26 22:45:18 +02:00
fappels
13e5c8ff7a Create patch 
Add Number of supplier prices and wap columns
 2017-06-26 22:44:56 +02:00
Alexandre SPANGARO
459fac4753 Merge remote-tracking branch 'uptream/develop' into 6.0-fec3 
# Conflicts:
#	htdocs/accountancy/customer/index.php
 2017-06-22 05:30:21 +02:00
Alexandre SPANGARO
c381c213a5 Fix : Accountancy 2017-06-20 06:52:41 +02:00
Laurent Destailleur
fcdc7b1a0d Fix pgsql compatibility 2017-06-20 01:53:34 +02:00
Laurent Destailleur
3717a01641 Fix lang 2017-06-19 23:15:47 +02:00
Laurent Destailleur
8dffc38cd5 Fix separator 2017-06-19 21:46:38 +02:00
Laurent Destailleur
504d376f84 Sync transifex 2017-06-19 21:34:33 +02:00
Laurent Destailleur
de423e531c Sync nb_NO 2017-06-19 21:24:55 +02:00
Alexandre SPANGARO
e9b6afd2aa Add last session coding - Add temporaly ledger 2017-06-18 22:17:32 +02:00