lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
93,628 Commits 43 Branches 150 Tags 886 MiB
f718a396d5
Commit Graph

93628 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
f411b29b28 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/listbysubaccount.php
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/accountancy.lang
 2021-01-09 02:34:43 +01:00
Laurent Destailleur
b3461161ec Add option MAIN_NB_OF_YEAR_IN_WIDGET_GRAPH 2021-01-09 02:28:50 +01:00
zuiko
50461931b0
Update card.php 
$type replaced by $fk_barcode_type in
$tmpcode = $modBarCodeProduct->getNextValue($object, $type);
in order to set it
 2021-01-09 01:13:02 +01:00
zuiko
bcff65c3d3
Update mod_barcode_product_standard.php 
get barcode type configuration for products only if $type not set
 2021-01-09 01:01:14 +01:00
ATM-Nicolas
5a6e4f54f0 NEW : Workflow to set a shipment as closed 2021-01-08 16:25:54 +01:00
Laurent Destailleur
a3fd6f07e9 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-01-08 15:10:05 +01:00
Laurent Destailleur
243b227c33 Fix prerequisites 2021-01-08 15:09:49 +01:00
Laurent Destailleur
24c926b32f Update doc 2021-01-08 15:09:16 +01:00
UT from dolibit
ee55d43d12
Update ChangeLog 
- add EORI No. as ProfID5 ->  #15382
- sorting to TakePOS
- sorting new Modules
 2021-01-08 13:54:43 +01:00
Laurent Destailleur
69c614ec2a Sync transifex 2021-01-08 11:22:11 +01:00
Florian Mortgat
d7d44e22e3 FIX warning when filtering on date extrafield (cannot concatenate array to string) 2021-01-08 10:30:39 +01:00
Florian Mortgat
6a759b4bd0 Merge branch 'refs/heads/develop' into FIX_12.0_date_extrafields_are_not_filterable_on_lists 2021-01-08 09:21:58 +01:00
Florian Mortgat
77933de467 Merge branch '12.0' into FIX_12.0_date_extrafields_are_not_filterable_on_lists 2021-01-08 09:08:52 +01:00
Florian Mortgat
5418fcd5be [minor fix] remove useless intval() 2021-01-08 09:05:32 +01:00
Laurent Destailleur
b91bca7022 Fix the source object may have been modified with corrupted data. 2021-01-08 01:56:23 +01:00
Laurent Destailleur
8fca2ce2eb Fix field size 2021-01-08 00:52:38 +01:00
Laurent Destailleur
0448bf07cb Fix field size 2021-01-08 00:52:26 +01:00
Laurent Destailleur
53da17e051 Add column to count pageview on website module 2021-01-08 00:49:58 +01:00
Frédéric FRANCE
39453b720e
Update myobject_contact.php 2021-01-07 18:06:10 +01:00
Frédéric FRANCE
5ee6c13974
Update myobject_card.php 2021-01-07 18:04:15 +01:00
Frédéric FRANCE
ffef95d628
Update myobject_agenda.php 2021-01-07 18:02:29 +01:00
Frédéric FRANCE
e3271ed428
Update mymodule.js.php 2021-01-07 18:01:53 +01:00
Frédéric FRANCE
39b03ef962
Update setup.php 2021-01-07 18:00:23 +01:00
Florian HENRY
89f75bb766 fix missing parethesis 2021-01-07 17:59:38 +01:00
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
2794327e10 Update box_birthdays.php 2021-01-07 12:50:14 +01:00
Lars Wallenborn
1880e51d1c [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 12:50:07 +01:00
Laurent Destailleur
a498f8dfe1 Fix sort by day 2021-01-07 12:49:54 +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
396cbdb79c
Merge pull request #15863 from aspangaro/13b5 
Accountancy - Add date_export on new ledger & subledger to show edit or delete link when is not export yet
 2021-01-07 11:15:37 +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
8ca639b79f
Merge pull request #15916 from atm-maxime/fix_commonfieldadd_type 
Fix date and datetime type in commonfield_add.tpl
 2021-01-07 10:28:10 +01:00
Laurent Destailleur
73e69f8389
Update mod_barcode_product_standard.php 2021-01-07 10:23:38 +01:00