Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-06 17:13:03 +01:00
Code Issues Packages Projects Releases Wiki Activity
93,495 Commits 37 Branches 191 Tags
63755d1337a44bb6c5f86d8920f8ea2faefe0185
Commit Graph

93495 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Florian HENRY
63755d1337 fix missing parethesis 2021-01-07 17:59:19 +01:00
Florian HENRY
71589881f6 fix missing double quote 2021-01-07 17:58:41 +01:00
Florian HENRY
7c08e3330c Merge HEAD, branch 'develop' of github.com:Dolibarr/dolibarr into develop 2021-01-07 17:54:49 +01:00
Florian HENRY
04d8a679a7 fix warning message on install 2021-01-07 17:51:45 +01:00
Laurent Destailleur
094ea841db Fix sort by day 2021-01-07 12:49:19 +01:00
Laurent Destailleur
28cb391924 Merge pull request #15922 from larsborn/develop 
Fix sort order in birthday box
 2021-01-07 12:47:30 +01:00
Laurent Destailleur
ddc3f35be1 Update box_birthdays.php 2021-01-07 12:47:16 +01:00
Laurent Destailleur
8c3e7b4dc6 Fix vardump 2021-01-07 12:43:15 +01:00
Laurent Destailleur
6da3ed1a51 Merge 2 exclusive options into 1 2021-01-07 12:39:51 +01:00
Lars Wallenborn
f578164b42 [FIX] sort order in birthday box 
The current sort order is by date and not by day of month. This yields
the following unexpected results:

Given

* Person A, born on 1980-01-10
* Person B, born on 1970-01-30

I expect Person A to be listed first because their birthday is before
that of Person B _in January_. But without this fix, Person B would show
up first because 1970 is before 1980.
 2021-01-07 11:43:11 +01:00
Laurent Destailleur
26fa8b45ac Merge pull request #15153 from FHenry/dev_new_add_desc_when_select_product 
NEW: preload product description on selection for customer propal/order/invoice
 2021-01-07 11:19:53 +01:00
Laurent Destailleur
55b46ca149 Merge pull request #15318 from bafbes/abb120353 
New: add notification on ACTION_CREATE event
 2021-01-07 11:17:33 +01:00
Laurent Destailleur
4f55d51eac Merge pull request #15886 from FHenry/dev_add_column_propal_order 
NEW : Column shippement method, payment mode, payment term in propal and order list
 2021-01-07 11:04:30 +01:00
Laurent Destailleur
3d2dc59468 Merge pull request #15897 from OPEN-DSI/add_triggers_on_object_link_managment 
NEW : Add triggers in the function add_object_linked(), updateObjectLinked() and deleteObjectLinked()
 2021-01-07 10:49:06 +01:00
Laurent Destailleur
3fa5c27bc7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-07 10:41:09 +01:00
Laurent Destailleur
e53cb4b530 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-07 10:40:58 +01:00
Laurent Destailleur
a1d20ed9c2 Merge pull request #15910 from atm-john/new/unit_type_selection_limit 
NEW unit selection on object edit line
 2021-01-07 10:33:07 +01:00
Laurent Destailleur
c2855d4d71 Update html.form.class.php 2021-01-07 10:32:23 +01:00
Laurent Destailleur
312f11d7b3 Update objectline_edit.tpl.php 2021-01-07 10:30:11 +01:00
Laurent Destailleur
2e61809910 Merge pull request #15915 from frederic34/patch-8 
code syntax
 2021-01-07 10:28:40 +01:00
Laurent Destailleur
3399ab2c5d Fix phpcs 2021-01-07 10:20:41 +01:00
Laurent Destailleur
aa05370566 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 21:34:36 +01:00
Laurent Destailleur
ce035eb4ce Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/bom/bom_card.php
 2021-01-06 21:33:59 +01:00
Laurent Destailleur
1aa7e4adeb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-06 21:32:46 +01:00
Laurent Destailleur
0dc182553e Merge pull request #15896 from atm-lena/FIX/issue_14197 
FIX balance starting and ending fiscal month #14197
 2021-01-06 21:32:02 +01:00
Laurent Destailleur
2a31ca969f FIX #15388 #15891 2021-01-06 21:29:58 +01:00
Laurent Destailleur
cfc2ec63f3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 21:04:13 +01:00
Frédéric FRANCE
2b3b1a7fea Update myobject_list.php 2021-01-06 20:54:20 +01:00
Laurent Destailleur
4c00167687 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/societe/card.php
 2021-01-06 20:51:44 +01:00
Laurent Destailleur
07ca12b26d Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:48:23 +01:00
Laurent Destailleur
ca11ea9839 Fix phpunit 
Signed-off-by: Laurent Destailleur <eldy@destailleur.fr>
 2021-01-06 20:47:57 +01:00
Laurent Destailleur
123bd81721 Trim no more required 2021-01-06 20:42:18 +01:00
Laurent Destailleur
ef8021467b FIX #15892 #15017 2021-01-06 20:41:40 +01:00
Frédéric FRANCE
241a738a29 Update myobject_document.php 2021-01-06 20:41:17 +01:00
Frédéric FRANCE
80d4bb4284 Update myobject_note.php 2021-01-06 20:39:50 +01:00
Frédéric FRANCE
f4b2329b5d Update myobject_card.php 2021-01-06 20:38:41 +01:00
Laurent Destailleur
93323f6d61 Merge pull request #15889 from atm-quentin/FIX/issue_15516 
FIX wrong name for search status param issue #15516
 2021-01-06 20:35:52 +01:00
Laurent Destailleur
8f1617884a Merge pull request #15888 from atm-quentin/FIX/issue_15659 
FIX issue 15659 : Missing test if supplier conf is enabled
 2021-01-06 20:35:34 +01:00
Laurent Destailleur
679948e207 Merge pull request #15893 from atm-lena/FIX_issue_15629 
FIX #15629
 2021-01-06 20:34:31 +01:00
Frédéric FRANCE
c3d970fce8 Update myobject_agenda.php 2021-01-06 20:34:18 +01:00
Frédéric FRANCE
ccfba6a9f2 Update mymoduleindex.php 2021-01-06 20:29:47 +01:00
Frédéric FRANCE
7a26a1212c Update mymodule.css.php 2021-01-06 20:28:50 +01:00
Laurent Destailleur
71278b173e Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:28:33 +01:00
Laurent Destailleur
654cf2d990 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2021-01-06 20:27:46 +01:00
Frédéric FRANCE
8117fb7cb2 Update modMyModule.class.php 2021-01-06 20:27:45 +01:00
Laurent Destailleur
9e50a06f2b Merge pull request #15894 from atm-john/11.0_fix_issue_14833 
Fix #14833 A security mecanism generates data loss
 2021-01-06 20:26:19 +01:00
Frédéric FRANCE
79b6a3ed40 Update setup.php 2021-01-06 20:24:45 +01:00
Laurent Destailleur
b553dbb9d2 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-06 20:23:07 +01:00
Laurent Destailleur
a955df21bf Merge pull request #15905 from atm-quentin/FIX/issue_14501 
FIX useless tracking number displayed on pdf if empty issue #14501
 2021-01-06 20:22:43 +01:00
Laurent Destailleur
2ab74e871e Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-01-06 20:21:40 +01:00